diff -Nru network-manager-applet-0.8.4~git.20110421t181725.362b5f0/aclocal.m4 network-manager-applet-0.8.4/aclocal.m4 --- network-manager-applet-0.8.4~git.20110421t181725.362b5f0/aclocal.m4 2011-05-06 16:01:39.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.20110421t181725.362b5f0/debian/changelog network-manager-applet-0.8.4/debian/changelog --- network-manager-applet-0.8.4~git.20110421t181725.362b5f0/debian/changelog 2011-05-06 16:01:39.000000000 +0000 +++ network-manager-applet-0.8.4/debian/changelog 2011-05-06 15:01:18.000000000 +0000 @@ -1,8 +1,58 @@ -network-manager-applet (0.8.4~git.20110421t181725.362b5f0-0ubuntu1~nmt1) natty; urgency=low +network-manager-applet (0.8.4-0ubuntu1~nm3~natty) natty; 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. - -- Fabien Tassin Fri, 22 Apr 2011 07:00:01 +0200 + -- Mathieu Trudel-Lapierre Fri, 06 May 2011 11:01:09 -0400 network-manager-applet (0.8.4~git.20110318t152954.9c4c9a0-0ubuntu1) natty; urgency=low diff -Nru network-manager-applet-0.8.4~git.20110421t181725.362b5f0/debian/compat network-manager-applet-0.8.4/debian/compat --- network-manager-applet-0.8.4~git.20110421t181725.362b5f0/debian/compat 2011-05-06 16:01:39.000000000 +0000 +++ network-manager-applet-0.8.4/debian/compat 2011-05-06 15:01:18.000000000 +0000 @@ -1 +1 @@ -5 +8 diff -Nru network-manager-applet-0.8.4~git.20110421t181725.362b5f0/debian/control network-manager-applet-0.8.4/debian/control --- network-manager-applet-0.8.4~git.20110421t181725.362b5f0/debian/control 2011-05-06 16:01:39.000000000 +0000 +++ network-manager-applet-0.8.4/debian/control 2011-05-06 15:01:18.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.20110421t181725.362b5f0/debian/copyright network-manager-applet-0.8.4/debian/copyright --- network-manager-applet-0.8.4~git.20110421t181725.362b5f0/debian/copyright 2011-05-06 16:01:39.000000000 +0000 +++ network-manager-applet-0.8.4/debian/copyright 2011-05-06 15:01:18.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/Ua6hu849n2/network-manager-applet-0.8.4~git.20110421t181725.362b5f0/debian/icons/22/nm-active-device.png and /tmp/yEh3nPvk7p/network-manager-applet-0.8.4/debian/icons/22/nm-active-device.png differ diff -Nru network-manager-applet-0.8.4~git.20110421t181725.362b5f0/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.20110421t181725.362b5f0/debian/icons/22/nm-active-device.png.uue 2011-05-06 16:01:39.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/Ua6hu849n2/network-manager-applet-0.8.4~git.20110421t181725.362b5f0/debian/icons/22/nm-device-wired-secure.png and /tmp/yEh3nPvk7p/network-manager-applet-0.8.4/debian/icons/22/nm-device-wired-secure.png differ diff -Nru network-manager-applet-0.8.4~git.20110421t181725.362b5f0/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.20110421t181725.362b5f0/debian/icons/22/nm-device-wired-secure.png.uue 2011-05-06 16:01:39.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/Ua6hu849n2/network-manager-applet-0.8.4~git.20110421t181725.362b5f0/debian/icons/22/nm-signal-100-secure.png and /tmp/yEh3nPvk7p/network-manager-applet-0.8.4/debian/icons/22/nm-signal-100-secure.png differ diff -Nru network-manager-applet-0.8.4~git.20110421t181725.362b5f0/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.20110421t181725.362b5f0/debian/icons/22/nm-signal-100-secure.png.uue 2011-05-06 16:01:39.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/Ua6hu849n2/network-manager-applet-0.8.4~git.20110421t181725.362b5f0/debian/icons/22/nm-signal-25-secure.png and /tmp/yEh3nPvk7p/network-manager-applet-0.8.4/debian/icons/22/nm-signal-25-secure.png differ diff -Nru network-manager-applet-0.8.4~git.20110421t181725.362b5f0/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.20110421t181725.362b5f0/debian/icons/22/nm-signal-25-secure.png.uue 2011-05-06 16:01:39.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.20110421t181725.362b5f0/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.20110421t181725.362b5f0/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-06 15:01:18.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.20110421t181725.362b5f0/debian/patches/04-autostart.patch network-manager-applet-0.8.4/debian/patches/04-autostart.patch --- network-manager-applet-0.8.4~git.20110421t181725.362b5f0/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-06 15:01:18.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.20110421t181725.362b5f0/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.20110421t181725.362b5f0/debian/patches/applet-dialog-uninited-method.patch 2011-05-06 16:01:39.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.20110421t181725.362b5f0/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.20110421t181725.362b5f0/debian/patches/lp268803_xdg_autostart_gnome_xfce_only.patch 2011-05-06 16:01:39.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.20110421t181725.362b5f0/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.20110421t181725.362b5f0/debian/patches/lp295788_xfce_menu_entry.patch 2011-05-06 16:01:39.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.20110421t181725.362b5f0/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.20110421t181725.362b5f0/debian/patches/lp328572-dxteam-connect-text.patch 2011-05-06 16:01:39.000000000 +0000 +++ network-manager-applet-0.8.4/debian/patches/lp328572-dxteam-connect-text.patch 2011-05-06 15:01:18.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.20110421t181725.362b5f0/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.20110421t181725.362b5f0/debian/patches/lp330608_dxteam_gsm_connect_text.patch 2011-05-06 16:01:39.000000000 +0000 +++ network-manager-applet-0.8.4/debian/patches/lp330608_dxteam_gsm_connect_text.patch 2011-05-06 15:01:18.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.20110421t181725.362b5f0/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.20110421t181725.362b5f0/debian/patches/lp341684_device_sensitive_disconnect_notify.patch 2011-05-06 16:01:39.000000000 +0000 +++ network-manager-applet-0.8.4/debian/patches/lp341684_device_sensitive_disconnect_notify.patch 2011-05-06 15:01:18.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.20110421t181725.362b5f0/debian/patches/series network-manager-applet-0.8.4/debian/patches/series --- network-manager-applet-0.8.4~git.20110421t181725.362b5f0/debian/patches/series 2011-05-06 16:01:39.000000000 +0000 +++ network-manager-applet-0.8.4/debian/patches/series 2011-05-06 15:01:18.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,5 @@ 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.20110421t181725.362b5f0/debian/rules network-manager-applet-0.8.4/debian/rules --- network-manager-applet-0.8.4~git.20110421t181725.362b5f0/debian/rules 2011-05-06 16:01:39.000000000 +0000 +++ network-manager-applet-0.8.4/debian/rules 2011-05-06 15:01:18.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.20110421t181725.362b5f0/debian/source/format network-manager-applet-0.8.4/debian/source/format --- network-manager-applet-0.8.4~git.20110421t181725.362b5f0/debian/source/format 1970-01-01 00:00:00.000000000 +0000 +++ network-manager-applet-0.8.4/debian/source/format 2011-05-06 16:01:39.000000000 +0000 @@ -0,0 +1 @@ +3.0 (quilt) diff -Nru network-manager-applet-0.8.4~git.20110421t181725.362b5f0/debian/source/include-binaries network-manager-applet-0.8.4/debian/source/include-binaries --- network-manager-applet-0.8.4~git.20110421t181725.362b5f0/debian/source/include-binaries 1970-01-01 00:00:00.000000000 +0000 +++ network-manager-applet-0.8.4/debian/source/include-binaries 2011-05-06 15:01:18.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.20110421t181725.362b5f0/src/gnome-bluetooth/bt-widget.c network-manager-applet-0.8.4/src/gnome-bluetooth/bt-widget.c --- network-manager-applet-0.8.4~git.20110421t181725.362b5f0/src/gnome-bluetooth/bt-widget.c 2011-04-22 05:01:26.000000000 +0000 +++ network-manager-applet-0.8.4/src/gnome-bluetooth/bt-widget.c 2011-05-05 19:35:53.000000000 +0000 @@ -263,11 +263,6 @@ g_slist_free (info->modem_proxies); info->modem_proxies = NULL; - if (info->mm_proxy) { - g_object_unref (info->mm_proxy); - info->mm_proxy = NULL; - } - if (info->dun_proxy) { if (info->rfcomm_iface) { dbus_g_proxy_call_no_reply (info->dun_proxy, "Disconnect", @@ -285,6 +280,11 @@ g_free (info->rfcomm_iface); info->rfcomm_iface = NULL; + if (info->bus) { + dbus_g_connection_unref (info->bus); + info->bus = NULL; + } + if (info->dun_timeout_id) { g_source_remove (info->dun_timeout_id); info->dun_timeout_id = 0; @@ -884,8 +884,6 @@ g_object_unref (info->settings); g_object_unref (info->btmodel); g_object_unref (info->btclient); - if (info->bus) - dbus_g_connection_unref (info->bus); memset (info, 0, sizeof (PluginInfo)); g_free (info); }