Comment 15 for bug 1554878

Revision history for this message
Wei Tsui (ghostplant) wrote :

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.