[Bug 1554878] Re: fix up usage of XDG_CURRENT_DESKTOP

[Cui Wei]

will this bug fixed before formal release of Ubuntu 16.04 LTS?

For nautilus 3.18.4.is.3.14.3:


--- nautilus-3.18.4.is.3.14.3.orig/src/nautilus-window.c
+++ nautilus-3.18.4.is.3.14.3/src/nautilus-window.c
@@ -1554,7 +1554,24 @@ nautilus_window_constructed (GObject *se
 
 	window->details->toolbar = create_toolbar (window);
 	desktop = g_getenv ("XDG_CURRENT_DESKTOP");
-	if (desktop && strstr (desktop, "GNOME"))
+	
+	gchar **desktop_names;
+	gboolean is_gnome;
+	int i;
+	
+	is_gnome = FALSE;
+	if (desktop != NULL) {
+		desktop_names = g_strsplit (desktop, ":", 0);
+		for (i = 0; desktop_names[i]; ++i) {
+			if (!g_strcmp0 (desktop_names[i], "GNOME")) {
+				is_gnome = TRUE;
+				break;
+			}
+		}
+		g_strfreev (desktop_names);
+	}
+	
+	if (is_gnome)
 		gtk_window_set_titlebar (GTK_WINDOW (window), window->details->toolbar);
 	else {
 		gtk_container_add (GTK_CONTAINER (grid), window->details->toolbar);


Hope to get nautilus fixed soon.

-- 
You received this bug notification because you are a member of Ubuntu
Foundations Bugs, which is subscribed to pyxdg in Ubuntu.
https://bugs.launchpad.net/bugs/1554878

Title:
  fix up usage of XDG_CURRENT_DESKTOP

Status in GLib:
  Confirmed
Status in Python XDG App:
  Confirmed
Status in empathy package in Ubuntu:
  Fix Released
Status in eog package in Ubuntu:
  Fix Released
Status in gnome-control-center package in Ubuntu:
  Fix Released
Status in nautilus package in Ubuntu:
  Triaged
Status in pyxdg package in Ubuntu:
  Confirmed
Status in totem package in Ubuntu:
  Fix Released
Status in unity-control-center package in Ubuntu:
  Triaged
Status in unity-settings-daemon package in Ubuntu:
  Confirmed
Status in yelp package in Ubuntu:
  Fix Released

Bug description:
  Since being standardised XDG_CURRENT_DESKTOP supports specifying
  multiple Desktop Names seperated by a colon, however many of the
  patches in Ubuntu pre-date this change so don't correctly support the
  current format in some cases.

  These days XDG_CURRENT_DESKTOP will look something like
  Unity
  GNOME (gnome-shell)
  GNOME-Classic:GNOME (gnome-shell classic mode)
  GNOME-Flashback:Unity (Flashback sesison, although upstream and debian use GNOME-Flashack:GNOME for this)

  Many of the patches only check for == "Unity" or == "GNOME", so
  misbehave for the latter cases in the list above.

  I suspect this will be more widespread than just nautilus, but fixing
  that would be a good start. Since most of this code is still Ubuntu
  specific (upstream mainly use XDG_CURRENT_DESKTOP for onlyShowIn etc),
  probably taking the last value in the string would get the desired
  result of Unity vs GNOME3 behaviour

  ProblemType: Bug
  DistroRelease: Ubuntu 16.04
  Package: nautilus 1:3.18.4.is.3.14.3-0ubuntu2
  ProcVersionSignature: Ubuntu 4.4.0-8.23-generic 4.4.2
  Uname: Linux 4.4.0-8-generic x86_64
  ApportVersion: 2.20-0ubuntu3
  Architecture: amd64
  CurrentDesktop: GNOME
  Date: Wed Mar  9 15:04:36 2016
  SourcePackage: nautilus
  UpgradeStatus: Upgraded to xenial on 2015-11-28 (102 days ago)

To manage notifications about this bug go to:
https://bugs.launchpad.net/glib/+bug/1554878/+subscriptions