diff -Nru network-manager-applet-0.8.4~git.20110323t200900.07708e7/aclocal.m4 network-manager-applet-0.8.4/aclocal.m4 --- network-manager-applet-0.8.4~git.20110323t200900.07708e7/aclocal.m4 2011-05-05 23:48:51.000000000 +0000 +++ network-manager-applet-0.8.4/aclocal.m4 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -# empty file diff -Nru network-manager-applet-0.8.4~git.20110323t200900.07708e7/configure.ac network-manager-applet-0.8.4/configure.ac --- network-manager-applet-0.8.4~git.20110323t200900.07708e7/configure.ac 2011-03-24 06:01:13.000000000 +0000 +++ network-manager-applet-0.8.4/configure.ac 2011-05-05 19:35:53.000000000 +0000 @@ -1,6 +1,6 @@ AC_PREREQ([2.63]) AC_INIT([nm-applet], - [0.8.3.998], + [0.8.4], [https://bugzilla.gnome.org/enter_bug.cgi?product=NetworkManager], [network-manager-applet]) @@ -69,10 +69,10 @@ PKG_CHECK_MODULES(NMA, [dbus-glib-1 >= 0.74 glib-2.0 >= 2.16 - NetworkManager >= 0.8.3.995 - libnm-glib >= 0.8.3.995 - libnm-util >= 0.8.3.995 - libnm-glib-vpn >= 0.8.3.995 + NetworkManager >= 0.8.4 + libnm-glib >= 0.8.4 + libnm-util >= 0.8.4 + libnm-glib-vpn >= 0.8.4 gtk+-2.0 >= 2.14 gmodule-export-2.0 gconf-2.0 @@ -108,8 +108,8 @@ PKG_CHECK_MODULES(GNOME_BLUETOOTH, gconf-2.0 gnome-bluetooth-1.0 >= 2.27.6 - libnm-util >= 0.8.3.995 - libnm-glib >= 0.8.3.995, + libnm-util >= 0.8.4 + libnm-glib >= 0.8.4, have_gbt=yes, have_gbt=no) ;; esac diff -Nru network-manager-applet-0.8.4~git.20110323t200900.07708e7/debian/changelog network-manager-applet-0.8.4/debian/changelog --- network-manager-applet-0.8.4~git.20110323t200900.07708e7/debian/changelog 2011-05-05 23:48:51.000000000 +0000 +++ network-manager-applet-0.8.4/debian/changelog 2011-05-05 23:24:46.000000000 +0000 @@ -1,8 +1,60 @@ -network-manager-applet (0.8.4~git.20110323t200900.07708e7-0ubuntu1~nmt1~lucid) lucid; urgency=low +network-manager-applet (0.8.4-0ubuntu1~nm2~lucid) lucid; urgency=low - * New upstream snapshot + * New upstream release 0.8.4. + * debian/source/format: migrate to debian source format 3.0 (quilt). + * debian/control: sync with Debian's changes: + - drop a bunch of old, unnecessary build dependencies. + - keep in Build-Depends: libiw-dev, libxml-parser-perl, libnss3-dev, + libappindicator-dev + - add to Build-Depends: dh-autoreconf and libnm-glib-vpn-dev. + - network-manager-gnome: specify package's Section as gnome. + - network-manager-gnome: add policykt-1-gnome, gnome-icon-theme, dbus-x11 + to Depends. + - network-manager-gnome: now Recommends gnome-bluetooth. + - network-manager-gnome: add Suggests for the VPN plugins. + - adjust network-manager-gnome long description to match Debian's. + - bump Standards-Version to 3.9.2. + * debian/compat: bump to compat level 8. + * debian/copyright: sync with Debian's copyright file. + * debian/rules: + - migrate to dh instead of CDBS. + - use dh-autoreconf to reconfigure the build tree. + - drop old dapper-to-intrepid and karmic-to-lucid workarounds for icon + changes. + - we switch to using png icons directly instead of uuencoded png files; so + remove the uudecode parts that are no longer necessary. + - don't empty aclocal.m4. + - do some extra cleanup of files left behind by the build process. + - drop configure parameters --with-mbca, --with-nss, --without-gnutls. + * debian/icons/22/*: replace uuencoded png icons by their original, decoded + versions. + * debian/source/include-binaries: add .png icons to included-binaries. + * debian/network-manager-gnome.README.Debian: include Debian's README.Debian + file for network-manager-gnome, minus the part about using the netdev user. + * debian/network-manager-gnome.docs: install NEWS from upstream. + * Fix the manpage so it actually gets installed: + - Rename network-manager-applet.manpages to network-manager-gnome.manpages. + - Sync nm-applet.sgml with the file from Debian. + * debian/patches/04-autostart.patch, + debian/patches/lp268803_xdg_autostart_gnome_xfce_only.patch, + debian/patches/lp295788_xfce_menu_entry.patch: + Install the 04-autostart.patch patch, editing the .desktop files from + Debian and adjust it to also replace OnlyShowIn with NotShowIn=KDE for + nm-connection-editor. This renders the two other patches obsolete, so + drop them. Also fixes (LP: #753300). + * debian/patches/0001-applet-fix-possibly-uninitialized-variable.patch: + Include that patch from Debian which fixes a potential FTBFS. + - This makes debian/patches/applet-dialog-uninited-method.patch obsolete. + * debian/patches/lp328572-dxteam-connect-text.patch: refreshed so it applies + cleanly. + * debian/patches/lp330608_dxteam_gsm_connect_text.patch: refreshed so it + applies cleanly. + * debian/patches/lp341684_device_sensitive_disconnect_notify.patch: refreshed + so it applies cleanly. + * For Lucid backport, drop indicator-related patches. + - modified debian/patches/series. - -- Fabien Tassin Thu, 24 Mar 2011 07:03:04 +0100 + -- Mathieu Trudel-Lapierre Thu, 05 May 2011 19:24:26 -0400 network-manager-applet (0.8.4~git.20110318t152954.9c4c9a0-0ubuntu1) natty; urgency=low diff -Nru network-manager-applet-0.8.4~git.20110323t200900.07708e7/debian/compat network-manager-applet-0.8.4/debian/compat --- network-manager-applet-0.8.4~git.20110323t200900.07708e7/debian/compat 2011-05-05 23:48:51.000000000 +0000 +++ network-manager-applet-0.8.4/debian/compat 2011-05-05 23:24:46.000000000 +0000 @@ -1 +1 @@ -5 +8 diff -Nru network-manager-applet-0.8.4~git.20110323t200900.07708e7/debian/control network-manager-applet-0.8.4/debian/control --- network-manager-applet-0.8.4~git.20110323t200900.07708e7/debian/control 2011-05-05 23:48:51.000000000 +0000 +++ network-manager-applet-0.8.4/debian/control 2011-05-05 23:24:46.000000000 +0000 @@ -2,54 +2,60 @@ Section: gnome Priority: optional Maintainer: Ubuntu Core Developers -Original-Maintainer: Anthony Mercatante -Build-Depends: debhelper (>= 5.0.37), - automake1.9, - libtool, - cdbs, - libgnome-keyring-dev, - libgnomeui-dev, - libpanel-applet2-dev, - libglade2-dev, - libgconf2-dev, - network-manager-dev (>= 0.8.4~), - libnm-util-dev (>= 0.8.4~), - libnm-glib-dev (>= 0.8.4~), - libiw-dev, - libxml-parser-perl, - docbook-to-man, - quilt, - libnotify-dev, - gnome-common, - libnss3-dev, - libpolkit-gobject-1-dev, - intltool, - libgnome-bluetooth-dev, - libappindicator-dev, - sharutils -Standards-Version: 3.9.1 +XSBC-Original-Maintainer: Utopia Maintenance Team +Uploaders: Michael Biebl +Build-Depends: + debhelper (>= 8), + dh-autoreconf, + autotools-dev, + intltool, + libdbus-glib-1-dev (>= 0.74), + libgnome-keyring-dev, + libgtk2.0-dev (>= 2.14), + libglib2.0-dev (>= 2.16), + libgconf2-dev, + libnotify-dev (>= 0.4.3), + libnm-util-dev (>= 0.8.4), + libnm-glib-dev (>= 0.8.4), + libnm-glib-vpn-dev (>= 0.8.4), + network-manager-dev (>= 0.8.4), + docbook-to-man, + libappindicator-dev, + libpolkit-gobject-1-dev (>= 0.92), + libgnome-bluetooth-dev (>= 2.27.6) +Standards-Version: 3.9.2 Homepage: http://www.gnome.org/projects/NetworkManager/ Vcs-Bzr: https://code.launchpad.net/~network-manager/network-manager-applet/ubuntu.head Package: network-manager-gnome Architecture: any -Depends: ${shlibs:Depends}, - ${misc:Depends}, - network-manager (>= 0.8.4~), - gksu -Recommends: notification-daemon, - mobile-broadband-provider-info (>= 20090622) +Section: gnome +Depends: + ${shlibs:Depends}, + ${misc:Depends}, + gksu, + network-manager (>= 0.8.2), + policykit-1-gnome, + gnome-icon-theme, + dbus-x11 +Recommends: + notification-daemon, + mobile-broadband-provider-info, + gnome-bluetooth +Suggests: + network-manager-openvpn-gnome, + network-manager-vpnc-gnome, + network-manager-pptp-gnome Description: network management framework (GNOME frontend) - NetworkManager attempts to keep an active network connection available at all - times. It is intended only for the desktop use-case, and is not intended for - usage on servers. The point of NetworkManager is to make networking - configuration and setup as painless and automatic as possible. If using DHCP, - NetworkManager is _intended_ to replace default routes, obtain IP addresses - from a DHCP server, and change nameservers whenever it sees fit. + NetworkManager is a system network service that manages your network devices + and connections, attempting to keep active network connectivity when + available. It manages ethernet, WiFi, mobile broadband (WWAN), and PPPoE + devices, and provides VPN integration with a variety of different VPN + services. . This package contains a systray applet for GNOME's notification area but it also works for other desktop environments which provide a systray like KDE - or XFCE. - It displays the available networks and allows to easily switch between them. - For encrypted networks it will prompt the user for the key/passphrase and it - can optionally store them in the gnome-keyring. + or Xfce. + It displays the available networks and allows users to easily switch between + them. For encrypted networks it will prompt the user for the key/passphrase + and it can optionally store them in the gnome-keyring. diff -Nru network-manager-applet-0.8.4~git.20110323t200900.07708e7/debian/copyright network-manager-applet-0.8.4/debian/copyright --- network-manager-applet-0.8.4~git.20110323t200900.07708e7/debian/copyright 2011-05-05 23:48:51.000000000 +0000 +++ network-manager-applet-0.8.4/debian/copyright 2011-05-05 23:24:46.000000000 +0000 @@ -1,22 +1,23 @@ -This package was debianized by Anthony Mercatante on -Fri, 15 Jun 2007 11:54:56 +0200. +This package was debianized by Michael Biebl on +Mon, 27 Aug 2007 08:03:51 +0200. -It was downloaded from http://ftp.acc.umu.se/pub/GNOME/sources/network-manager-applet/ +It was downloaded from +http://ftp.gnome.org/pub/GNOME/sources/network-manager-applet/ Upstream author: + Dan Williams -Copyright holders: - Copyright 2004-2005 Red Hat, Inc. - Copyright 2006 Thiago Jung Bauermann - Copyright 1999, 2000 Eazel, Inc. - Copyright 2002 Anders Carlsson - Copyright 2006 Novell, Inc. - Copyright 2006 Thiago Jung Bauermann - Copyright 2001, 2002 Free Software Foundation + +All files if not specified otherwise are licensed under the following terms: + +Copyright: + + Copyright (C) 2004 - 2009 Red Hat, Inc. + Copyright (C) 2005 - 2008 Novell, Inc. + Copyright (C) 2001, 2002 Free Software Foundation License: -All the software: This package is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -36,7 +37,17 @@ Public License can be found in `/usr/share/common-licenses/GPL'. -eggtrayicon.c, eggtrayicon.h: + +src/utils/nmn-mobile-providers.[ch] +src/gnome-bluetooth/network-manager-applet.c + +Copyright: + + Copyright (C) 2009 Novell, Inc. + Copyright (C) 2009 Red Hat, Inc. + Copyright (C) 2009 Bastien Nocera + +License: This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -54,6 +65,3 @@ On Debian systems, the complete text of the GNU Lesser General Public License can be found in `/usr/share/common-licenses/LGPL'. - -menu-items.c: - This also uses code from eel-vfs-extentions available under the LGPL Binary files /tmp/HZZEzftPKv/network-manager-applet-0.8.4~git.20110323t200900.07708e7/debian/icons/22/nm-active-device.png and /tmp/SQLCaC01Ni/network-manager-applet-0.8.4/debian/icons/22/nm-active-device.png differ diff -Nru network-manager-applet-0.8.4~git.20110323t200900.07708e7/debian/icons/22/nm-active-device.png.uue network-manager-applet-0.8.4/debian/icons/22/nm-active-device.png.uue --- network-manager-applet-0.8.4~git.20110323t200900.07708e7/debian/icons/22/nm-active-device.png.uue 2011-05-05 23:48:51.000000000 +0000 +++ network-manager-applet-0.8.4/debian/icons/22/nm-active-device.png.uue 1970-01-01 00:00:00.000000000 +0000 @@ -1,13 +0,0 @@ -begin 644 nm-active-device.png -MB5!.1PT*&@H````-24A$4@````H````*"`8```"-,L^]````!'-"250("`@( -M?`ADB`````EP2%ES```-UP``#=````!ET15AT4V]F='=AY_,EN^SD"?QSB9V)S$6RLA"@5]\X5$VYC_M" -M$K.QI!5++A^L9792\PLI`(#W9N.I>6'[@Y?CP!]4Y+^'?P%$]8OH$@*&^@`` -*``!)14Y$KD)@@@`` -` -end Binary files /tmp/HZZEzftPKv/network-manager-applet-0.8.4~git.20110323t200900.07708e7/debian/icons/22/nm-device-wired-secure.png and /tmp/SQLCaC01Ni/network-manager-applet-0.8.4/debian/icons/22/nm-device-wired-secure.png differ diff -Nru network-manager-applet-0.8.4~git.20110323t200900.07708e7/debian/icons/22/nm-device-wired-secure.png.uue network-manager-applet-0.8.4/debian/icons/22/nm-device-wired-secure.png.uue --- network-manager-applet-0.8.4~git.20110323t200900.07708e7/debian/icons/22/nm-device-wired-secure.png.uue 2011-05-05 23:48:51.000000000 +0000 +++ network-manager-applet-0.8.4/debian/icons/22/nm-device-wired-secure.png.uue 1970-01-01 00:00:00.000000000 +0000 @@ -1,24 +0,0 @@ -begin 664 nm-device-wired-secure.png -MB5!.1PT*&@H````-24A$4@```!8````6"`8```#$M&P[````!F)+1T0`_P#_ -M`/^@O:>3````"7!(67,```L2```+$@'2W7[\````"79P06<````6````%@#< -MQ>E8```"VDE$050XRY64W4M401C&?W/.[&XM;9JK@1;DEI"I]%W0I45!2$70 -M;=%-$-TD7L12QKIHL51&==%?$13*$D@EA14&U79184A^EDA.REGQ:W?/=+$? -MN7DVUN?B#.=]YCSSSOR&(\CH[8=/FF4ZM'>7"(<['FFM3P,&QQ"XV,3`(;/YR/0%"DJ>"@:)+L[6=07P.[ZP-\7D7UHR!Q@[/-0WGS9 -M>Z]2UR9#;%[_G;$G.]/31L]25VE07CH)M`*0M#6F(3!,(STBT(!M:Q83R16- -M2(#2+7LHW;(G5UR:_H9,#`,0#G=P_B#`8,[7&F92/F+3?A83-G;*=@Z>&?G( -M[,_O><;ZRO1%"(5:G2#1V7D?P]R(1Q@D"P5[*Q3>BI)<<5;]AE0ZV`G<4#2( -M$.!VNTBE;`0IY^"Y7WXFI]X!8">3).87J:Y.P]K=L+4@I($O@Q22!(B]Z5]6 -M,@$OOR)SK.,]!D+`A8:=83-AH#89I.D(Z?K*1YSV]7`U> -M%XY'D;>=N00N:2)=)M(E$4*@M7:$)`T7^P_LXWVL7RNE&!D914VI(/!@1?"/ -MT7&*E5(*C\>#4HKR\G*\:[WT];V.`,ELL&U9EO$OC$+*0.+HX>,KO`TE?KJC -M77=$!L)J?X^8IL#E$8Z>-.6`HW,STJZ/'&MD<'@`@)KJ[5E(%46NNR`BMVY( -MH#FP-7"[IF8;2BG\?O]_Q^60@E>NS3LE&\`%X/:FJBJ44I25E:&4PNU.0Y%2 -MKH"TH[86(`)<*M2R!!Z>:#I)75U#L<>;!PGH=`R6IASHCG9M[XYVK2H8P.UR -M?RWD"6`=L&;5J;``S!8R_P!YAD.N@P:96@```"5T15AT9&%T93IC`````=T -M24U%!]D)$0P3'_FM`,\```#/241!5#C+[=`[BL)0&(;A]\38!-&`*,1&74`8 -MM1DFG3MR*>[&3A%$T<)+:R':3(@S\0+>=8S-*`I6GMCE*;\#+S]'\*_5'7C< -M^2I\""0HUV@JKA,)*WB[-3````"7!(67,```L3```+$P$`FIP8````"79P06<````6````%@#< -MQ>E8```"!TE$050XR]64OVL441#'/^_-S(-;Y'*01#E!+H*EIXD@XE5G$SL% -M.[&Q$$OQ3]%2$*RT$[124G@*8HA%/%L+T<;CU$L4XL]$U^*RF]V[]3PY&[_- -M\F;>?MZ\[^RL8UO+J\]C,CI^Y+!C`OD$NG>ZPB[SQ%\_\?%MAP>/5^*)P0#W -M'K6IU^NNT6BXJ=U5>KWU2;@[X'\MU[I2C><;Q]AX\S*7*%<]J\M=3ESNC/*Z -M-;!N`@Y``2JU!2JUA33[??T%NOEJK,JN7[O:=$#L'!1 -M6N#@H:/#<8!HMDNGFCZ?HV=0,[QU)+`=N/UG)A`2(6.MT"\&FQK[:@12C -M&A`OPU:,T?7D^OVKFZ&J.P>9(=Z#*ZAXE.[>N=W$Q3@\ITZ?020@JKBX[ZE( -MXC%_!Q959F;V9*Q0--,L-<6+'^S=$+B57#G=H(8%P\7)089D*A2Q8H\'`TM+ -M]RL.FC&.Q<63#U648('L05FPBB+>$[L_@%4#Y7(YLU:"&=N3BI@BJJD5HHH3 -M&?KI%("5*(K2M1?%+"1<'`[UDJO0>Y\VV[.\T2#PY']*I+G[U24;Q8P_Q/]`B'%S#D````'71% -M6'1#;VUM96YT`$-R96%T960@=VET:"!4:&4@1TE-4.]D)6X````E=$58=&1A -M=&4Z8W)E871E`#(P,3$M,#$M,3E4,34Z,SDZ-#,M,#4Z,#!1G&8L````)71% -M6'1D871E.FUO9&EF>0`R,#$Q+3`Q+3$Y5#$U.C,X.C0Q+3`U.C`P6)RDAP`` -*``!)14Y$KD)@@@`` -` -end Binary files /tmp/HZZEzftPKv/network-manager-applet-0.8.4~git.20110323t200900.07708e7/debian/icons/22/nm-signal-100-secure.png and /tmp/SQLCaC01Ni/network-manager-applet-0.8.4/debian/icons/22/nm-signal-100-secure.png differ diff -Nru network-manager-applet-0.8.4~git.20110323t200900.07708e7/debian/icons/22/nm-signal-100-secure.png.uue network-manager-applet-0.8.4/debian/icons/22/nm-signal-100-secure.png.uue --- network-manager-applet-0.8.4~git.20110323t200900.07708e7/debian/icons/22/nm-signal-100-secure.png.uue 2011-05-05 23:48:51.000000000 +0000 +++ network-manager-applet-0.8.4/debian/icons/22/nm-signal-100-secure.png.uue 1970-01-01 00:00:00.000000000 +0000 @@ -1,19 +0,0 @@ -begin 664 nm-signal-100-secure.png -MB5!.1PT*&@H````-24A$4@```!8````6"`8```#$M&P[````!F)+1T0`_P#_ -M`/^@O:>3````"7!(67,```L3```+$P$`FIP8````"79P06<````6````%@#< -MQ>E8```!L$E$050XR]64/TX;01C%?V,OC86")40DIX%(M%:`)HHKYR#<@0-0 -M^@#<@4/0``Z2`8$0.&V$$#2Q'#`.$O_LG9DOA?'NS+)K&3D-K]EYW[?SYKV9 -MW5&\X/#TI^#@V\H7Q03(#44_S1:9GLHASP_<_6FQVSB2B84!MO::E,ME5:E4 -MU,S'$IU.=Q+=6/A_0]4W2K)4^UUJB]KB=X%5```4!Q -M?IGB_'+4[7=_$8278SFK;9Y7A^/UU<6H'@#\O3I+=3PNMAO'KVH!0&&N0V%N -M)BK>=V[!I`J[T9>`9M9B`<#C]2SMF\&J5FO"IQX+"Y_?%#U5N'EPY)3R0('; -M5CMSTN[^B<=SZG6Z8(Q3'\:/HHO*>R\E>>1X%,:-_F9A@)V#,X\K8Z*Q%9]G -M"==).VVK$]'C:T1$/)[IN+9Y7F3P![&^NOC#"H@.XS6L!4LF'[D5V_5&[,@: -MQ/0B;K2`>?:%'9XI;*W%FG[,#>BP[_6U=KC&XYG"Q@HF$=WT',<(NN\[=OE( -MQZZP00C#6%BTT'M\\N8D.;Q<<0[0`R,#$Q+3`Q+3$Y5#$U.C,X.C0Q+3`U.C`P6)RD --AP````!)14Y$KD)@@@`` -` -end Binary files /tmp/HZZEzftPKv/network-manager-applet-0.8.4~git.20110323t200900.07708e7/debian/icons/22/nm-signal-25-secure.png and /tmp/SQLCaC01Ni/network-manager-applet-0.8.4/debian/icons/22/nm-signal-25-secure.png differ diff -Nru network-manager-applet-0.8.4~git.20110323t200900.07708e7/debian/icons/22/nm-signal-25-secure.png.uue network-manager-applet-0.8.4/debian/icons/22/nm-signal-25-secure.png.uue --- network-manager-applet-0.8.4~git.20110323t200900.07708e7/debian/icons/22/nm-signal-25-secure.png.uue 2011-05-05 23:48:51.000000000 +0000 +++ network-manager-applet-0.8.4/debian/icons/22/nm-signal-25-secure.png.uue 1970-01-01 00:00:00.000000000 +0000 @@ -1,21 +0,0 @@ -begin 664 nm-signal-25-secure.png -MB5!.1PT*&@H````-24A$4@```!8````6"`8```#$M&P[````!F)+1T0`_P#_ -M`/^@O:>3````"7!(67,```L3```+$P$`FIP8````"79P06<````6````%@#< -MQ>E8```""TE$050XR]64/6L4412&GWO/.5,L8A:2*"O(1DAI-!%$W&K]`PIV -M(H*%6(H_P-(?H*4@6(AV@E8VDE4(AEC$M141;5Q6W40A?F5W9RPV,YG9F<25 -MM?$TPSUWYKGO><\]X]B*Y=57$:DX>>RH8XSP,?3`9)D]YHE^?N/KQQ:+2RO1 -MV&"`Q\^:S,W-N5JMYB;V5>ATUL?A;H/_=;C&C4HT7SO!QH>WF8V]%<_J=T86MH"Y>I"LKNY_AKMOAM)V>U;-^L.B)SCTN4K25X!OKQ_ -M6:AXE%`+.'SD>#X/4)KN4)J>2)(;G37H%X+3I<\#357#BP!1'OS]TR3MSR\` -M"'L]NC]^,3-SJ%#A_7MWZFY@(^?.7T3-\-X1YS+@YO.55$J`$FNM=B'8U#A8 -MG4TPJ@'B)6_%"%V/RQ^4;H:J;A]DAG@/KD#Q;O'HX8,Z+L+A.7WF+"(!HHJ+ -M!IZ*Q![S=V!196IJ?\H*15/-4E.\^.'>Y<"-N.3D!34L,%P4'V1(2J&(%7L\ -MG+A^]TV9P01Q[<+L4Q4EL(#T06FPBB+>$[D_@`&>-)92("4P8VM2$5-$-;%" -M5'$BN9].#AR&(6%_,UE[4*HOUZ`?,_B=_4O8,D!QT%.0`` -M`!UT15AT0V]M;65N=`!#3````"7!(67,```L3```+$P$`FIP8````"79P06<````6````%@#< -MQ>E8```"`DE$050XR]6436L3412&GWO/N5D$L8%2(8*D0I9&6T'$K.+/$"FX -M$)?B#^C2'Z!+07`A^A?VBC5L1T8TA:EJ%^I$F,]=%G*_,M$;BQG>8]Y]PSAM_:V'[E2>G2^7.&&60CZ,GY"L>/79ZO;?J9P0!/ -M7G9H-!JFV6R:N1-5^OV]6;@)^%_+M.]4_5+S(OL?WF8VCEI^W``A'(X8_ -M!BPNGBYT^/C1@Y89EY$K5Z^ASF&M(8IEP)WUS51(@#*[W5XAV*GC5*T>8U1+ -MB)5\*:;H>I3^.'7G4-7D0\XAUH(I<'R4;C]\TXKN5U?JB)0058P?UU0DJC%_ -M!P9XMKZ3*H6BJ6:I4ZS8R=[EP.THY4PT'"4=4(>D'(JXXAH7I%YA/$&LKM1? -MA![\:)B\,`%64<1:O/D#&.!I>RV^]V&`#P:)0Z>(:EP*4<6(Y'XZ.7`8AH3! -M0;(.8#1,U@:#6LDXM-;&S3P4'(2>()5Z&(8$@T'F&:O921.;G])"QVEP@&3````"7!(67,```L3```+$P$`FIP8````"79P06<````6````%@#< -MQ>E8```!ZTE$050XR]6436L3412&G_O511`;*!7BIA6Z-)H*(F:5_I#NQ*7X -M`[KT!^A2<.>/<*.-0FVI2)MN1<1N#%'3*M0VF9E[KPN=[VD:B!O?S\Z]=P1_M;-WX,GH[JV;@ADD8^C5A3J7C,2/?O'S:Y_-K5T_,QC@Q9L>S693 -MM-MM,7^EP7!X/`LW!?]KB>[CAF^U[W#RY5.N<+DAV=L9L/:P/VG6W4+<`02` -M!J@OK5)?6DVJP?$'=/AY*F?/GC[I",`+P;W[#Y*\!OAQN%_I>!II,\?U&[?+ -M>8#:XI#:XGR2/!D>@:T$9UMO`3VM#5(IP)?!I]\6&'Q_!X"+(L*S,@YE%3E44RQZW'[ -M+:`'X$4*,L:@I`11X7B2BJT7I50\XX+CB\``K[;W<[&P-@48C52RN'>T\^"A,O^$'$!&.!E=RMU -MYRS>CI/81A[L*'6L-4*ITD^G!';.X6R0QA:B,,C5HRC(K9%2(KR?#+;.8PNM -MVW'&,9XH&.76*%F^I96.LV"+)PQ3L(\\X].S/+CBN!4O1_94Q,_S5%7O5##_ -M$_T&BN^W#)-"YL<````==$58=$-O;6UE;G0`0W)E871E9"!W:71H(%1H92!' -M24U0[V0E;@```"5T15AT9&%T93IC SEE ALSO - NetworkManager (1). nm-vpn-properties (1) + NetworkManager(8), nm-tool(1) More Information about NetworkManager can be found at http://www.gnome.org/projects/NetworkManager/ . diff -Nru network-manager-applet-0.8.4~git.20110323t200900.07708e7/debian/patches/0001-applet-fix-possibly-uninitialized-variable.patch network-manager-applet-0.8.4/debian/patches/0001-applet-fix-possibly-uninitialized-variable.patch --- network-manager-applet-0.8.4~git.20110323t200900.07708e7/debian/patches/0001-applet-fix-possibly-uninitialized-variable.patch 1970-01-01 00:00:00.000000000 +0000 +++ network-manager-applet-0.8.4/debian/patches/0001-applet-fix-possibly-uninitialized-variable.patch 2011-05-05 23:24:46.000000000 +0000 @@ -0,0 +1,26 @@ +From bbe547f7985498e0bc353ccd2e8e6f9a4a89249b Mon Sep 17 00:00:00 2001 +From: Dan Williams +Date: Mon, 2 May 2011 18:44:18 -0500 +Subject: [PATCH] applet: fix possibly uninitialized variable + +Thanks to Michael Biebl. +--- + src/applet-dialogs.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/src/applet-dialogs.c b/src/applet-dialogs.c +index 42f3d2b..5965a75 100644 +--- a/src/applet-dialogs.c ++++ b/src/applet-dialogs.c +@@ -328,7 +328,7 @@ info_dialog_add_page (GtkNotebook *notebook, + GtkTable *table; + guint32 speed = 0; + char *str; +- const char *iface, *method; ++ const char *iface, *method = NULL; + NMIP4Config *ip4_config; + NMIP6Config *ip6_config; + const GArray *dns; +-- +1.7.4.4 + diff -Nru network-manager-applet-0.8.4~git.20110323t200900.07708e7/debian/patches/04-autostart.patch network-manager-applet-0.8.4/debian/patches/04-autostart.patch --- network-manager-applet-0.8.4~git.20110323t200900.07708e7/debian/patches/04-autostart.patch 1970-01-01 00:00:00.000000000 +0000 +++ network-manager-applet-0.8.4/debian/patches/04-autostart.patch 2011-05-05 23:24:46.000000000 +0000 @@ -0,0 +1,22 @@ +Index: network-manager-applet-0.8.4/nm-applet.desktop.in +=================================================================== +--- network-manager-applet-0.8.4.orig/nm-applet.desktop.in 2011-05-05 15:35:53.000000000 -0400 ++++ network-manager-applet-0.8.4/nm-applet.desktop.in 2011-05-05 16:48:34.854728348 -0400 +@@ -5,6 +5,7 @@ + Exec=nm-applet --sm-disable + Terminal=false + Type=Application ++NotShowIn=KDE; + X-GNOME-Bugzilla-Bugzilla=GNOME + X-GNOME-Bugzilla-Product=NetworkManager + X-GNOME-Bugzilla-Component=general +Index: network-manager-applet-0.8.4/nm-connection-editor.desktop.in +=================================================================== +--- network-manager-applet-0.8.4.orig/nm-connection-editor.desktop.in 2011-05-05 16:48:40.534728346 -0400 ++++ network-manager-applet-0.8.4/nm-connection-editor.desktop.in 2011-05-05 16:48:54.184728340 -0400 +@@ -10,4 +10,4 @@ + X-GNOME-Bugzilla-Product=NetworkManager + X-GNOME-Bugzilla-Component=general + Categories=GNOME;GTK;Settings;X-GNOME-NetworkSettings; +-OnlyShowIn=GNOME; ++NotShowIn=KDE; diff -Nru network-manager-applet-0.8.4~git.20110323t200900.07708e7/debian/patches/applet-dialog-uninited-method.patch network-manager-applet-0.8.4/debian/patches/applet-dialog-uninited-method.patch --- network-manager-applet-0.8.4~git.20110323t200900.07708e7/debian/patches/applet-dialog-uninited-method.patch 2011-05-05 23:48:51.000000000 +0000 +++ network-manager-applet-0.8.4/debian/patches/applet-dialog-uninited-method.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,18 +0,0 @@ -From: Mathieu Trudel-Lapierre -Subject: Fix possibly uninitialized variable "method" in info dialog. - -Simple fix to silence a GCC error. - -Index: network-manager-applet-0.8.3+git.20110114t131931.fd589a7/src/applet-dialogs.c -=================================================================== ---- network-manager-applet-0.8.3+git.20110114t131931.fd589a7.orig/src/applet-dialogs.c 2011-01-17 14:03:35.858037881 -0500 -+++ network-manager-applet-0.8.3+git.20110114t131931.fd589a7/src/applet-dialogs.c 2011-01-17 14:03:53.758037881 -0500 -@@ -328,7 +328,7 @@ - GtkTable *table; - guint32 speed = 0; - char *str; -- const char *iface, *method; -+ const char *iface, *method = NULL; - NMIP4Config *ip4_config; - NMIP6Config *ip6_config; - const GArray *dns; diff -Nru network-manager-applet-0.8.4~git.20110323t200900.07708e7/debian/patches/lp268803_xdg_autostart_gnome_xfce_only.patch network-manager-applet-0.8.4/debian/patches/lp268803_xdg_autostart_gnome_xfce_only.patch --- network-manager-applet-0.8.4~git.20110323t200900.07708e7/debian/patches/lp268803_xdg_autostart_gnome_xfce_only.patch 2011-05-05 23:48:51.000000000 +0000 +++ network-manager-applet-0.8.4/debian/patches/lp268803_xdg_autostart_gnome_xfce_only.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,22 +0,0 @@ -=== modified file 'nm-applet.desktop' ---- - nm-applet.desktop.in | 1 + - 1 file changed, 1 insertion(+) - -Index: ubuntu.0.7/nm-applet.desktop.in -=================================================================== ---- ubuntu.0.7.orig/nm-applet.desktop.in -+++ ubuntu.0.7/nm-applet.desktop.in -@@ -1,11 +1,12 @@ - [Desktop Entry] - _Name=Network Manager - _Comment=Control your network connections - Icon=nm-device-wireless - Exec=nm-applet --sm-disable - Terminal=false - Type=Application -+OnlyShowIn=GNOME;XFCE; - X-GNOME-Bugzilla-Bugzilla=GNOME - X-GNOME-Bugzilla-Product=NetworkManager - X-GNOME-Bugzilla-Component=general - X-GNOME-Autostart-enabled=true diff -Nru network-manager-applet-0.8.4~git.20110323t200900.07708e7/debian/patches/lp295788_xfce_menu_entry.patch network-manager-applet-0.8.4/debian/patches/lp295788_xfce_menu_entry.patch --- network-manager-applet-0.8.4~git.20110323t200900.07708e7/debian/patches/lp295788_xfce_menu_entry.patch 2011-05-05 23:48:51.000000000 +0000 +++ network-manager-applet-0.8.4/debian/patches/lp295788_xfce_menu_entry.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,10 +0,0 @@ -Index: network-manager-applet-0.8.1+git.20101012t222209.f7588d8/nm-connection-editor.desktop.in -=================================================================== ---- network-manager-applet-0.8.1+git.20101012t222209.f7588d8.orig/nm-connection-editor.desktop.in 2010-10-12 23:51:12.000000000 -0400 -+++ network-manager-applet-0.8.1+git.20101012t222209.f7588d8/nm-connection-editor.desktop.in 2010-10-12 23:55:50.929562998 -0400 -@@ -10,4 +10,4 @@ - X-GNOME-Bugzilla-Product=NetworkManager - X-GNOME-Bugzilla-Component=general - Categories=GNOME;GTK;Settings;X-GNOME-NetworkSettings; --OnlyShowIn=GNOME; -+OnlyShowIn=GNOME;Xfce; diff -Nru network-manager-applet-0.8.4~git.20110323t200900.07708e7/debian/patches/lp328572-dxteam-connect-text.patch network-manager-applet-0.8.4/debian/patches/lp328572-dxteam-connect-text.patch --- network-manager-applet-0.8.4~git.20110323t200900.07708e7/debian/patches/lp328572-dxteam-connect-text.patch 2011-05-05 23:48:51.000000000 +0000 +++ network-manager-applet-0.8.4/debian/patches/lp328572-dxteam-connect-text.patch 2011-05-05 23:24:46.000000000 +0000 @@ -3,11 +3,11 @@ src/applet-device-wifi.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) -Index: network-manager-applet-0.8~a~git.20090830t224938.0334788/src/applet-device-wifi.c +Index: network-manager-applet-0.8.4/src/applet-device-wifi.c =================================================================== ---- network-manager-applet-0.8~a~git.20090830t224938.0334788.orig/src/applet-device-wifi.c 2009-08-31 19:30:00.000000000 -0400 -+++ network-manager-applet-0.8~a~git.20090830t224938.0334788/src/applet-device-wifi.c 2009-08-31 19:32:23.000000000 -0400 -@@ -1164,7 +1164,6 @@ +--- network-manager-applet-0.8.4.orig/src/applet-device-wifi.c 2011-05-05 15:35:53.000000000 -0400 ++++ network-manager-applet-0.8.4/src/applet-device-wifi.c 2011-05-05 16:56:12.414728163 -0400 +@@ -1250,7 +1250,6 @@ { NMSettingsConnectionInterface *connection; NMAccessPoint *new = NULL; @@ -15,8 +15,8 @@ char *esc_ssid = NULL; new = update_active_ap (device, new_state, applet); -@@ -1187,12 +1186,11 @@ - nm_settings_connection_interface_update (connection, bssid_update_cb, NULL); +@@ -1273,12 +1272,11 @@ + add_seen_bssid (connection, new); } - msg = g_strdup_printf (_("You are now connected to the wireless network '%s'."), diff -Nru network-manager-applet-0.8.4~git.20110323t200900.07708e7/debian/patches/lp330608_dxteam_gsm_connect_text.patch network-manager-applet-0.8.4/debian/patches/lp330608_dxteam_gsm_connect_text.patch --- network-manager-applet-0.8.4~git.20110323t200900.07708e7/debian/patches/lp330608_dxteam_gsm_connect_text.patch 2011-05-05 23:48:51.000000000 +0000 +++ network-manager-applet-0.8.4/debian/patches/lp330608_dxteam_gsm_connect_text.patch 2011-05-05 23:24:46.000000000 +0000 @@ -1,7 +1,9 @@ === modified file 'src/applet-device-gsm.c' ---- a/src/applet-device-gsm.c 2009-02-17 16:32:22 +0000 -+++ b/src/applet-device-gsm.c 2009-02-17 16:36:47 +0000 -@@ -287,24 +287,19 @@ +Index: network-manager-applet-0.8.4/src/applet-device-gsm.c +=================================================================== +--- network-manager-applet-0.8.4.orig/src/applet-device-gsm.c 2011-05-05 15:35:53.000000000 -0400 ++++ network-manager-applet-0.8.4/src/applet-device-gsm.c 2011-05-05 17:04:29.004727961 -0400 +@@ -405,24 +405,19 @@ if (new_state == NM_DEVICE_STATE_ACTIVATED) { NMConnection *connection; NMSettingConnection *s_con = NULL; @@ -20,14 +22,12 @@ } applet_do_notify_with_pref (applet, -- _("Connection Established"), -- str ? str : _("You are now connected to the GSM network."), + str ? str : _("GSM network."), -+ _("Connection Established"), + _("Connection Established"), +- str ? str : _("You are now connected to the GSM network."), "nm-device-wwan", PREF_DISABLE_CONNECTED_NOTIFICATIONS); - g_free (str); } - } - + /* Start/stop polling of quality and registration when device state changes */ diff -Nru network-manager-applet-0.8.4~git.20110323t200900.07708e7/debian/patches/lp341684_device_sensitive_disconnect_notify.patch network-manager-applet-0.8.4/debian/patches/lp341684_device_sensitive_disconnect_notify.patch --- network-manager-applet-0.8.4~git.20110323t200900.07708e7/debian/patches/lp341684_device_sensitive_disconnect_notify.patch 2011-05-05 23:48:51.000000000 +0000 +++ network-manager-applet-0.8.4/debian/patches/lp341684_device_sensitive_disconnect_notify.patch 2011-05-05 23:24:46.000000000 +0000 @@ -5,11 +5,11 @@ src/applet.h | 3 + 3 files changed, 138 insertions(+), 5 deletions(-) -Index: network-manager-applet-0.8.2+git.20101123t161608.f143e76/src/applet-device-wifi.c +Index: network-manager-applet-0.8.4/src/applet-device-wifi.c =================================================================== ---- network-manager-applet-0.8.2+git.20101123t161608.f143e76.orig/src/applet-device-wifi.c 2010-11-26 13:50:08.433452112 -0500 -+++ network-manager-applet-0.8.2+git.20101123t161608.f143e76/src/applet-device-wifi.c 2010-11-26 13:50:08.503452112 -0500 -@@ -1250,8 +1250,10 @@ +--- network-manager-applet-0.8.4.orig/src/applet-device-wifi.c 2011-05-05 17:06:34.224727910 -0400 ++++ network-manager-applet-0.8.4/src/applet-device-wifi.c 2011-05-05 17:06:38.724727909 -0400 +@@ -1263,8 +1263,10 @@ if (new) { const GByteArray *ssid = nm_access_point_get_ssid (new); @@ -21,10 +21,10 @@ /* Save this BSSID to seen-bssids list */ connection = applet_get_exported_connection_for_device (device, applet); -Index: network-manager-applet-0.8.2+git.20101123t161608.f143e76/src/applet.c +Index: network-manager-applet-0.8.4/src/applet.c =================================================================== ---- network-manager-applet-0.8.2+git.20101123t161608.f143e76.orig/src/applet.c 2010-11-26 13:50:08.283452112 -0500 -+++ network-manager-applet-0.8.2+git.20101123t161608.f143e76/src/applet.c 2010-11-26 13:53:49.823452112 -0500 +--- network-manager-applet-0.8.4.orig/src/applet.c 2011-05-05 17:06:29.004727913 -0400 ++++ network-manager-applet-0.8.4/src/applet.c 2011-05-05 17:06:38.724727909 -0400 @@ -40,6 +40,7 @@ #include @@ -33,7 +33,7 @@ #include #include #include -@@ -74,6 +75,19 @@ +@@ -73,6 +74,19 @@ G_DEFINE_TYPE(NMApplet, nma, G_TYPE_OBJECT) @@ -53,7 +53,7 @@ static NMActiveConnection * applet_get_best_activating_connection (NMApplet *applet, NMDevice **device) { -@@ -2020,6 +2034,59 @@ +@@ -2031,6 +2045,59 @@ return NULL; } @@ -113,7 +113,7 @@ static void applet_common_device_state_changed (NMDevice *device, NMDeviceState new_state, -@@ -2035,6 +2102,54 @@ +@@ -2046,6 +2113,54 @@ vpn_activating = applet_is_any_vpn_activating (applet); switch (new_state) { @@ -168,7 +168,7 @@ case NM_DEVICE_STATE_PREPARE: case NM_DEVICE_STATE_CONFIG: case NM_DEVICE_STATE_NEED_AUTH: -@@ -2112,13 +2227,26 @@ +@@ -2123,13 +2238,26 @@ { NMApplet *applet = NM_APPLET (user_data); @@ -199,12 +199,12 @@ default: break; } -Index: network-manager-applet-0.8.2+git.20101123t161608.f143e76/src/applet.h +Index: network-manager-applet-0.8.4/src/applet.h =================================================================== ---- network-manager-applet-0.8.2+git.20101123t161608.f143e76.orig/src/applet.h 2010-11-26 13:34:34.000000000 -0500 -+++ network-manager-applet-0.8.2+git.20101123t161608.f143e76/src/applet.h 2010-11-26 13:50:08.513452112 -0500 -@@ -167,6 +167,9 @@ - GladeXML * info_dialog_xml; +--- network-manager-applet-0.8.4.orig/src/applet.h 2011-05-05 15:35:53.000000000 -0400 ++++ network-manager-applet-0.8.4/src/applet.h 2011-05-05 17:06:38.724727909 -0400 +@@ -166,6 +166,9 @@ + GtkBuilder * info_dialog_ui; NotifyNotification* notification; gboolean notify_actions; + diff -Nru network-manager-applet-0.8.4~git.20110323t200900.07708e7/debian/patches/series network-manager-applet-0.8.4/debian/patches/series --- network-manager-applet-0.8.4~git.20110323t200900.07708e7/debian/patches/series 2011-05-05 23:48:51.000000000 +0000 +++ network-manager-applet-0.8.4/debian/patches/series 2011-05-05 23:24:46.000000000 +0000 @@ -1,7 +1,7 @@ +0001-applet-fix-possibly-uninitialized-variable.patch +04-autostart.patch 20_use_full_vpn_dialog_service_name_path.patch lp289466_always_show_tray_icon.patch -lp268803_xdg_autostart_gnome_xfce_only.patch -lp295788_xfce_menu_entry.patch lp328572-dxteam-connect-text.patch lp330571_dxteam_wired_connect_text.patch lp330608_dxteam_gsm_connect_text.patch @@ -10,6 +10,3 @@ lp341684_device_sensitive_disconnect_notify.patch lp358526_generic_disconnected_notification_icon.patch lp460144_correctly_update_notification.patch -applet-dialog-uninited-method.patch -applet-wifi-menu-before-vpn.patch -nm-applet-use-indicator.patch diff -Nru network-manager-applet-0.8.4~git.20110323t200900.07708e7/debian/rules network-manager-applet-0.8.4/debian/rules --- network-manager-applet-0.8.4~git.20110323t200900.07708e7/debian/rules 2011-05-05 23:48:51.000000000 +0000 +++ network-manager-applet-0.8.4/debian/rules 2011-05-05 23:24:46.000000000 +0000 @@ -5,45 +5,41 @@ DEB_UPSTREAM_VERSION := $(shell echo $(DEB_VERSION) | sed -e 's/-[^-]*$$//') DEB_MAJOR_VERSION := $(shell echo $(DEB_UPSTREAM_VERSION) | sed -e 's/git.*//') -DEB_AUTO_UPDATE_LIBTOOL = pre -DEB_AUTO_UPDATE_AUTOHEADER = 2.50 -DEB_AUTO_UPDATE_ACLOCAL = 1.11 -DEB_AUTO_UPDATE_AUTOMAKE = 1.11 -a -c -f -DEB_AUTO_UPDATE_AUTOCONF = 2.50 - -include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/rules/patchsys-quilt.mk -include /usr/share/cdbs/1/class/gnome.mk - -DEB_CONFIGURE_EXTRA_FLAGS = \ - --without-gnutls \ - --with-nss \ - --with-mbca \ - --enable-indicator \ - $(NULL) +%: + dh $@ --with autoreconf -GIT_URL := git://git.gnome.org/network-manager-applet -GIT_BRANCH := "NMA_0_8" -GIT_BRANCH_NAME := network-manager-applet +export LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS) -Wl,-z,defs -Wl,--as-needed -ifneq (,$(LOCAL_BRANCH)) -LOCAL_REAL_BRANCH = $(realpath $(LOCAL_BRANCH)) -endif +override_dh_autoreconf: + intltoolize -f -c + dh_autoreconf + +override_dh_auto_configure: + dh_auto_configure -- \ + --enable-indicator + +override_dh_autoreconf_clean: + dh_autoreconf_clean + rm -f po/*.gmo + rm -f intltool-*.in + rm -f m4/intltool.m4 + rm -f po/Makefile.in.in + +override_dh_auto_clean: + dh_auto_clean + rm -f icons/22/*-secure.png icons/22/nm-active-device.png + rm -f debian/*.1 -build/network-manager-gnome:: - /usr/bin/docbook-to-man debian/nm-applet.sgml > debian/nm-applet.1 +override_dh_auto_build: + dh_auto_build + cp -rf $(CURDIR)/debian/icons/22 icons/ + docbook-to-man debian/nm-applet.sgml > debian/nm-applet.1 -common-binary-arch:: +override_dh_install: + dh_install + find debian/network-manager-gnome/ -name \*.la -o -name \*.a | xargs rm -f rm -rf debian/network-manager-gnome/usr/include/ # workaround for icon-changes - # dapper -> intrepid (?) - cp -f debian/network-manager-gnome/usr/share/icons/hicolor/22x22/apps/nm-vpn-active-lock.png \ - debian/network-manager-gnome/usr/share/icons/hicolor/22x22/apps/nm-vpn-lock.png - cp -f debian/network-manager-gnome/usr/share/icons/hicolor/22x22/apps/nm-device-wired.png \ - debian/network-manager-gnome/usr/share/icons/hicolor/22x22/apps/nm-device-wired-autoip.png - # karmic -> lucid - cp -f debian/icons/22/nm-active-device.png \ - debian/network-manager-gnome/usr/share/icons/hicolor/22x22/apps/ # natty fallback icons cp -f debian/icons/22/nm-device-wired-secure.png \ debian/network-manager-gnome/usr/share/icons/hicolor/22x22/apps/ @@ -78,27 +74,16 @@ ln -snf nm-signal-100-secure.png \ debian/network-manager-gnome/usr/share/icons/hicolor/22x22/apps/gsm-3g-full-secure.png -common-binary-post-install-arch:: - find debian/network-manager-gnome/ -name \*.la -o -name \*.a | xargs rm > /dev/null || true +override_dh_auto_test: -clean:: - rm -f po/*.gmo - rm -f debian/*.1 - rm -f gtk-doc.make - echo "# empty file" > aclocal.m4 - rm -f debian/icons/22/*.png -pre-build:: - intltoolize -f -c - set -e; cd debian/icons/22/; uudecode nm-secure-lock.png.uue - set -e; cd debian/icons/22/; uudecode nm-active-device.png.uue - set -e; cd debian/icons/22/; uudecode nm-device-wired-secure.png.uue - set -e; cd debian/icons/22/; uudecode nm-signal-00-secure.png.uue - set -e; cd debian/icons/22/; uudecode nm-signal-25-secure.png.uue - set -e; cd debian/icons/22/; uudecode nm-signal-50-secure.png.uue - set -e; cd debian/icons/22/; uudecode nm-signal-75-secure.png.uue - set -e; cd debian/icons/22/; uudecode nm-signal-100-secure.png.uue - cp -rf $(CURDIR)/debian/icons/22 icons/ +GIT_URL := git://git.gnome.org/network-manager-applet +GIT_BRANCH := "NMA_0_8" +GIT_BRANCH_NAME := network-manager-applet + +ifneq (,$(LOCAL_BRANCH)) +LOCAL_REAL_BRANCH = $(realpath $(LOCAL_BRANCH)) +endif GET_SOURCE = \ set -e; \ diff -Nru network-manager-applet-0.8.4~git.20110323t200900.07708e7/debian/source/format network-manager-applet-0.8.4/debian/source/format --- network-manager-applet-0.8.4~git.20110323t200900.07708e7/debian/source/format 1970-01-01 00:00:00.000000000 +0000 +++ network-manager-applet-0.8.4/debian/source/format 2011-05-05 23:48:51.000000000 +0000 @@ -0,0 +1 @@ +3.0 (quilt) diff -Nru network-manager-applet-0.8.4~git.20110323t200900.07708e7/debian/source/include-binaries network-manager-applet-0.8.4/debian/source/include-binaries --- network-manager-applet-0.8.4~git.20110323t200900.07708e7/debian/source/include-binaries 1970-01-01 00:00:00.000000000 +0000 +++ network-manager-applet-0.8.4/debian/source/include-binaries 2011-05-05 23:24:46.000000000 +0000 @@ -0,0 +1,8 @@ +debian/icons/22/nm-secure-lock.png +debian/icons/22/nm-signal-25-secure.png +debian/icons/22/nm-signal-00-secure.png +debian/icons/22/nm-device-wired-secure.png +debian/icons/22/nm-signal-75-secure.png +debian/icons/22/nm-signal-50-secure.png +debian/icons/22/nm-active-device.png +debian/icons/22/nm-signal-100-secure.png diff -Nru network-manager-applet-0.8.4~git.20110323t200900.07708e7/NEWS network-manager-applet-0.8.4/NEWS --- network-manager-applet-0.8.4~git.20110323t200900.07708e7/NEWS 2011-03-24 06:01:13.000000000 +0000 +++ network-manager-applet-0.8.4/NEWS 2011-05-05 19:35:53.000000000 +0000 @@ -12,6 +12,9 @@ * Show IPv6 information in Connection Information dialog * Completely fix crashes due to missing icons * Make VPN notifications respect user's "Enable Notifications" preference +* Don't show access points named "Free Public Wifi" +* Fixes for converting 802.1x certificate-based connections +* Fix an issue causing editor pages to be insensitive ======================================================= diff -Nru network-manager-applet-0.8.4~git.20110323t200900.07708e7/po/POTFILES.in network-manager-applet-0.8.4/po/POTFILES.in --- network-manager-applet-0.8.4~git.20110323t200900.07708e7/po/POTFILES.in 2011-03-24 06:01:13.000000000 +0000 +++ network-manager-applet-0.8.4/po/POTFILES.in 2011-05-05 19:35:53.000000000 +0000 @@ -12,9 +12,14 @@ src/applet-device-wifi.c src/applet-dialogs.c src/applet.c -[type: gettext/glade]src/applet.ui src/applet.h +[type: gettext/glade]src/gsm-unlock.ui +[type: gettext/glade]src/info.ui +[type: gettext/glade]src/wifi.ui +[type: gettext/glade]src/wired-8021x.ui src/connection-editor/ce-page.c +[type: gettext/glade]src/connection-editor/ce-ip4-routes.ui +[type: gettext/glade]src/connection-editor/ce-ip6-routes.ui [type: gettext/glade]src/connection-editor/ce-page-dsl.ui [type: gettext/glade]src/connection-editor/ce-page-ip4.ui [type: gettext/glade]src/connection-editor/ce-page-ip6.ui @@ -23,6 +28,7 @@ [type: gettext/glade]src/connection-editor/ce-page-wired.ui [type: gettext/glade]src/connection-editor/ce-page-wireless.ui [type: gettext/glade]src/connection-editor/ce-page-wireless-security.ui +[type: gettext/glade]src/connection-editor/ce-ppp-auth-methods.ui [type: gettext/glade]src/connection-editor/ce-vpn-wizard.ui src/connection-editor/ip4-routes-dialog.c src/connection-editor/ip6-routes-dialog.c diff -Nru network-manager-applet-0.8.4~git.20110323t200900.07708e7/src/applet.c network-manager-applet-0.8.4/src/applet.c --- network-manager-applet-0.8.4~git.20110323t200900.07708e7/src/applet.c 2011-03-24 06:01:13.000000000 +0000 +++ network-manager-applet-0.8.4/src/applet.c 2011-05-05 19:35:53.000000000 +0000 @@ -1453,8 +1453,8 @@ continue; if (!nm_connection_get_setting (connection, NM_TYPE_SETTING_VPN)) { - g_warning ("%s: VPN connection '%s' didn't have requires vpn setting.", __func__, - nm_setting_get_name (NM_SETTING (s_con))); + g_warning ("%s: VPN connection '%s' didn't have required vpn setting.", __func__, + nm_setting_connection_get_id (s_con)); continue; } @@ -3035,19 +3035,10 @@ g_set_application_name (_("NetworkManager Applet")); gtk_window_set_default_icon_name (GTK_STOCK_NETWORK); - applet->ui_file = g_build_filename (UIDIR, "/applet.ui", NULL); - if (!applet->ui_file || !g_file_test (applet->ui_file, G_FILE_TEST_IS_REGULAR)) { - GtkWidget *dialog; - dialog = applet_warning_dialog_show (_("The NetworkManager Applet could not find some required resources (the .ui file was not found).")); - gtk_dialog_run (GTK_DIALOG (dialog)); - goto error; - } - applet->info_dialog_ui = gtk_builder_new (); - if (!gtk_builder_add_from_file (applet->info_dialog_ui, applet->ui_file, &error)) - { - g_warning ("Couldn't load builder file: %s", error->message); + if (!gtk_builder_add_from_file (applet->info_dialog_ui, UIDIR "/info.ui", &error)) { + g_warning ("Couldn't load info dialog ui file: %s", error->message); g_error_free (error); goto error; } @@ -3159,7 +3150,6 @@ g_object_unref (applet->notification); } - g_free (applet->ui_file); if (applet->info_dialog_ui) g_object_unref (applet->info_dialog_ui); diff -Nru network-manager-applet-0.8.4~git.20110323t200900.07708e7/src/applet-device-wifi.c network-manager-applet-0.8.4/src/applet-device-wifi.c --- network-manager-applet-0.8.4~git.20110323t200900.07708e7/src/applet-device-wifi.c 2011-03-24 06:01:13.000000000 +0000 +++ network-manager-applet-0.8.4/src/applet-device-wifi.c 2011-05-05 19:35:53.000000000 +0000 @@ -439,9 +439,9 @@ s_con = NM_SETTING_CONNECTION (nm_setting_connection_new ()); g_object_set (s_con, - NM_SETTING_CONNECTION_TYPE, nm_setting_get_name (NM_SETTING (s_wireless)), - NM_SETTING_CONNECTION_AUTOCONNECT, !is_manufacturer_default_ssid (ap_ssid), - NULL); + NM_SETTING_CONNECTION_TYPE, NM_SETTING_WIRELESS_SETTING_NAME, + NM_SETTING_CONNECTION_AUTOCONNECT, !is_manufacturer_default_ssid (ap_ssid), + NULL); memset (buf, 0, sizeof (buf)); buf_len = MIN(ap_ssid->len, sizeof (buf) - 1); diff -Nru network-manager-applet-0.8.4~git.20110323t200900.07708e7/src/applet-device-wired.c network-manager-applet-0.8.4/src/applet-device-wired.c --- network-manager-applet-0.8.4~git.20110323t200900.07708e7/src/applet-device-wired.c 2011-03-24 06:01:13.000000000 +0000 +++ network-manager-applet-0.8.4/src/applet-device-wired.c 2011-05-05 19:35:53.000000000 +0000 @@ -81,11 +81,11 @@ s_con = NM_SETTING_CONNECTION (nm_setting_connection_new ()); uuid = nm_utils_uuid_generate (); g_object_set (s_con, - NM_SETTING_CONNECTION_ID, DEFAULT_WIRED_NAME, - NM_SETTING_CONNECTION_TYPE, nm_setting_get_name (NM_SETTING (s_wired)), - NM_SETTING_CONNECTION_AUTOCONNECT, TRUE, - NM_SETTING_CONNECTION_UUID, uuid, - NULL); + NM_SETTING_CONNECTION_ID, DEFAULT_WIRED_NAME, + NM_SETTING_CONNECTION_TYPE, NM_SETTING_WIRED_SETTING_NAME, + NM_SETTING_CONNECTION_AUTOCONNECT, TRUE, + NM_SETTING_CONNECTION_UUID, uuid, + NULL); g_free (uuid); nm_connection_add_setting (connection, NM_SETTING (s_con)); @@ -716,10 +716,7 @@ GtkWidget *dialog; NM8021xInfo *info; - dialog = nma_wired_dialog_new (applet->ui_file, - applet->nm_client, - g_object_ref (connection), - device); + dialog = nma_wired_dialog_new (applet->nm_client, g_object_ref (connection), device); if (!dialog) { g_set_error (error, NM_SETTINGS_INTERFACE_ERROR, diff -Nru network-manager-applet-0.8.4~git.20110323t200900.07708e7/src/applet-dialogs.c network-manager-applet-0.8.4/src/applet-dialogs.c --- network-manager-applet-0.8.4~git.20110323t200900.07708e7/src/applet-dialogs.c 2011-03-24 06:01:13.000000000 +0000 +++ network-manager-applet-0.8.4/src/applet-dialogs.c 2011-05-05 19:35:53.000000000 +0000 @@ -905,7 +905,7 @@ builder = gtk_builder_new (); - if (!gtk_builder_add_from_file (builder, UIDIR "/applet.ui", &error)) { + if (!gtk_builder_add_from_file (builder, UIDIR "/gsm-unlock.ui", &error)) { g_warning ("Couldn't load builder file: %s", error->message); g_error_free (error); g_object_unref (builder); diff -Nru network-manager-applet-0.8.4~git.20110323t200900.07708e7/src/applet.h network-manager-applet-0.8.4/src/applet.h --- network-manager-applet-0.8.4~git.20110323t200900.07708e7/src/applet.h 2011-03-24 06:01:13.000000000 +0000 +++ network-manager-applet-0.8.4/src/applet.h 2011-05-05 19:35:53.000000000 +0000 @@ -89,7 +89,6 @@ NMAGConfSettings *gconf_settings; GConfClient * gconf_client; - char * ui_file; guint update_timestamps_id; diff -Nru network-manager-applet-0.8.4~git.20110323t200900.07708e7/src/applet.ui network-manager-applet-0.8.4/src/applet.ui --- network-manager-applet-0.8.4~git.20110323t200900.07708e7/src/applet.ui 2011-03-24 06:01:13.000000000 +0000 +++ network-manager-applet-0.8.4/src/applet.ui 1970-01-01 00:00:00.000000000 +0000 @@ -1,724 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - Other Wireless Network... - False - True - center-always - 488 - gtk-dialog-authentication - dialog - False - - - True - vertical - 2 - - - True - 5 - 12 - - - True - 0 - network-wireless - 6 - - - False - 0 - - - - - True - vertical - 6 - - - True - 0 - True - True - - - 0 - - - - - True - 5 - 2 - 12 - 6 - - - True - vertical - - - - - - 2 - 4 - 5 - GTK_FILL - - - - - True - 0 - _Wireless security: - True - security_combo - - - 3 - 4 - GTK_FILL - - - - - - True - model1 - - - - 0 - - - - - 1 - 2 - 3 - 4 - GTK_FILL - GTK_FILL - - - - - True - 0 - _Network name: - True - network_name_entry - - - 2 - 3 - GTK_FILL - - - - - - True - True - True - - - 1 - 2 - 2 - 3 - - - - - - True - 0 - Co_nnection: - True - connection_combo - - - 1 - 2 - GTK_FILL - - - - - - True - - - 1 - 2 - 1 - 2 - GTK_FILL - GTK_FILL - - - - - True - 0 - Wireless _adapter: - True - device_combo - - - GTK_FILL - - - - - - True - model2 - - - - 0 - - - - - 1 - 2 - GTK_FILL - GTK_FILL - - - - - 1 - - - - - 1 - - - - - 1 - - - - - True - end - - - gtk-cancel - True - True - True - False - True - - - False - False - 0 - - - - - True - True - True - True - False - - - True - 0 - 0 - - - True - 2 - - - True - gtk-connect - - - False - False - 0 - - - - - True - C_onnect - True - - - False - False - 1 - - - - - - - - - False - False - 1 - - - - - False - end - 0 - - - - - - cancel_button - ok_button - - - - 5 - Connection Information - False - gtk-info - dialog - False - - - True - vertical - 2 - - - True - vertical - - - True - 5 - 12 - - - True - 0 - gtk-dialog-info - 6 - - - False - False - 0 - - - - - True - vertical - 6 - - - True - 0 - Active Network Connections - - - - - - - False - False - 0 - - - - - True - True - - - True - - - - - True - - - False - - - - - 1 - - - - - 1 - - - - - 0 - - - - - 1 - - - - - True - end - - - gtk-close - True - True - True - True - True - False - True - - - False - False - 0 - - - - - False - end - 0 - - - - - - closebutton1 - - - - 5 - center - 400 - dialog-password - dialog - False - - - True - vertical - 2 - - - True - 6 - - - True - 0 - - - True - 0 - gtk-dialog-authentication - 6 - - - - - False - 6 - 0 - - - - - True - vertical - 12 - - - True - 0 - label - True - - - False - 12 - 0 - - - - - True - 0 - label - True - - - False - 1 - - - - - True - 0 - 0 - 12 - 12 - 12 - 12 - - - True - 5 - 2 - 6 - 6 - - - True - 0 - label - - - GTK_FILL - - - - - True - True - True - True - - - 1 - 2 - - - - - True - 0 - label - - - 1 - 2 - GTK_FILL - - - - - True - True - True - - - 1 - 2 - 1 - 2 - - - - - True - 0 - label - - - 2 - 3 - GTK_FILL - - - - - True - True - True - - - 1 - 2 - 2 - 3 - - - - - True - 6 - - - True - 0 - - - - - - False - False - 0 - - - - - True - 0 - True - - - 1 - - - - - 1 - 2 - 4 - 5 - GTK_FILL - GTK_FILL - 6 - - - - - Show it - True - True - False - True - - - 1 - 2 - 3 - 4 - - - - - - - - - - - - - False - 2 - - - - - False - 1 - - - - - False - False - 1 - - - - - True - end - - - gtk-cancel - True - True - True - True - - - False - False - 0 - - - - - _Unlock - True - True - True - True - True - True - - - False - False - 1 - - - - - False - end - 0 - - - - - - unlock_cancel_button - unlock_button - - - diff -Nru network-manager-applet-0.8.4~git.20110323t200900.07708e7/src/connection-editor/ce-ip4-routes.ui network-manager-applet-0.8.4/src/connection-editor/ce-ip4-routes.ui --- network-manager-applet-0.8.4~git.20110323t200900.07708e7/src/connection-editor/ce-ip4-routes.ui 1970-01-01 00:00:00.000000000 +0000 +++ network-manager-applet-0.8.4/src/connection-editor/ce-ip4-routes.ui 2011-05-05 19:35:53.000000000 +0000 @@ -0,0 +1,179 @@ + + + + + + 450 + 250 + 5 + True + center-on-parent + stock-peferences + dialog + False + + + True + vertical + 2 + + + True + 5 + vertical + 6 + + + True + 6 + + + True + True + never + automatic + in + + + 100 + True + True + True + IP addresses identify your computer on the network. Click the "Add" button to add an IP address. + True + + + + + 0 + + + + + True + 6 + start + + + gtk-add + True + True + True + True + True + + + False + False + 0 + + + + + gtk-delete + True + True + True + True + True + + + False + False + 1 + + + + + False + False + 1 + + + + + 0 + + + + + Ig_nore automatically obtained routes + True + True + False + True + True + + + False + 1 + + + + + Use this c_onnection only for resources on its network + True + True + False + True + If enabled, this connection will never be used as the default network connection. + True + True + + + False + 2 + + + + + 1 + + + + + True + end + + + gtk-cancel + True + True + False + True + + + False + False + 0 + + + + + gtk-ok + True + True + False + True + + + False + False + 1 + + + + + False + end + 0 + + + + + + cancel_button + ok_button + + + diff -Nru network-manager-applet-0.8.4~git.20110323t200900.07708e7/src/connection-editor/ce-ip6-routes.ui network-manager-applet-0.8.4/src/connection-editor/ce-ip6-routes.ui --- network-manager-applet-0.8.4~git.20110323t200900.07708e7/src/connection-editor/ce-ip6-routes.ui 1970-01-01 00:00:00.000000000 +0000 +++ network-manager-applet-0.8.4/src/connection-editor/ce-ip6-routes.ui 2011-05-05 19:35:53.000000000 +0000 @@ -0,0 +1,178 @@ + + + + + + 450 + 250 + 5 + True + center-on-parent + stock-peferences + dialog + False + + + True + 2 + + + True + 5 + vertical + 6 + + + True + 6 + + + True + True + never + automatic + in + + + 100 + True + True + True + IP addresses identify your computer on the network. Click the "Add" button to add an IP address. + True + + + + + 0 + + + + + True + 6 + start + + + gtk-add + True + True + True + True + True + + + False + False + 0 + + + + + gtk-delete + True + True + True + True + True + + + False + False + 1 + + + + + False + False + 1 + + + + + 0 + + + + + Ig_nore automatically obtained routes + True + True + False + True + True + + + False + 1 + + + + + Use this c_onnection only for resources on its network + True + True + False + True + If enabled, this connection will never be used as the default network connection. + True + True + + + False + 2 + + + + + 1 + + + + + True + end + + + gtk-cancel + True + True + False + True + + + False + False + 0 + + + + + gtk-ok + True + True + False + True + + + False + False + 1 + + + + + False + end + 0 + + + + + + cancel_button + ok_button + + + diff -Nru network-manager-applet-0.8.4~git.20110323t200900.07708e7/src/connection-editor/ce-page-dsl.ui network-manager-applet-0.8.4/src/connection-editor/ce-page-dsl.ui --- network-manager-applet-0.8.4~git.20110323t200900.07708e7/src/connection-editor/ce-page-dsl.ui 2011-03-24 06:01:13.000000000 +0000 +++ network-manager-applet-0.8.4/src/connection-editor/ce-page-dsl.ui 2011-05-05 19:35:53.000000000 +0000 @@ -2,9 +2,6 @@ - - window1 - True 12 @@ -124,6 +121,4 @@ - - diff -Nru network-manager-applet-0.8.4~git.20110323t200900.07708e7/src/connection-editor/ce-page-ip4.ui network-manager-applet-0.8.4/src/connection-editor/ce-page-ip4.ui --- network-manager-applet-0.8.4~git.20110323t200900.07708e7/src/connection-editor/ce-page-ip4.ui 2011-03-24 06:01:13.000000000 +0000 +++ network-manager-applet-0.8.4/src/connection-editor/ce-page-ip4.ui 2011-05-05 19:35:53.000000000 +0000 @@ -25,9 +25,6 @@ - - window3 - True 12 @@ -353,180 +350,4 @@ - - - - 450 - 250 - 5 - True - center-on-parent - stock-peferences - dialog - False - - - True - vertical - 2 - - - True - 5 - vertical - 6 - - - True - 6 - - - True - True - never - automatic - in - - - 100 - True - True - True - IP addresses identify your computer on the network. Click the "Add" button to add an IP address. - True - - - - - 0 - - - - - True - 6 - start - - - gtk-add - True - True - True - True - True - - - False - False - 0 - - - - - gtk-delete - True - True - True - True - True - - - False - False - 1 - - - - - False - False - 1 - - - - - 0 - - - - - Ig_nore automatically obtained routes - True - True - False - True - True - - - False - 1 - - - - - Use this c_onnection only for resources on its network - True - True - False - True - If enabled, this connection will never be used as the default network connection. - True - True - - - False - 2 - - - - - 1 - - - - - True - end - - - gtk-cancel - True - True - False - True - - - False - False - 0 - - - - - gtk-ok - True - True - False - True - - - False - False - 1 - - - - - False - end - 0 - - - - - - cancel_button - ok_button - - diff -Nru network-manager-applet-0.8.4~git.20110323t200900.07708e7/src/connection-editor/ce-page-ip6.ui network-manager-applet-0.8.4/src/connection-editor/ce-page-ip6.ui --- network-manager-applet-0.8.4~git.20110323t200900.07708e7/src/connection-editor/ce-page-ip6.ui 2011-03-24 06:01:13.000000000 +0000 +++ network-manager-applet-0.8.4/src/connection-editor/ce-page-ip6.ui 2011-05-05 19:35:53.000000000 +0000 @@ -25,9 +25,6 @@ - - window3 - True 12 @@ -324,179 +321,4 @@ - - - - 450 - 250 - 5 - True - center-on-parent - stock-peferences - dialog - False - - - True - 2 - - - True - 5 - vertical - 6 - - - True - 6 - - - True - True - never - automatic - in - - - 100 - True - True - True - IP addresses identify your computer on the network. Click the "Add" button to add an IP address. - True - - - - - 0 - - - - - True - 6 - start - - - gtk-add - True - True - True - True - True - - - False - False - 0 - - - - - gtk-delete - True - True - True - True - True - - - False - False - 1 - - - - - False - False - 1 - - - - - 0 - - - - - Ig_nore automatically obtained routes - True - True - False - True - True - - - False - 1 - - - - - Use this c_onnection only for resources on its network - True - True - False - True - If enabled, this connection will never be used as the default network connection. - True - True - - - False - 2 - - - - - 1 - - - - - True - end - - - gtk-cancel - True - True - False - True - - - False - False - 0 - - - - - gtk-ok - True - True - False - True - - - False - False - 1 - - - - - False - end - 0 - - - - - - cancel_button - ok_button - - diff -Nru network-manager-applet-0.8.4~git.20110323t200900.07708e7/src/connection-editor/ce-page-mobile.ui network-manager-applet-0.8.4/src/connection-editor/ce-page-mobile.ui --- network-manager-applet-0.8.4~git.20110323t200900.07708e7/src/connection-editor/ce-page-mobile.ui 2011-03-24 06:01:13.000000000 +0000 +++ network-manager-applet-0.8.4/src/connection-editor/ce-page-mobile.ui 2011-05-05 19:35:53.000000000 +0000 @@ -25,9 +25,6 @@ - - window1 - True 12 @@ -397,6 +394,4 @@ - - diff -Nru network-manager-applet-0.8.4~git.20110323t200900.07708e7/src/connection-editor/ce-page-ppp.ui network-manager-applet-0.8.4/src/connection-editor/ce-page-ppp.ui --- network-manager-applet-0.8.4~git.20110323t200900.07708e7/src/connection-editor/ce-page-ppp.ui 2011-03-24 06:01:13.000000000 +0000 +++ network-manager-applet-0.8.4/src/connection-editor/ce-page-ppp.ui 2011-05-05 19:35:53.000000000 +0000 @@ -2,9 +2,6 @@ - - window1 - True 12 @@ -305,189 +302,4 @@ - - - - all - 5 - center-on-parent - stock-preferences - dialog - False - - - True - 2 - - - True - 5 - 6 - - - True - 0 - Allowed Authentication Methods - - - - - - False - 0 - - - - - True - 12 - - - True - 6 - - - _EAP - True - True - False - Extensible Authentication Protocol - True - True - - - 0 - - - - - _PAP - True - True - False - Password Authentication Protocol - True - True - - - 1 - - - - - C_HAP - True - True - False - Challenge Handshake Authentication Protocol - True - True - - - 2 - - - - - _MSCHAP - True - True - False - Microsoft Challenge Handshake Authentication Protocol - True - True - - - 3 - - - - - MSCHAP v_2 - True - True - False - Microsoft Challenge Handshake Authentication Protocol version 2 - True - True - - - 4 - - - - - True - 0 - In most cases, the provider's PPP servers will support all authentication methods. If connections fail, try disabling support for some methods. - True - - - - - - 5 - - - - - - - False - 1 - - - - - False - False - 1 - - - - - True - end - - - gtk-cancel - True - True - True - True - - - False - False - 0 - - - - - gtk-ok - True - True - True - True - - - False - False - 1 - - - - - False - end - 0 - - - - - - cancel_button - ok_button - - diff -Nru network-manager-applet-0.8.4~git.20110323t200900.07708e7/src/connection-editor/ce-page-wired.ui network-manager-applet-0.8.4/src/connection-editor/ce-page-wired.ui --- network-manager-applet-0.8.4~git.20110323t200900.07708e7/src/connection-editor/ce-page-wired.ui 2011-03-24 06:01:13.000000000 +0000 +++ network-manager-applet-0.8.4/src/connection-editor/ce-page-wired.ui 2011-05-05 19:35:53.000000000 +0000 @@ -54,9 +54,6 @@ - - window1 - True 12 @@ -272,6 +269,4 @@ - - diff -Nru network-manager-applet-0.8.4~git.20110323t200900.07708e7/src/connection-editor/ce-page-wireless-security.ui network-manager-applet-0.8.4/src/connection-editor/ce-page-wireless-security.ui --- network-manager-applet-0.8.4~git.20110323t200900.07708e7/src/connection-editor/ce-page-wireless-security.ui 2011-03-24 06:01:13.000000000 +0000 +++ network-manager-applet-0.8.4/src/connection-editor/ce-page-wireless-security.ui 2011-05-05 19:35:53.000000000 +0000 @@ -13,9 +13,6 @@ - - window2 - True 12 @@ -67,6 +64,4 @@ - - diff -Nru network-manager-applet-0.8.4~git.20110323t200900.07708e7/src/connection-editor/ce-page-wireless.ui network-manager-applet-0.8.4/src/connection-editor/ce-page-wireless.ui --- network-manager-applet-0.8.4~git.20110323t200900.07708e7/src/connection-editor/ce-page-wireless.ui 2011-03-24 06:01:13.000000000 +0000 +++ network-manager-applet-0.8.4/src/connection-editor/ce-page-wireless.ui 2011-05-05 19:35:53.000000000 +0000 @@ -57,9 +57,6 @@ - - window2 - True 12 @@ -435,6 +432,4 @@ - - diff -Nru network-manager-applet-0.8.4~git.20110323t200900.07708e7/src/connection-editor/ce-polkit-button.c network-manager-applet-0.8.4/src/connection-editor/ce-polkit-button.c --- network-manager-applet-0.8.4~git.20110323t200900.07708e7/src/connection-editor/ce-polkit-button.c 2011-03-24 06:01:13.000000000 +0000 +++ network-manager-applet-0.8.4/src/connection-editor/ce-polkit-button.c 2011-05-05 19:35:53.000000000 +0000 @@ -254,24 +254,20 @@ CEPolkitButtonPrivate *priv = CE_POLKIT_BUTTON_GET_PRIVATE (object); GSList *iter; - if (priv->disposed) { - g_warning ("%s: CEPolkitButton object %p disposed twice", __func__, object); - G_OBJECT_CLASS (ce_polkit_button_parent_class)->dispose (object); - return; - } - - priv->disposed = TRUE; + if (priv->disposed == FALSE) { + priv->disposed = TRUE; - /* Mark any ongoing permissions calls as disposed */ - for (iter = priv->perm_calls; iter; iter = g_slist_next (iter)) - ((PermInfo *) iter->data)->disposed = TRUE; - - if (priv->check_id) - g_signal_handler_disconnect (priv->settings, priv->check_id); - - g_object_unref (priv->settings); - g_object_unref (priv->auth); - g_object_unref (priv->stock); + /* Mark any ongoing permissions calls as disposed */ + for (iter = priv->perm_calls; iter; iter = g_slist_next (iter)) + ((PermInfo *) iter->data)->disposed = TRUE; + + if (priv->check_id) + g_signal_handler_disconnect (priv->settings, priv->check_id); + + g_object_unref (priv->settings); + g_object_unref (priv->auth); + g_object_unref (priv->stock); + } G_OBJECT_CLASS (ce_polkit_button_parent_class)->dispose (object); } diff -Nru network-manager-applet-0.8.4~git.20110323t200900.07708e7/src/connection-editor/ce-ppp-auth-methods.ui network-manager-applet-0.8.4/src/connection-editor/ce-ppp-auth-methods.ui --- network-manager-applet-0.8.4~git.20110323t200900.07708e7/src/connection-editor/ce-ppp-auth-methods.ui 1970-01-01 00:00:00.000000000 +0000 +++ network-manager-applet-0.8.4/src/connection-editor/ce-ppp-auth-methods.ui 2011-05-05 19:35:53.000000000 +0000 @@ -0,0 +1,188 @@ + + + + + + all + 5 + center-on-parent + stock-preferences + dialog + False + + + True + 2 + + + True + 5 + 6 + + + True + 0 + Allowed Authentication Methods + + + + + + False + 0 + + + + + True + 12 + + + True + 6 + + + _EAP + True + True + False + Extensible Authentication Protocol + True + True + + + 0 + + + + + _PAP + True + True + False + Password Authentication Protocol + True + True + + + 1 + + + + + C_HAP + True + True + False + Challenge Handshake Authentication Protocol + True + True + + + 2 + + + + + _MSCHAP + True + True + False + Microsoft Challenge Handshake Authentication Protocol + True + True + + + 3 + + + + + MSCHAP v_2 + True + True + False + Microsoft Challenge Handshake Authentication Protocol version 2 + True + True + + + 4 + + + + + True + 0 + In most cases, the provider's PPP servers will support all authentication methods. If connections fail, try disabling support for some methods. + True + + + + + + 5 + + + + + + + False + 1 + + + + + False + False + 1 + + + + + True + end + + + gtk-cancel + True + True + True + True + + + False + False + 0 + + + + + gtk-ok + True + True + True + True + + + False + False + 1 + + + + + False + end + 0 + + + + + + cancel_button + ok_button + + + diff -Nru network-manager-applet-0.8.4~git.20110323t200900.07708e7/src/connection-editor/ip4-routes-dialog.c network-manager-applet-0.8.4/src/connection-editor/ip4-routes-dialog.c --- network-manager-applet-0.8.4~git.20110323t200900.07708e7/src/connection-editor/ip4-routes-dialog.c 2011-03-24 06:01:13.000000000 +0000 +++ network-manager-applet-0.8.4/src/connection-editor/ip4-routes-dialog.c 2011-05-05 19:35:53.000000000 +0000 @@ -17,7 +17,7 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * - * (C) Copyright 2008 Red Hat, Inc. + * (C) Copyright 2008 - 2011 Red Hat, Inc. */ #include @@ -317,7 +317,9 @@ GtkWidget *ok_button = user_data; GtkEditable *editable = GTK_EDITABLE (entry); int i, count = 0; - gchar *result = g_new (gchar, length); + gchar *result; + + result = g_malloc0 (length + 1); for (i = 0; i < length; i++) { if ((text[i] >= '0' && text[i] <= '9') || (text[i] == '.')) @@ -432,8 +434,7 @@ builder = gtk_builder_new (); - if (!gtk_builder_add_from_file (builder, UIDIR "/ce-page-ip4.ui", &error)) - { + if (!gtk_builder_add_from_file (builder, UIDIR "/ce-ip4-routes.ui", &error)) { g_warning ("Couldn't load builder file: %s", error->message); g_error_free (error); return NULL; diff -Nru network-manager-applet-0.8.4~git.20110323t200900.07708e7/src/connection-editor/ip6-routes-dialog.c network-manager-applet-0.8.4/src/connection-editor/ip6-routes-dialog.c --- network-manager-applet-0.8.4~git.20110323t200900.07708e7/src/connection-editor/ip6-routes-dialog.c 2011-03-24 06:01:13.000000000 +0000 +++ network-manager-applet-0.8.4/src/connection-editor/ip6-routes-dialog.c 2011-05-05 19:35:53.000000000 +0000 @@ -17,7 +17,7 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * - * (C) Copyright 2008 Red Hat, Inc. + * (C) Copyright 2008 - 2011 Red Hat, Inc. */ #include @@ -274,7 +274,9 @@ GtkWidget *ok_button = user_data; GtkEditable *editable = GTK_EDITABLE (entry); int i, count = 0; - gchar *result = g_new (gchar, length); + gchar *result; + + result = g_malloc0 (length + 1); for (i = 0; i < length; i++) { if (g_ascii_isxdigit(text[i]) || (text[i] == ':')) @@ -389,8 +391,7 @@ builder = gtk_builder_new (); - if (!gtk_builder_add_from_file (builder, UIDIR "/ce-page-ip6.ui", &error)) - { + if (!gtk_builder_add_from_file (builder, UIDIR "/ce-ip6-routes.ui", &error)) { g_warning ("Couldn't load builder file: %s", error->message); g_error_free (error); return NULL; diff -Nru network-manager-applet-0.8.4~git.20110323t200900.07708e7/src/connection-editor/Makefile.am network-manager-applet-0.8.4/src/connection-editor/Makefile.am --- network-manager-applet-0.8.4~git.20110323t200900.07708e7/src/connection-editor/Makefile.am 2011-03-24 06:01:13.000000000 +0000 +++ network-manager-applet-0.8.4/src/connection-editor/Makefile.am 2011-05-05 19:35:53.000000000 +0000 @@ -73,10 +73,13 @@ ce-page-wireless.ui \ ce-page-wireless-security.ui \ ce-page-ip4.ui \ + ce-ip4-routes.ui \ ce-page-ip6.ui \ + ce-ip6-routes.ui \ ce-page-dsl.ui \ ce-page-mobile.ui \ ce-page-ppp.ui \ + ce-ppp-auth-methods.ui \ ce-vpn-wizard.ui BUILT_SOURCES = nm-connection-editor-service-glue.h diff -Nru network-manager-applet-0.8.4~git.20110323t200900.07708e7/src/connection-editor/nm-connection-editor.c network-manager-applet-0.8.4/src/connection-editor/nm-connection-editor.c --- network-manager-applet-0.8.4~git.20110323t200900.07708e7/src/connection-editor/nm-connection-editor.c 2011-03-24 06:01:13.000000000 +0000 +++ network-manager-applet-0.8.4/src/connection-editor/nm-connection-editor.c 2011-05-05 19:35:53.000000000 +0000 @@ -19,7 +19,7 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * - * (C) Copyright 2007 - 2010 Red Hat, Inc. + * (C) Copyright 2007 - 2011 Red Hat, Inc. * (C) Copyright 2007 - 2008 Novell, Inc. */ @@ -272,18 +272,20 @@ connection_editor_validate (editor); } -#define NMCE_UI UIDIR "/nm-connection-editor.ui" - static void nm_connection_editor_init (NMConnectionEditor *editor) { GtkWidget *dialog; GError *error = NULL; + const char *objects[] = { "nm-connection-editor", NULL }; editor->builder = gtk_builder_new (); - if (!gtk_builder_add_from_file (editor->builder, NMCE_UI, &error)) { - g_warning ("Couldn't load builder file " NMCE_UI ": %s", error->message); + if (!gtk_builder_add_objects_from_file (editor->builder, + UIDIR "/nm-connection-editor.ui", + (char **) objects, + &error)) { + g_warning ("Couldn't load builder file " UIDIR "/nm-connection-editor.ui: %s", error->message); g_error_free (error); dialog = gtk_message_dialog_new (NULL, 0, @@ -623,25 +625,6 @@ { GetSecretsInfo *info; - if (!setting_name) { - /* page doesn't need any secrets */ - ce_page_complete_init (page, NULL, NULL, NULL); - return; - } - - /* Try to get secrets from ->orig_connection, because it's the one that - * implements NMSettingsConnectionInterface and can respond to requests for - * its secrets. ->connection is a plain NMConnection copy of ->orig_connection - * which is the connection that's actually changed when the user clicks stuff. - * When creating importing or creating new connections though, ->orig_connection - * is an NMConnection because it hasn't been exported over D-Bus yet, so we - * can't ask it for secrets, because it doesn't implement NMSettingsConnectionInterface. - */ - if (!NM_IS_SETTINGS_CONNECTION_INTERFACE (self->orig_connection)) { - ce_page_complete_init (page, setting_name, NULL, NULL); - return; - } - info = g_malloc0 (sizeof (GetSecretsInfo)); info->self = self; info->page = page; @@ -669,6 +652,8 @@ } } +#define SECRETS_TAG "secrets-setting-name" + static gboolean add_page (NMConnectionEditor *editor, CEPageNewFunc func, @@ -683,19 +668,17 @@ g_return_val_if_fail (connection != NULL, FALSE); page = (*func) (connection, GTK_WINDOW (editor->window), &secrets_setting_name, error); - if (!page) - return FALSE; - - editor->initializing_pages = g_slist_prepend (editor->initializing_pages, page); - g_signal_connect (page, "changed", G_CALLBACK (page_changed), editor); - g_signal_connect (page, "initialized", G_CALLBACK (page_initialized), editor); - - /* Request any secrets the page might require; or if it doesn't want any, - * let the page initialize. - */ - get_secrets_for_page (editor, page, secrets_setting_name); - - return TRUE; + if (page) { + g_object_set_data_full (G_OBJECT (page), + SECRETS_TAG, + g_strdup (secrets_setting_name), + g_free); + + editor->initializing_pages = g_slist_append (editor->initializing_pages, page); + g_signal_connect (page, "changed", G_CALLBACK (page_changed), editor); + g_signal_connect (page, "initialized", G_CALLBACK (page_initialized), editor); + } + return !!page; } static gboolean @@ -706,6 +689,7 @@ NMSettingConnection *s_con; const char *connection_type; gboolean success = FALSE; + GSList *iter, *copy; g_return_val_if_fail (NM_IS_CONNECTION_EDITOR (editor), FALSE); g_return_val_if_fail (NM_IS_CONNECTION (orig_connection), FALSE); @@ -768,6 +752,38 @@ g_warning ("Unhandled setting type '%s'", connection_type); } + /* After all pages are created, then kick off secrets requests that any + * the pages may need to make; if they don't need any secrets, then let + * them finish initialization. The list might get modified during the loop + * which is why copy the list here. + */ + copy = g_slist_copy (editor->initializing_pages); + for (iter = copy; iter; iter = g_slist_next (iter)) { + CEPage *page = CE_PAGE (iter->data); + const char *setting_name = g_object_get_data (G_OBJECT (page), SECRETS_TAG); + + if (!setting_name) { + /* page doesn't need any secrets */ + ce_page_complete_init (page, NULL, NULL, NULL); + } else if (!NM_IS_SETTINGS_CONNECTION_INTERFACE (editor->orig_connection)) { + /* We want to get secrets using ->orig_connection, since that's the one + * that implements NMSettingsConnectionInterface and thus can actually + * handle secrets requests. ->connection is a plain NMConnection copy + * of ->orig_connection which is the thing that gets changed when users + * modify anything. But when creating or importing, ->orig_connection + * will be an NMConnection since the new connection hasn't been added to + * any settings service yet. So basically, skip requesting secrets if + * the connection can't handle a secrets request. + */ + ce_page_complete_init (page, setting_name, NULL, NULL); + } else { + /* Page wants secrets, get them */ + get_secrets_for_page (editor, page, setting_name); + } + g_object_set_data (G_OBJECT (page), SECRETS_TAG, NULL); + } + g_slist_free (copy); + /* set the UI */ recheck_initialization (editor); success = TRUE; diff -Nru network-manager-applet-0.8.4~git.20110323t200900.07708e7/src/connection-editor/nm-connection-editor.ui network-manager-applet-0.8.4/src/connection-editor/nm-connection-editor.ui --- network-manager-applet-0.8.4~git.20110323t200900.07708e7/src/connection-editor/nm-connection-editor.ui 2011-03-24 06:01:13.000000000 +0000 +++ network-manager-applet-0.8.4/src/connection-editor/nm-connection-editor.ui 2011-05-05 19:35:53.000000000 +0000 @@ -10,10 +10,10 @@ 300 preferences-system-network dialog - False True + vertical 2 @@ -48,6 +48,7 @@ True + vertical 6 start @@ -116,6 +117,7 @@ True + vertical 6 start @@ -188,6 +190,7 @@ True + vertical 6 start @@ -260,10 +263,12 @@ True + vertical 6 True + vertical 6 start @@ -277,6 +282,7 @@ False + False 0 @@ -304,6 +310,7 @@ True + vertical 6 end @@ -316,6 +323,7 @@ False + False 0 @@ -329,6 +337,7 @@ False + False 1 @@ -387,6 +396,7 @@ True + vertical 6 start @@ -476,11 +486,13 @@ True + vertical 6 True 5 + vertical 6 diff -Nru network-manager-applet-0.8.4~git.20110323t200900.07708e7/src/connection-editor/nm-connection-list.c network-manager-applet-0.8.4/src/connection-editor/nm-connection-list.c --- network-manager-applet-0.8.4~git.20110323t200900.07708e7/src/connection-editor/nm-connection-list.c 2011-03-24 06:01:13.000000000 +0000 +++ network-manager-applet-0.8.4/src/connection-editor/nm-connection-list.c 2011-05-05 19:35:53.000000000 +0000 @@ -18,7 +18,7 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * - * (C) Copyright 2007 - 2010 Red Hat, Inc. + * (C) Copyright 2007 - 2011 Red Hat, Inc. */ #include @@ -1492,6 +1492,7 @@ NMConnectionList *list; DBusGConnection *bus; GError *error = NULL; + const char *objects[] = { "NMConnectionList", NULL }; list = g_object_new (NM_TYPE_CONNECTION_LIST, NULL); if (!list) @@ -1500,7 +1501,10 @@ /* load GUI */ list->gui = gtk_builder_new (); - if (!gtk_builder_add_from_file (list->gui, UIDIR "/nm-connection-editor.ui", &error)) { + if (!gtk_builder_add_objects_from_file (list->gui, + UIDIR "/nm-connection-editor.ui", + (char **) objects, + &error)) { g_warning ("Couldn't load builder file: %s", error->message); g_error_free (error); goto error; diff -Nru network-manager-applet-0.8.4~git.20110323t200900.07708e7/src/connection-editor/page-ip4.c network-manager-applet-0.8.4/src/connection-editor/page-ip4.c --- network-manager-applet-0.8.4~git.20110323t200900.07708e7/src/connection-editor/page-ip4.c 2011-03-24 06:01:13.000000000 +0000 +++ network-manager-applet-0.8.4/src/connection-editor/page-ip4.c 2011-05-05 19:35:53.000000000 +0000 @@ -601,7 +601,9 @@ CEPageIP4Private *priv = CE_PAGE_IP4_GET_PRIVATE (self); GtkEditable *editable = GTK_EDITABLE (entry); int i, count = 0; - gchar *result = g_new0 (gchar, length); + gchar *result; + + result = g_malloc0 (length + 1); for (i = 0; i < length; i++) { if ((text[i] >= '0' && text[i] <= '9') || (text[i] == '.')) diff -Nru network-manager-applet-0.8.4~git.20110323t200900.07708e7/src/connection-editor/page-ip6.c network-manager-applet-0.8.4/src/connection-editor/page-ip6.c --- network-manager-applet-0.8.4~git.20110323t200900.07708e7/src/connection-editor/page-ip6.c 2011-03-24 06:01:13.000000000 +0000 +++ network-manager-applet-0.8.4/src/connection-editor/page-ip6.c 2011-05-05 19:35:53.000000000 +0000 @@ -574,9 +574,11 @@ GtkEditable *editable = GTK_EDITABLE (entry); gboolean numeric = FALSE; int i, count = 0; - gchar *result = g_new0 (gchar, length); + gchar *result; guint column; + result = g_malloc0 (length + 1); + /* The prefix column only allows numbers, no ':' */ column = GPOINTER_TO_UINT (g_object_get_data (G_OBJECT (editable), "column")); if (column == COL_PREFIX) diff -Nru network-manager-applet-0.8.4~git.20110323t200900.07708e7/src/connection-editor/page-mobile.c network-manager-applet-0.8.4/src/connection-editor/page-mobile.c --- network-manager-applet-0.8.4~git.20110323t200900.07708e7/src/connection-editor/page-mobile.c 2011-03-24 06:01:13.000000000 +0000 +++ network-manager-applet-0.8.4/src/connection-editor/page-mobile.c 2011-05-05 19:35:53.000000000 +0000 @@ -258,7 +258,9 @@ { GtkEditable *editable = GTK_EDITABLE (entry); int i, count = 0; - gchar *result = g_new0 (gchar, length); + gchar *result; + + result = g_malloc0 (length + 1); for (i = 0; i < length; i++) { if (isdigit (text[i])) diff -Nru network-manager-applet-0.8.4~git.20110323t200900.07708e7/src/connection-editor/ppp-auth-methods-dialog.c network-manager-applet-0.8.4/src/connection-editor/ppp-auth-methods-dialog.c --- network-manager-applet-0.8.4~git.20110323t200900.07708e7/src/connection-editor/ppp-auth-methods-dialog.c 2011-03-24 06:01:13.000000000 +0000 +++ network-manager-applet-0.8.4/src/connection-editor/ppp-auth-methods-dialog.c 2011-05-05 19:35:53.000000000 +0000 @@ -17,7 +17,7 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * - * (C) Copyright 2008 Red Hat, Inc. + * (C) Copyright 2008 - 2011 Red Hat, Inc. */ #include @@ -85,7 +85,7 @@ builder = gtk_builder_new (); - if (!gtk_builder_add_from_file (builder, UIDIR "/ce-page-ppp.ui", &error)) { + if (!gtk_builder_add_from_file (builder, UIDIR "/ce-ppp-auth-methods.ui", &error)) { g_warning ("Couldn't load builder file: %s", error->message); g_error_free (error); return NULL; diff -Nru network-manager-applet-0.8.4~git.20110323t200900.07708e7/src/gconf-helpers/gconf-upgrade.c network-manager-applet-0.8.4/src/gconf-helpers/gconf-upgrade.c --- network-manager-applet-0.8.4~git.20110323t200900.07708e7/src/gconf-helpers/gconf-upgrade.c 2011-03-24 06:01:13.000000000 +0000 +++ network-manager-applet-0.8.4/src/gconf-helpers/gconf-upgrade.c 2011-05-05 19:35:53.000000000 +0000 @@ -1888,6 +1888,8 @@ &ignore_ca_cert); if (ignore_ca_cert) nm_gconf_set_ignore_ca_cert (uuid, FALSE, TRUE); + g_free (uuid); + /* delete old key */ unset_one_setting_property (client, dir, NM_SETTING_802_1X_SETTING_NAME, diff -Nru network-manager-applet-0.8.4~git.20110323t200900.07708e7/src/gconf-helpers/nma-gconf-connection.c network-manager-applet-0.8.4/src/gconf-helpers/nma-gconf-connection.c --- network-manager-applet-0.8.4~git.20110323t200900.07708e7/src/gconf-helpers/nma-gconf-connection.c 2011-03-24 06:01:13.000000000 +0000 +++ network-manager-applet-0.8.4/src/gconf-helpers/nma-gconf-connection.c 2011-05-05 19:35:53.000000000 +0000 @@ -443,42 +443,6 @@ /******************************************************/ static gboolean -update (NMSettingsConnectionInterface *connection, - NMSettingsConnectionInterfaceUpdateFunc callback, - gpointer user_data) -{ - /* Always update secrets since it's assumed that secrets are included in - * the new connection data. - */ - nma_gconf_connection_update (NMA_GCONF_CONNECTION (connection), FALSE); - - return parent_settings_connection_iface->update (connection, callback, user_data); -} - -static gboolean -do_delete (NMSettingsConnectionInterface *connection, - NMSettingsConnectionInterfaceDeleteFunc callback, - gpointer user_data) -{ - NMAGConfConnectionPrivate *priv = NMA_GCONF_CONNECTION_GET_PRIVATE (connection); - gboolean success; - GError *error = NULL; - - /* Clean up keyring keys */ - clear_keyring_items (NMA_GCONF_CONNECTION (connection)); - - success = gconf_client_recursive_unset (priv->client, priv->dir, 0, &error); - if (!success) { - callback (connection, error, user_data); - g_error_free (error); - return FALSE; - } - gconf_client_suggest_sync (priv->client, NULL); - - return parent_settings_connection_iface->delete (connection, callback, user_data); -} - -static gboolean is_otp_always_ask (NMConnection *connection) { NMSetting8021x *s_8021x; @@ -516,6 +480,46 @@ } static gboolean +update (NMSettingsConnectionInterface *connection, + NMSettingsConnectionInterfaceUpdateFunc callback, + gpointer user_data) +{ + gboolean always_ask; + + always_ask = is_otp_always_ask (NM_CONNECTION (connection)); + + /* It's assumed that secrets are included in the new connection data. + * However, update the secrets only if "always ask" is not set. + */ + nma_gconf_connection_update (NMA_GCONF_CONNECTION (connection), always_ask); + + return parent_settings_connection_iface->update (connection, callback, user_data); +} + +static gboolean +do_delete (NMSettingsConnectionInterface *connection, + NMSettingsConnectionInterfaceDeleteFunc callback, + gpointer user_data) +{ + NMAGConfConnectionPrivate *priv = NMA_GCONF_CONNECTION_GET_PRIVATE (connection); + gboolean success; + GError *error = NULL; + + /* Clean up keyring keys */ + clear_keyring_items (NMA_GCONF_CONNECTION (connection)); + + success = gconf_client_recursive_unset (priv->client, priv->dir, 0, &error); + if (!success) { + callback (connection, error, user_data); + g_error_free (error); + return FALSE; + } + gconf_client_suggest_sync (priv->client, NULL); + + return parent_settings_connection_iface->delete (connection, callback, user_data); +} + +static gboolean internal_get_secrets (NMSettingsConnectionInterface *connection, const char *setting_name, const char **hints, diff -Nru network-manager-applet-0.8.4~git.20110323t200900.07708e7/src/gsm-unlock.ui network-manager-applet-0.8.4/src/gsm-unlock.ui --- network-manager-applet-0.8.4~git.20110323t200900.07708e7/src/gsm-unlock.ui 1970-01-01 00:00:00.000000000 +0000 +++ network-manager-applet-0.8.4/src/gsm-unlock.ui 2011-05-05 19:35:53.000000000 +0000 @@ -0,0 +1,285 @@ + + + + 5 + center + 400 + dialog-password + dialog + False + + + True + vertical + 2 + + + True + 6 + + + True + 0 + + + True + 0 + gtk-dialog-authentication + 6 + + + + + False + 6 + 0 + + + + + True + vertical + 12 + + + True + 0 + label + True + + + False + 12 + 0 + + + + + True + 0 + label + True + + + False + 1 + + + + + True + 0 + 0 + 12 + 12 + 12 + 12 + + + True + 5 + 2 + 6 + 6 + + + True + 0 + label + + + GTK_FILL + + + + + True + True + True + True + + + 1 + 2 + + + + + True + 0 + label + + + 1 + 2 + GTK_FILL + + + + + True + True + True + + + 1 + 2 + 1 + 2 + + + + + True + 0 + label + + + 2 + 3 + GTK_FILL + + + + + True + True + True + + + 1 + 2 + 2 + 3 + + + + + True + 6 + + + True + 0 + + + + + + False + False + 0 + + + + + True + 0 + True + + + 1 + + + + + 1 + 2 + 4 + 5 + GTK_FILL + GTK_FILL + 6 + + + + + Show it + True + True + False + True + + + 1 + 2 + 3 + 4 + + + + + + + + + + + + + False + 2 + + + + + False + 1 + + + + + False + False + 1 + + + + + True + end + + + gtk-cancel + True + True + True + True + + + False + False + 0 + + + + + _Unlock + True + True + True + True + True + True + + + False + False + 1 + + + + + False + end + 0 + + + + + + unlock_cancel_button + unlock_button + + + diff -Nru network-manager-applet-0.8.4~git.20110323t200900.07708e7/src/info.ui network-manager-applet-0.8.4/src/info.ui --- network-manager-applet-0.8.4~git.20110323t200900.07708e7/src/info.ui 1970-01-01 00:00:00.000000000 +0000 +++ network-manager-applet-0.8.4/src/info.ui 2011-05-05 19:35:53.000000000 +0000 @@ -0,0 +1,129 @@ + + + + 5 + Connection Information + False + gtk-info + dialog + False + + + True + vertical + 2 + + + True + vertical + + + True + 5 + 12 + + + True + 0 + gtk-dialog-info + 6 + + + False + False + 0 + + + + + True + vertical + 6 + + + True + 0 + Active Network Connections + + + + + + + False + False + 0 + + + + + True + True + + + True + + + + + True + + + False + + + + + 1 + + + + + 1 + + + + + 0 + + + + + 1 + + + + + True + end + + + gtk-close + True + True + True + True + True + False + True + + + False + False + 0 + + + + + False + end + 0 + + + + + + closebutton1 + + + diff -Nru network-manager-applet-0.8.4~git.20110323t200900.07708e7/src/main.c network-manager-applet-0.8.4/src/main.c --- network-manager-applet-0.8.4~git.20110323t200900.07708e7/src/main.c 2011-03-24 06:01:13.000000000 +0000 +++ network-manager-applet-0.8.4/src/main.c 2011-05-05 19:35:53.000000000 +0000 @@ -29,6 +29,7 @@ #include #include #include +#include #include #include @@ -38,10 +39,11 @@ static GMainLoop *loop = NULL; static void -signal_handler (int signo) +signal_handler (int signo, siginfo_t *info, void *data) { if (signo == SIGINT || signo == SIGTERM) { - g_message ("Caught signal %d, shutting down...", signo); + g_message ("PID %d (we are %d) sent signal %d, shutting down...", + info->si_pid, getpid (), signo); g_main_loop_quit (loop); } } @@ -53,9 +55,9 @@ sigset_t mask; sigemptyset (&mask); - action.sa_handler = signal_handler; + action.sa_sigaction = signal_handler; action.sa_mask = mask; - action.sa_flags = 0; + action.sa_flags = SA_SIGINFO; sigaction (SIGTERM, &action, NULL); sigaction (SIGINT, &action, NULL); } diff -Nru network-manager-applet-0.8.4~git.20110323t200900.07708e7/src/Makefile.am network-manager-applet-0.8.4/src/Makefile.am --- network-manager-applet-0.8.4~git.20110323t200900.07708e7/src/Makefile.am 2011-03-24 06:01:13.000000000 +0000 +++ network-manager-applet-0.8.4/src/Makefile.am 2011-05-05 19:35:53.000000000 +0000 @@ -62,7 +62,7 @@ ${top_builddir}/src/wireless-security/libwireless-security.la uidir = $(datadir)/nm-applet -ui_DATA = applet.ui keyring.png +ui_DATA = gsm-unlock.ui info.ui wired-8021x.ui wifi.ui keyring.png CLEANFILES = *.bak diff -Nru network-manager-applet-0.8.4~git.20110323t200900.07708e7/src/vpn-password-dialog.c network-manager-applet-0.8.4/src/vpn-password-dialog.c --- network-manager-applet-0.8.4~git.20110323t200900.07708e7/src/vpn-password-dialog.c 2011-03-24 06:01:13.000000000 +0000 +++ network-manager-applet-0.8.4/src/vpn-password-dialog.c 2011-05-05 19:35:53.000000000 +0000 @@ -164,6 +164,14 @@ g_slice_free (GValue, value); } +static void +vpn_child_setup (gpointer user_data G_GNUC_UNUSED) +{ + /* We are in the child process at this point */ + pid_t pid = getpid (); + setpgid (pid, pid); +} + gboolean nma_vpn_request_password (NMSettingsConnectionInterface *connection_iface, gboolean retry, @@ -237,7 +245,7 @@ (gchar **) argv, /* argv */ NULL, /* envp */ G_SPAWN_DO_NOT_REAP_CHILD, /* flags */ - NULL, /* child_setup */ + vpn_child_setup, /* child_setup */ NULL, /* user_data */ &child_pid, /* child_pid */ &child_stdin, /* standard_input */ diff -Nru network-manager-applet-0.8.4~git.20110323t200900.07708e7/src/wifi.ui network-manager-applet-0.8.4/src/wifi.ui --- network-manager-applet-0.8.4~git.20110323t200900.07708e7/src/wifi.ui 1970-01-01 00:00:00.000000000 +0000 +++ network-manager-applet-0.8.4/src/wifi.ui 2011-05-05 19:35:53.000000000 +0000 @@ -0,0 +1,213 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + True + 5 + 12 + + + True + 0 + network-wireless + 6 + + + False + 0 + + + + + True + vertical + 6 + + + True + 0 + True + True + + + 0 + + + + + True + 5 + 2 + 12 + 6 + + + True + vertical + + + + + + 2 + 4 + 5 + GTK_FILL + + + + + True + 0 + _Wireless security: + True + security_combo + + + 3 + 4 + GTK_FILL + + + + + + True + model1 + + + + 0 + + + + + 1 + 2 + 3 + 4 + GTK_FILL + GTK_FILL + + + + + True + 0 + _Network name: + True + network_name_entry + + + 2 + 3 + GTK_FILL + + + + + + True + True + True + + + 1 + 2 + 2 + 3 + + + + + + True + 0 + Co_nnection: + True + connection_combo + + + 1 + 2 + GTK_FILL + + + + + + True + + + 1 + 2 + 1 + 2 + GTK_FILL + GTK_FILL + + + + + True + 0 + Wireless _adapter: + True + device_combo + + + GTK_FILL + + + + + + True + model2 + + + + 0 + + + + + 1 + 2 + GTK_FILL + GTK_FILL + + + + + 1 + + + + + 1 + + + + diff -Nru network-manager-applet-0.8.4~git.20110323t200900.07708e7/src/wired-8021x.ui network-manager-applet-0.8.4/src/wired-8021x.ui --- network-manager-applet-0.8.4~git.20110323t200900.07708e7/src/wired-8021x.ui 1970-01-01 00:00:00.000000000 +0000 +++ network-manager-applet-0.8.4/src/wired-8021x.ui 2011-05-05 19:35:53.000000000 +0000 @@ -0,0 +1,165 @@ + + + + + + 5 + Wired 802.1X authentication + False + True + center-always + 488 + dialog-password + dialog + + + True + vertical + 2 + + + True + 5 + 12 + + + True + 0 + dialog-password + 6 + + + False + 0 + + + + + True + vertical + 6 + + + True + 0 + True + True + + + False + 0 + + + + + True + 2 + 2 + 12 + 6 + + + True + 0 + _Network name: + True + network_name_entry + + + GTK_FILL + + + + + + True + True + ● + True + + + 1 + 2 + + + + + + True + vertical + + + + + + 2 + 1 + 2 + GTK_FILL + + + + + 1 + + + + + 1 + + + + + 1 + + + + + True + end + + + gtk-cancel + True + True + True + False + True + + + False + False + 0 + + + + + gtk-connect + True + True + True + True + False + True + + + False + False + 1 + + + + + False + end + 0 + + + + + + cancel_button + ok_button + + + diff -Nru network-manager-applet-0.8.4~git.20110323t200900.07708e7/src/wired-dialog.c network-manager-applet-0.8.4/src/wired-dialog.c --- network-manager-applet-0.8.4~git.20110323t200900.07708e7/src/wired-dialog.c 2011-03-24 06:01:13.000000000 +0000 +++ network-manager-applet-0.8.4/src/wired-dialog.c 2011-05-05 19:35:53.000000000 +0000 @@ -76,57 +76,19 @@ return security; } -static gboolean -dialog_init (GtkWidget *dialog, - GtkBuilder *builder, - NMClient *nm_client, - NMConnection *connection) -{ - WirelessSecurity *security; - GtkWidget *widget; - - /* Hide bunch of wireless specific widgets */ - gtk_widget_hide (GTK_WIDGET (gtk_builder_get_object (builder, "device_label"))); - gtk_widget_hide (GTK_WIDGET (gtk_builder_get_object (builder, "device_combo"))); - gtk_widget_hide (GTK_WIDGET (gtk_builder_get_object (builder, "security_combo_label"))); - gtk_widget_hide (GTK_WIDGET (gtk_builder_get_object (builder, "security_combo"))); - - /* The dialog won't ever get called for more than one connection for wired */ - gtk_widget_hide (GTK_WIDGET (gtk_builder_get_object (builder, "connection_label"))); - gtk_widget_hide (GTK_WIDGET (gtk_builder_get_object (builder, "connection_combo"))); - - gtk_window_set_title (GTK_WINDOW (GTK_WIDGET (gtk_builder_get_object (builder, "wireless_dialog"))), - _("Wired 802.1X authentication")); - - dialog_set_network_name (connection, GTK_ENTRY (GTK_WIDGET (gtk_builder_get_object (builder, "network_name_entry")))); - security = dialog_set_security (connection, builder, GTK_BOX (GTK_WIDGET (gtk_builder_get_object (builder, "security_vbox")))); - wireless_security_set_changed_notify (security, stuff_changed_cb, GTK_WIDGET (gtk_builder_get_object (builder, "ok_button"))); - - g_object_set_data_full (G_OBJECT (dialog), - "security", security, - (GDestroyNotify) wireless_security_unref); - - gtk_window_set_icon_name (GTK_WINDOW (dialog), "dialog-password"); - widget = GTK_WIDGET (gtk_builder_get_object (builder, "image1")); - gtk_image_set_from_icon_name (GTK_IMAGE (widget), "dialog-password", GTK_ICON_SIZE_DIALOG); - - return TRUE; -} - GtkWidget * -nma_wired_dialog_new (const char *ui_file, - NMClient *nm_client, - NMSettingsConnectionInterface *connection, - NMDevice *device) +nma_wired_dialog_new (NMClient *nm_client, + NMSettingsConnectionInterface *connection, + NMDevice *device) { GtkBuilder *builder; GtkWidget *dialog; - gboolean success; GError *error = NULL; + WirelessSecurity *security; builder = gtk_builder_new (); - if (!gtk_builder_add_from_file (builder, ui_file, &error)) { + if (!gtk_builder_add_from_file (builder, UIDIR "/wired-8021x.ui", &error)) { g_warning ("Couldn't load builder file: %s", error->message); g_error_free (error); applet_warning_dialog_show (_("The NetworkManager Applet could not find some required resources (the .ui file was not found).")); @@ -134,20 +96,23 @@ return NULL; } - dialog = GTK_WIDGET (gtk_builder_get_object (builder, "wireless_dialog")); + dialog = (GtkWidget *) gtk_builder_get_object (builder, "wired_8021x_dialog"); if (!dialog) { - nm_warning ("Couldn't find wireless_dialog widget."); + nm_warning ("Couldn't find wired_8021x_dialog widget."); + applet_warning_dialog_show (_("The NetworkManager Applet could not find some required resources (the .ui file was not found).")); g_object_unref (builder); return NULL; } - success = dialog_init (dialog, builder, nm_client, NM_CONNECTION (connection)); - if (!success) { - nm_warning ("Couldn't create wired security dialog."); - gtk_widget_destroy (dialog); - g_object_unref (builder); - return NULL; - } + gtk_window_set_title (GTK_WINDOW (dialog), _("Wired 802.1X authentication")); + gtk_window_set_icon_name (GTK_WINDOW (dialog), "dialog-password"); + dialog_set_network_name (NM_CONNECTION (connection), GTK_ENTRY (gtk_builder_get_object (builder, "network_name_entry"))); + + security = dialog_set_security (NM_CONNECTION (connection), builder, GTK_BOX (gtk_builder_get_object (builder, "security_vbox"))); + wireless_security_set_changed_notify (security, stuff_changed_cb, GTK_WIDGET (gtk_builder_get_object (builder, "ok_button"))); + g_object_set_data_full (G_OBJECT (dialog), + "security", security, + (GDestroyNotify) wireless_security_unref); g_object_set_data_full (G_OBJECT (dialog), "connection", g_object_ref (connection), diff -Nru network-manager-applet-0.8.4~git.20110323t200900.07708e7/src/wired-dialog.h network-manager-applet-0.8.4/src/wired-dialog.h --- network-manager-applet-0.8.4~git.20110323t200900.07708e7/src/wired-dialog.h 2011-03-24 06:01:13.000000000 +0000 +++ network-manager-applet-0.8.4/src/wired-dialog.h 2011-05-05 19:35:53.000000000 +0000 @@ -30,10 +30,9 @@ #include #include -GtkWidget *nma_wired_dialog_new (const char *ui_file, - NMClient *nm_client, - NMSettingsConnectionInterface *connection, - NMDevice *device); +GtkWidget *nma_wired_dialog_new (NMClient *nm_client, + NMSettingsConnectionInterface *connection, + NMDevice *device); NMSettingsConnectionInterface *nma_wired_dialog_get_connection (GtkWidget *dialog); diff -Nru network-manager-applet-0.8.4~git.20110323t200900.07708e7/src/wireless-dialog.c network-manager-applet-0.8.4/src/wireless-dialog.c --- network-manager-applet-0.8.4~git.20110323t200900.07708e7/src/wireless-dialog.c 2011-03-24 06:01:13.000000000 +0000 +++ network-manager-applet-0.8.4/src/wireless-dialog.c 2011-05-05 19:35:53.000000000 +0000 @@ -1411,9 +1411,9 @@ NMAWirelessDialogPrivate *priv = NMA_WIRELESS_DIALOG_GET_PRIVATE (self); GError *error = NULL; - priv->builder = gtk_builder_new(); + priv->builder = gtk_builder_new (); - if (!gtk_builder_add_from_file (priv->builder, UIDIR "/applet.ui", &error)) { + if (!gtk_builder_add_from_file (priv->builder, UIDIR "/wifi.ui", &error)) { g_warning ("Couldn't load builder file: %s", error->message); g_error_free (error); } diff -Nru network-manager-applet-0.8.4~git.20110323t200900.07708e7/src/wireless-security/eap-method-leap.ui network-manager-applet-0.8.4/src/wireless-security/eap-method-leap.ui --- network-manager-applet-0.8.4~git.20110323t200900.07708e7/src/wireless-security/eap-method-leap.ui 2011-03-24 06:01:13.000000000 +0000 +++ network-manager-applet-0.8.4/src/wireless-security/eap-method-leap.ui 2011-05-05 19:35:53.000000000 +0000 @@ -2,10 +2,6 @@ - - False - eap_leap_widget - True False @@ -102,6 +98,4 @@ - - diff -Nru network-manager-applet-0.8.4~git.20110323t200900.07708e7/src/wireless-security/eap-method-peap.ui network-manager-applet-0.8.4/src/wireless-security/eap-method-peap.ui --- network-manager-applet-0.8.4~git.20110323t200900.07708e7/src/wireless-security/eap-method-peap.ui 2011-03-24 06:01:13.000000000 +0000 +++ network-manager-applet-0.8.4/src/wireless-security/eap-method-peap.ui 2011-05-05 19:35:53.000000000 +0000 @@ -28,10 +28,6 @@ - - False - eap_peap_widget - True False @@ -191,6 +187,4 @@ - - diff -Nru network-manager-applet-0.8.4~git.20110323t200900.07708e7/src/wireless-security/eap-method-simple.c network-manager-applet-0.8.4/src/wireless-security/eap-method-simple.c --- network-manager-applet-0.8.4~git.20110323t200900.07708e7/src/wireless-security/eap-method-simple.c 2011-03-24 06:01:13.000000000 +0000 +++ network-manager-applet-0.8.4/src/wireless-security/eap-method-simple.c 2011-05-05 19:35:53.000000000 +0000 @@ -168,11 +168,25 @@ static void update_secrets (EAPMethod *parent, NMConnection *connection) { - helper_fill_secret_entry (connection, - parent->builder, - "eap_simple_password_entry", - NM_TYPE_SETTING_802_1X, - (HelperSecretFunc) nm_setting_802_1x_get_password); + gboolean always_ask = FALSE; + + if (connection) { + NMSettingConnection *s_con; + const char *uuid; + + s_con = (NMSettingConnection *) nm_connection_get_setting (connection, NM_TYPE_SETTING_CONNECTION); + g_assert (s_con); + + uuid = nm_setting_connection_get_uuid (s_con); + always_ask = nm_gconf_get_8021x_password_always_ask (uuid); + } + + if (!always_ask) + helper_fill_secret_entry (connection, + parent->builder, + "eap_simple_password_entry", + NM_TYPE_SETTING_802_1X, + (HelperSecretFunc) nm_setting_802_1x_get_password); } static void diff -Nru network-manager-applet-0.8.4~git.20110323t200900.07708e7/src/wireless-security/eap-method-simple.ui network-manager-applet-0.8.4/src/wireless-security/eap-method-simple.ui --- network-manager-applet-0.8.4~git.20110323t200900.07708e7/src/wireless-security/eap-method-simple.ui 2011-03-24 06:01:13.000000000 +0000 +++ network-manager-applet-0.8.4/src/wireless-security/eap-method-simple.ui 2011-05-05 19:35:53.000000000 +0000 @@ -2,10 +2,6 @@ - - False - eap_simple_widget - True False @@ -130,6 +126,4 @@ - - diff -Nru network-manager-applet-0.8.4~git.20110323t200900.07708e7/src/wireless-security/eap-method-tls.ui network-manager-applet-0.8.4/src/wireless-security/eap-method-tls.ui --- network-manager-applet-0.8.4~git.20110323t200900.07708e7/src/wireless-security/eap-method-tls.ui 2011-03-24 06:01:13.000000000 +0000 +++ network-manager-applet-0.8.4/src/wireless-security/eap-method-tls.ui 2011-05-05 19:35:53.000000000 +0000 @@ -2,10 +2,6 @@ - - False - eap_tls_widget - True False @@ -186,6 +182,4 @@ - - diff -Nru network-manager-applet-0.8.4~git.20110323t200900.07708e7/src/wireless-security/eap-method-ttls.ui network-manager-applet-0.8.4/src/wireless-security/eap-method-ttls.ui --- network-manager-applet-0.8.4~git.20110323t200900.07708e7/src/wireless-security/eap-method-ttls.ui 2011-03-24 06:01:13.000000000 +0000 +++ network-manager-applet-0.8.4/src/wireless-security/eap-method-ttls.ui 2011-05-05 19:35:53.000000000 +0000 @@ -12,10 +12,6 @@ - - False - eap_ttls_widget - True False @@ -141,6 +137,4 @@ - - diff -Nru network-manager-applet-0.8.4~git.20110323t200900.07708e7/src/wireless-security/ws-dynamic-wep.ui network-manager-applet-0.8.4/src/wireless-security/ws-dynamic-wep.ui --- network-manager-applet-0.8.4~git.20110323t200900.07708e7/src/wireless-security/ws-dynamic-wep.ui 2011-03-24 06:01:13.000000000 +0000 +++ network-manager-applet-0.8.4/src/wireless-security/ws-dynamic-wep.ui 2011-05-05 19:35:53.000000000 +0000 @@ -12,10 +12,6 @@ - - False - dynamic_wep_widget - True False @@ -90,6 +86,4 @@ - - diff -Nru network-manager-applet-0.8.4~git.20110323t200900.07708e7/src/wireless-security/ws-leap.ui network-manager-applet-0.8.4/src/wireless-security/ws-leap.ui --- network-manager-applet-0.8.4~git.20110323t200900.07708e7/src/wireless-security/ws-leap.ui 2011-03-24 06:01:13.000000000 +0000 +++ network-manager-applet-0.8.4/src/wireless-security/ws-leap.ui 2011-05-05 19:35:53.000000000 +0000 @@ -2,10 +2,6 @@ - - False - leap_widget - True False @@ -102,7 +98,5 @@ - - diff -Nru network-manager-applet-0.8.4~git.20110323t200900.07708e7/src/wireless-security/ws-wep-key.c network-manager-applet-0.8.4/src/wireless-security/ws-wep-key.c --- network-manager-applet-0.8.4~git.20110323t200900.07708e7/src/wireless-security/ws-wep-key.c 2011-03-24 06:01:13.000000000 +0000 +++ network-manager-applet-0.8.4/src/wireless-security/ws-wep-key.c 2011-05-05 19:35:53.000000000 +0000 @@ -190,7 +190,9 @@ WirelessSecurityWEPKey *sec = (WirelessSecurityWEPKey *) data; GtkEditable *editable = GTK_EDITABLE (entry); int i, count = 0; - gchar *result = g_new (gchar, length); + gchar *result; + + result = g_malloc0 (length + 1); if (sec->type == NM_WEP_KEY_TYPE_KEY) { for (i = 0; i < length; i++) { @@ -202,18 +204,16 @@ result[count++] = text[i]; } - if (count == 0) - goto out; - - g_signal_handlers_block_by_func (G_OBJECT (editable), - G_CALLBACK (wep_entry_filter_cb), - data); - gtk_editable_insert_text (editable, result, count, position); - g_signal_handlers_unblock_by_func (G_OBJECT (editable), - G_CALLBACK (wep_entry_filter_cb), - data); + if (count > 0) { + g_signal_handlers_block_by_func (G_OBJECT (editable), + G_CALLBACK (wep_entry_filter_cb), + data); + gtk_editable_insert_text (editable, result, count, position); + g_signal_handlers_unblock_by_func (G_OBJECT (editable), + G_CALLBACK (wep_entry_filter_cb), + data); + } -out: g_signal_stop_emission_by_name (G_OBJECT (editable), "insert-text"); g_free (result); } diff -Nru network-manager-applet-0.8.4~git.20110323t200900.07708e7/src/wireless-security/ws-wep-key.ui network-manager-applet-0.8.4/src/wireless-security/ws-wep-key.ui --- network-manager-applet-0.8.4~git.20110323t200900.07708e7/src/wireless-security/ws-wep-key.ui 2011-03-24 06:01:13.000000000 +0000 +++ network-manager-applet-0.8.4/src/wireless-security/ws-wep-key.ui 2011-05-05 19:35:53.000000000 +0000 @@ -34,10 +34,6 @@ - - False - wep_key_widget - True False @@ -186,7 +182,5 @@ - - diff -Nru network-manager-applet-0.8.4~git.20110323t200900.07708e7/src/wireless-security/ws-wpa-eap.ui network-manager-applet-0.8.4/src/wireless-security/ws-wpa-eap.ui --- network-manager-applet-0.8.4~git.20110323t200900.07708e7/src/wireless-security/ws-wpa-eap.ui 2011-03-24 06:01:13.000000000 +0000 +++ network-manager-applet-0.8.4/src/wireless-security/ws-wpa-eap.ui 2011-05-05 19:35:53.000000000 +0000 @@ -12,10 +12,6 @@ - - False - wpa_eap_widget - True False @@ -83,6 +79,4 @@ - - diff -Nru network-manager-applet-0.8.4~git.20110323t200900.07708e7/src/wireless-security/ws-wpa-psk.ui network-manager-applet-0.8.4/src/wireless-security/ws-wpa-psk.ui --- network-manager-applet-0.8.4~git.20110323t200900.07708e7/src/wireless-security/ws-wpa-psk.ui 2011-03-24 06:01:13.000000000 +0000 +++ network-manager-applet-0.8.4/src/wireless-security/ws-wpa-psk.ui 2011-05-05 19:35:53.000000000 +0000 @@ -2,10 +2,6 @@ - - False - wpa_psk_widget - True False @@ -112,6 +108,4 @@ - -