Merge lp:~mitya57/ubuntu/saucy/network-manager-applet/autostart into lp:ubuntu/saucy/network-manager-applet

[Dmitry Shachnev]

This fixes an issue mentioned at:

https://mail.gnome.org/archives/gnome-flashback-list/2013-September/msg00069.html
https://bugs.launchpad.net/ubuntu/+source/network-manager-applet/+bug/1189309/comments/12

[Iain Lane (laney)]

Already in.

Please continue to work on this issue upstream though.

=== modified file '.pc/applied-patches'
--- .pc/applied-patches	2013-09-02 14:03:33 +0000
+++ .pc/applied-patches	2013-10-04 11:06:18 +0000
@@ -16,4 +16,4 @@
 lp1048516_dont_req_keyring_in_greeter.patch
 lp1048520_delay_pin_dialog_in_greeter.patch
 rebuild_menu_after_init.patch
-git_dont_autostart_under_GNOME.patch
+do_not_autostart_under_gnome.patch
 
=== renamed directory '.pc/git_dont_autostart_under_GNOME.patch' => '.pc/do_not_autostart_under_gnome.patch'
=== modified file 'debian/changelog'
--- debian/changelog	2013-09-02 14:03:33 +0000
+++ debian/changelog	2013-10-04 11:06:18 +0000
@@ -1,3 +1,9 @@
+network-manager-applet (0.9.8.0-1ubuntu4) saucy; urgency=low
+
+  * Make sure the applet is still autostarted in GNOME Flashback session.
+
+ -- Dmitry Shachnev <[e-mail]>  Fri, 04 Oct 2013 14:44:25 +0400
+
 network-manager-applet (0.9.8.0-1ubuntu3) saucy; urgency=low
 
   * debian/patches/git_dont_autostart_under_GNOME.patch (LP: #1189309) 
 
=== renamed file 'debian/patches/git_dont_autostart_under_GNOME.patch' => 'debian/patches/do_not_autostart_under_gnome.patch'
--- debian/patches/git_dont_autostart_under_GNOME.patch	2013-09-02 14:03:33 +0000
+++ debian/patches/do_not_autostart_under_gnome.patch	2013-10-04 11:06:18 +0000
@@ -1,32 +1,22 @@
-From d6ffe34dc092926fb949449c182e8f27722b6b8b Mon Sep 17 00:00:00 2001
-From: Dan Winship <[e-mail]>
-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')
-
-diff --git a/nm-applet.desktop.in b/nm-applet.desktop.in
-index 996fbac..8f94a88 100644
+Author: Dmitry Shachnev <[e-mail]>
+Description: Do not autostart in gnome-shell
+ This patch makes sure that the applet will not be autostarted
+ in gnome-shell sessions, but will be autostarted in other
+ GNOME sessions like the Flashback session. Also it updates
+ the Bugzilla-Component header following upstream change.
+Forwarded: yes, https://bugzilla.gnome.org/show_bug.cgi?id=709419
+Last-Update: 2013-10-04
+
 --- a/nm-applet.desktop.in
 +++ b/nm-applet.desktop.in
-@@ -6,9 +6,8 @@ Exec=nm-applet
- Terminal=false
+@@ -7,8 +7,9 @@
  Type=Application
  NoDisplay=true
--NotShowIn=KDE;
-+NotShowIn=KDE;GNOME;
+ NotShowIn=KDE;
++AutostartCondition=GNOME3 unless-session gnome
  X-GNOME-Bugzilla-Bugzilla=GNOME
  X-GNOME-Bugzilla-Product=NetworkManager
 -X-GNOME-Bugzilla-Component=general
--X-GNOME-Autostart-enabled=true
 +X-GNOME-Bugzilla-Component=nm-applet
+ X-GNOME-Autostart-enabled=true
  X-GNOME-UsesNotifications=true
---
-cgit v0.9.2
-
 
=== modified file 'debian/patches/series'
--- debian/patches/series	2013-09-02 14:03:33 +0000
+++ debian/patches/series	2013-10-04 11:06:18 +0000
@@ -16,4 +16,4 @@
 lp1048516_dont_req_keyring_in_greeter.patch
 lp1048520_delay_pin_dialog_in_greeter.patch
 rebuild_menu_after_init.patch
-git_dont_autostart_under_GNOME.patch
+do_not_autostart_under_gnome.patch
 
=== modified file 'nm-applet.desktop.in'
--- nm-applet.desktop.in	2013-09-02 14:03:33 +0000
+++ nm-applet.desktop.in	2013-10-04 11:06:18 +0000
@@ -6,8 +6,10 @@
 Terminal=false
 Type=Application
 NoDisplay=true
-NotShowIn=KDE;GNOME;
+NotShowIn=KDE;
+AutostartCondition=GNOME3 unless-session gnome
 X-GNOME-Bugzilla-Bugzilla=GNOME
 X-GNOME-Bugzilla-Product=NetworkManager
 X-GNOME-Bugzilla-Component=nm-applet
+X-GNOME-Autostart-enabled=true
 X-GNOME-UsesNotifications=true