Merge lp:~dylanmccall/ubuntu/oneiric/network-manager-applet/lp852961-disable-autostart-for-gnome-shell into lp:ubuntu/oneiric/network-manager-applet

[Dylan McCall]

This adds an extra rule to nm-applet's autostart stuff so it does not autostart in Gnome Shell, fixing bug #852961.

[Dylan McCall (dylanmccall)]

Eeek! Sorry about that first diff. First time using edit-patch, I guess :)
New one coming in a second. I'll just kill this one.

review: Needs Resubmitting

[lp:~dylanmccall/ubuntu/oneiric/network-manager-applet/lp852961-disable-autostart-for-gnome-shell]

71. By Dylan McCall on 2011-09-21

* debian/patches/04-autostart.patch:
  - disable autostart when using gnome-shell (LP: #852961)

Unmerged revisions

71. By Dylan McCall on 2011-09-21

* debian/patches/04-autostart.patch:
  - disable autostart when using gnome-shell (LP: #852961)

=== modified file 'debian/changelog'
--- debian/changelog	2011-07-08 01:07:05 +0000
+++ debian/changelog	2011-09-21 06:13:27 +0000
@@ -1,3 +1,10 @@
+network-manager-applet (0.8.9997+git.20110707t152406.340f695-0ubuntu2) oneiric; urgency=low
+
+  * debian/patches/04-autostart.patch:
+    - disable autostart when using gnome-shell (LP: #852961) 
+
+ -- Dylan McCall <[e-mail]>  Tue, 20 Sep 2011 23:06:34 -0700
+
 network-manager-applet (0.8.9997+git.20110707t152406.340f695-0ubuntu1) oneiric; urgency=low
 
   * upstream snapshot 2011-07-07 15:24:06 (GMT)
 
=== modified file 'debian/patches/04-autostart.patch'
--- debian/patches/04-autostart.patch	2011-05-30 13:25:18 +0000
+++ debian/patches/04-autostart.patch	2011-09-21 06:13:27 +0000
@@ -1,8 +1,8 @@
-Index: network-manager-applet-0.8.999+git.20110523t134536.bb7ef97/nm-applet.desktop.in
+Index: network-manager-applet/nm-applet.desktop.in
 ===================================================================
---- network-manager-applet-0.8.999+git.20110523t134536.bb7ef97.orig/nm-applet.desktop.in	2011-05-25 21:20:49.000000000 -0400
-+++ network-manager-applet-0.8.999+git.20110523t134536.bb7ef97/nm-applet.desktop.in	2011-05-25 22:20:42.709099830 -0400
-@@ -6,6 +6,7 @@
+--- network-manager-applet.orig/nm-applet.desktop.in	2011-09-20 23:02:13.934376000 -0700
++++ network-manager-applet/nm-applet.desktop.in	2011-09-20 23:05:38.755287537 -0700
+@@ -6,7 +6,9 @@
  Terminal=false
  Type=Application
  NoDisplay=true
@@ -10,10 +10,12 @@
  X-GNOME-Bugzilla-Bugzilla=GNOME
  X-GNOME-Bugzilla-Product=NetworkManager
  X-GNOME-Bugzilla-Component=general
-Index: network-manager-applet-0.8.999+git.20110523t134536.bb7ef97/nm-connection-editor.desktop.in
+ X-GNOME-Autostart-enabled=true
++AutostartCondition=GNOME3 unless-session gnome
+Index: network-manager-applet/nm-connection-editor.desktop.in
 ===================================================================
---- network-manager-applet-0.8.999+git.20110523t134536.bb7ef97.orig/nm-connection-editor.desktop.in	2011-05-25 21:20:49.000000000 -0400
-+++ network-manager-applet-0.8.999+git.20110523t134536.bb7ef97/nm-connection-editor.desktop.in	2011-05-25 22:19:44.349099837 -0400
+--- network-manager-applet.orig/nm-connection-editor.desktop.in	2011-09-20 23:02:13.934376000 -0700
++++ network-manager-applet/nm-connection-editor.desktop.in	2011-09-20 23:02:13.934376000 -0700
 @@ -10,4 +10,4 @@
  X-GNOME-Bugzilla-Product=NetworkManager
  X-GNOME-Bugzilla-Component=general
 
=== modified file 'nm-applet.desktop.in'
--- nm-applet.desktop.in	2011-05-30 13:25:18 +0000
+++ nm-applet.desktop.in	2011-09-21 06:13:27 +0000
@@ -11,3 +11,4 @@
 X-GNOME-Bugzilla-Product=NetworkManager
 X-GNOME-Bugzilla-Component=general
 X-GNOME-Autostart-enabled=true
+AutostartCondition=GNOME3 unless-session gnome