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

[Dmitry Shachnev]

We would like to have this patch in network-manager-applet *only for Vivid*. Please see LP: #1440009 for details.

As Alberts points out in that bug, the next version of gnome-flashback will set ShellVersion, which will make network-manager-applet think that the desktop is just old version of gnome-shell and behave correctly.

[Mathieu Trudel-Lapierre (cyphermox)]

Full ack, looks fine.

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2015-04-01 21:30:38 +0000
+++ debian/changelog	2015-04-04 09:40:36 +0000
@@ -1,3 +1,9 @@
+network-manager-applet (0.9.10.1-0ubuntu3) UNRELEASED; urgency=medium
+
+  * Do not misdetect GNOME Flashback as GNOME Shell (LP: #1440009).
+
+ -- Dmitry Shachnev <[e-mail]>  Fri, 03 Apr 2015 15:04:29 +0300
+
 network-manager-applet (0.9.10.1-0ubuntu2) vivid; urgency=medium
 
   * debian/patches/nm-applet-use-indicator.patch: initialize GSList dupes var
 
=== added file 'debian/patches/lp1440009_flashback.patch'
--- debian/patches/lp1440009_flashback.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/lp1440009_flashback.patch	2015-04-04 09:40:36 +0000
@@ -0,0 +1,47 @@
+Description: do not unregister the agent under GNOME Flashback
+ GNOME Flashback owns the org.gnome.Shell name, but does not (currently)
+ export ShellVersion, which is causing problems in nm-applet.
+Author: Dmitry Shachnev <[e-mail]>
+Forwarded: not-needed
+Last-Update: 2015-04-03
+
+--- a/src/applet.c
++++ b/src/applet.c
+@@ -4113,6 +4113,28 @@
+ 	gtk_status_icon_set_visible (applet->status_icon, applet->visible);
+ }
+ 
++static gboolean is_gnome_flashback ()
++{
++	const gchar *xdg_current_desktop;
++	gchar **desktop_names;
++	int i;
++	gboolean result;
++
++	result = FALSE;
++	xdg_current_desktop = g_getenv ("XDG_CURRENT_DESKTOP");
++	if (xdg_current_desktop != NULL) {
++		desktop_names = g_strsplit (xdg_current_desktop, ":", 0);
++		for (i = 0; desktop_names[i]; ++i) {
++			if (!g_strcmp0 (desktop_names[i], "GNOME-Flashback")) {
++				result = TRUE;
++				break;
++			}
++		}
++		g_strfreev (desktop_names);
++	}
++	return result;
++}
++
+ static gboolean
+ initable_init (GInitable *initable, GCancellable *cancellable, GError **error)
+ {
+@@ -4221,7 +4243,7 @@
+ 	applet_embedded_cb (G_OBJECT (applet->status_icon), NULL, NULL);
+ 
+ 	/* Watch GNOME Shell so we can unregister our applet agent if it appears */
+-	if (!shell_debug) {
++	if (!shell_debug && !is_gnome_flashback ()) {
+ 		applet->shell_watcher = nm_shell_watcher_new ();
+ 		g_signal_connect (applet->shell_watcher,
+ 			              "notify::shell-version",
 
=== modified file 'debian/patches/series'
--- debian/patches/series	2015-04-01 20:59:33 +0000
+++ debian/patches/series	2015-04-04 09:40:36 +0000
@@ -14,3 +14,4 @@
 11-user-connections.patch
 ubuntu_dont_autostart_under_GNOME.patch
 hide_virtual_devices.patch
+lp1440009_flashback.patch