[nautilus] Don't draw the desktop if another desktop manager in use

[Cosimo Cecchi <cosimoc src gnome org>]

commit f30baccd6c0a0ce9cc62f75dca1b96f4f80aa40a
Author: Balló György <ballogyor gmail com>
Date:   Sun Jul 26 17:10:07 2015 +0200

    Don't draw the desktop if another desktop manager in use
    
    This feature was broken since commit 3eeda743a42fe10f0e31743c3fb2ba8907fc8883
    
    Fixes https://bugzilla.gnome.org/show_bug.cgi?id=738673

 src/nautilus-desktop-window.c |   45 +++++++++++++++++++++--------------------
 1 files changed, 23 insertions(+), 22 deletions(-)
---
diff --git a/src/nautilus-desktop-window.c b/src/nautilus-desktop-window.c
index e04d40d..a7c647c 100644
--- a/src/nautilus-desktop-window.c
+++ b/src/nautilus-desktop-window.c
@@ -181,29 +181,30 @@ nautilus_desktop_window_constructed (GObject *obj)
        nautilus_desktop_window_init_selection (window);
        nautilus_desktop_window_init_actions (window);
 
-       /* Set the accessible name so that it doesn't inherit the cryptic desktop URI. */
-       accessible = gtk_widget_get_accessible (GTK_WIDGET (window));
-
-       if (accessible) {
-               atk_object_set_name (accessible, _("Desktop"));
+       if (window->details->desktop_selection != NULL) {
+               /* Set the accessible name so that it doesn't inherit the cryptic desktop URI. */
+               accessible = gtk_widget_get_accessible (GTK_WIDGET (window));
+
+               if (accessible) {
+                       atk_object_set_name (accessible, _("Desktop"));
+               }
+
+               /* Special sawmill setting */
+               gtk_window_set_wmclass (GTK_WINDOW (window), "desktop_window", "Nautilus");
+
+               /* Point window at the desktop folder.
+                * Note that nautilus_desktop_window_init is too early to do this.
+                */
+               nautilus_desktop_window_update_directory (window);
+               gtk_widget_override_background_color (GTK_WIDGET (window), 0, &transparent);
+
+               /* We realize it immediately so that the NAUTILUS_DESKTOP_WINDOW_ID
+                * property is set so gnome-settings-daemon doesn't try to set
+                * background. And we do a gdk_flush() to be sure X gets it.
+                */
+               gtk_widget_realize (GTK_WIDGET (window));
+               gdk_flush ();
        }
-
-       /* Special sawmill setting */
-       gtk_window_set_wmclass (GTK_WINDOW (window), "desktop_window", "Nautilus");
-
-       /* Point window at the desktop folder.
-        * Note that nautilus_desktop_window_init is too early to do this.
-        */
-       nautilus_desktop_window_update_directory (window);
-        gtk_widget_override_background_color (GTK_WIDGET (window), 0, &transparent);
-
-       /* We realize it immediately so that the NAUTILUS_DESKTOP_WINDOW_ID
-        * property is set so gnome-settings-daemon doesn't try to set
-        * background. And we do a gdk_flush() to be sure X gets it.
-        */
-       gtk_widget_realize (GTK_WIDGET (window));
-       gdk_flush ();
-
 }
 
 static void