r19832 - in /desktop/unstable/nautilus/debian: changelog patches/11_restart_mode.patch patches/series

[joss at users.alioth.debian.org]

Author: joss
Date: Wed Apr 29 14:06:16 2009
New Revision: 19832

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=19832
Log:
11_restart_mode.patch: new patch. Do not get the session manager to 
automatically restart nautilus when using --no-desktop.

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

Modified: desktop/unstable/nautilus/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/nautilus/debian/changelog?rev=19832&op=diff
==============================================================================
--- desktop/unstable/nautilus/debian/changelog (original)
+++ desktop/unstable/nautilus/debian/changelog Wed Apr 29 14:06:16 2009
@@ -1,3 +1,10 @@
+nautilus (2.26.2-3) UNRELEASED; urgency=low
+
+  * 11_restart_mode.patch: new patch. Do not get the session manager to 
+    automatically restart nautilus when using --no-desktop.
+
+ -- Josselin Mouette <joss at debian.org>  Wed, 29 Apr 2009 16:05:35 +0200
+
 nautilus (2.26.2-2) unstable; urgency=low
 
   * 20_open-with_install.patch: fix a crash when switching tabs in the 

Added: 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=19832&op=file
==============================================================================
--- desktop/unstable/nautilus/debian/patches/11_restart_mode.patch (added)
+++ desktop/unstable/nautilus/debian/patches/11_restart_mode.patch Wed Apr 29 14:06:16 2009
@@ -1,0 +1,29 @@
+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
+@@ -391,9 +391,6 @@ main (int argc, char *argv[])
+ 	browser_window = FALSE;
+ 
+ 	g_set_prgname ("nautilus");
+-	if (g_file_test (DATADIR "/applications/nautilus.desktop", G_FILE_TEST_EXISTS)) {
+-		egg_set_desktop_file (DATADIR "/applications/nautilus.desktop");
+-	}
+ 
+ 	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;
+ 	}
+ 
++	/* Which .desktop file contains the relevant session management
++	   information? */
++	if (no_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
+ 

Modified: desktop/unstable/nautilus/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/nautilus/debian/patches/series?rev=19832&op=diff
==============================================================================
--- desktop/unstable/nautilus/debian/patches/series (original)
+++ desktop/unstable/nautilus/debian/patches/series Wed Apr 29 14:06:16 2009
@@ -2,6 +2,7 @@
 01_manpage.patch
 02_eel_libadd.patch
 10_load_session.patch
+11_restart_mode.patch
 12_list-view_expand.patch
 20_open-with_install.patch
 90_relibtoolize.patch