diff -Nru network-manager-applet-0.9.8.8/debian/changelog network-manager-applet-0.9.8.8/debian/changelog --- network-manager-applet-0.9.8.8/debian/changelog 2014-05-16 21:21:50.000000000 +0000 +++ network-manager-applet-0.9.8.8/debian/changelog 2014-06-04 13:20:26.000000000 +0000 @@ -1,3 +1,10 @@ +network-manager-applet (0.9.8.8-0ubuntu4.2) trusty-proposed; urgency=medium + + * Bring back Autostart Condition, we don't want nm-applet running in a + gnome-shell session. (LP: #1315996) + + -- Tim Lunn Wed, 04 Jun 2014 15:14:54 +0200 + network-manager-applet (0.9.8.8-0ubuntu4.1) trusty; urgency=medium * debian/patches/11-user-connections.patch: updated to fix importing VPN diff -Nru network-manager-applet-0.9.8.8/debian/patches/git_dont_autostart_under_GNOME.patch network-manager-applet-0.9.8.8/debian/patches/git_dont_autostart_under_GNOME.patch --- network-manager-applet-0.9.8.8/debian/patches/git_dont_autostart_under_GNOME.patch 2014-04-14 13:44:14.000000000 +0000 +++ network-manager-applet-0.9.8.8/debian/patches/git_dont_autostart_under_GNOME.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,24 +0,0 @@ -From d6ffe34dc092926fb949449c182e8f27722b6b8b Mon Sep 17 00:00:00 2001 -From: Dan Winship -Date: Mon, 29 Jul 2013 13:24:15 +0000 -Subject: Update .desktop files - -Don't autostart nm-applet in GNOME any more. - -Update bugzilla info for new components - -https://bugzilla.gnome.org/show_bug.cgi?id=705074 ---- -(limited to 'nm-applet.desktop.in') - ---- a/nm-applet.desktop.in -+++ b/nm-applet.desktop.in -@@ -9,6 +9,7 @@ - NotShowIn=KDE; - X-GNOME-Bugzilla-Bugzilla=GNOME - X-GNOME-Bugzilla-Product=NetworkManager --X-GNOME-Bugzilla-Component=general -+X-GNOME-Bugzilla-Component=nm-applet - X-GNOME-Autostart-enabled=true -+AutostartCondition=GNOME3 unless-session gnome - X-GNOME-UsesNotifications=true diff -Nru network-manager-applet-0.9.8.8/debian/patches/series network-manager-applet-0.9.8.8/debian/patches/series --- network-manager-applet-0.9.8.8/debian/patches/series 2014-05-16 21:21:03.000000000 +0000 +++ network-manager-applet-0.9.8.8/debian/patches/series 2014-06-04 13:19:59.000000000 +0000 @@ -19,3 +19,4 @@ 0001_Move_on_with_enter_in_the_country_page_of_the_new_mobile_wizard.patch set_atk_relations.patch 11-user-connections.patch +ubuntu_dont_autostart_under_GNOME.patch diff -Nru network-manager-applet-0.9.8.8/debian/patches/ubuntu_dont_autostart_under_GNOME.patch network-manager-applet-0.9.8.8/debian/patches/ubuntu_dont_autostart_under_GNOME.patch --- network-manager-applet-0.9.8.8/debian/patches/ubuntu_dont_autostart_under_GNOME.patch 1970-01-01 00:00:00.000000000 +0000 +++ network-manager-applet-0.9.8.8/debian/patches/ubuntu_dont_autostart_under_GNOME.patch 2014-06-04 13:19:59.000000000 +0000 @@ -0,0 +1,20 @@ +From d6ffe34dc092926fb949449c182e8f27722b6b8b Mon Sep 17 00:00:00 2001 +From: Dan Winship +Date: Mon, 29 Jul 2013 13:24:15 +0000 +Subject: Update .desktop files + +Don't autostart nm-applet in GNOME any more. + +Update bugzilla info for new components + +https://bugzilla.gnome.org/show_bug.cgi?id=705074 +--- +(limited to 'nm-applet.desktop.in') + +--- a/nm-applet.desktop.in ++++ b/nm-applet.desktop.in +@@ -11,3 +11,4 @@ + X-GNOME-Bugzilla-Product=NetworkManager + X-GNOME-Bugzilla-Component=nm-applet + X-GNOME-UsesNotifications=true ++AutostartCondition=GNOME3 unless-session gnome