r19836 - /desktop/unstable/nautilus/debian/patches/11_restart_mode.patch

[joss at users.alioth.debian.org]

Author: joss
Date: Wed Apr 29 15:03:10 2009
New Revision: 19836

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=19836
Log:
Also take into account the show_desktop GConf preference

Modified:
    desktop/unstable/nautilus/debian/patches/11_restart_mode.patch

Modified: desktop/unstable/nautilus/debian/patches/11_restart_mode.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/nautilus/debian/patches/11_restart_mode.patch?rev=19836&op=diff
==============================================================================
--- desktop/unstable/nautilus/debian/patches/11_restart_mode.patch (original)
+++ desktop/unstable/nautilus/debian/patches/11_restart_mode.patch Wed Apr 29 15:03:10 2009
@@ -1,7 +1,7 @@
 Index: nautilus-2.26.2/src/nautilus-main.c
 ===================================================================
---- nautilus-2.26.2.orig/src/nautilus-main.c	2009-04-29 15:58:03.617869628 +0200
-+++ nautilus-2.26.2/src/nautilus-main.c	2009-04-29 16:05:02.878808358 +0200
+--- nautilus-2.26.2.orig/src/nautilus-main.c	2009-04-29 16:05:13.941363154 +0200
++++ nautilus-2.26.2/src/nautilus-main.c	2009-04-29 16:57:37.934763932 +0200
 @@ -391,9 +391,6 @@ main (int argc, char *argv[])
  	browser_window = FALSE;
  
@@ -12,18 +12,19 @@
  
  	context = g_option_context_new (_("\n\nBrowse the file system with the file manager"));
  	g_option_context_add_main_entries (context, options, NULL);
-@@ -449,6 +446,14 @@ main (int argc, char *argv[])
- 		return EXIT_FAILURE;
+@@ -464,6 +461,15 @@ main (int argc, char *argv[])
+ 			(NAUTILUS_PREFERENCES_DESKTOP_IS_HOME_DIR, TRUE);
  	}
  
 +	/* Which .desktop file contains the relevant session management
 +	   information? */
-+	if (no_desktop && g_file_test (DATADIR "/applications/nautilus-home.desktop", G_FILE_TEST_EXISTS)) {
++	if ((no_desktop || !eel_preferences_get_boolean (NAUTILUS_PREFERENCES_SHOW_DESKTOP)
++	    && g_file_test (DATADIR "/applications/nautilus-home.desktop", G_FILE_TEST_EXISTS)) {
 +		egg_set_desktop_file (DATADIR "/applications/nautilus-home.desktop");
 +	} else if (g_file_test (DATADIR "/applications/nautilus.desktop", G_FILE_TEST_EXISTS)) {
 +		egg_set_desktop_file (DATADIR "/applications/nautilus.desktop");
 +	}
 +
- 	/* Initialize the services that we use. */
- 	LIBXML_TEST_VERSION
+ 	application = NULL;
  
+ 	/* Do either the self-check or the real work. */