nautilus r14793 - in trunk: . po src

[alexl svn gnome org]

Author: alexl
Date: Mon Dec  1 11:14:13 2008
New Revision: 14793
URL: http://svn.gnome.org/viewvc/nautilus?rev=14793&view=rev

Log:
2008-12-01  Alexander Larsson  <alexl redhat com>

        * POTFILES.in:
        * POTFILES.skip:
	Update

2008-12-01  Alexander Larsson  <alexl redhat com>

        * src/nautilus-main.c:
	Don't crash if nautilus.desktop is not installed (i.e. at make check)



Modified:
   trunk/ChangeLog
   trunk/po/ChangeLog
   trunk/po/POTFILES.in
   trunk/po/POTFILES.skip
   trunk/src/nautilus-main.c

Modified: trunk/po/POTFILES.in
==============================================================================
--- trunk/po/POTFILES.in	(original)
+++ trunk/po/POTFILES.in	Mon Dec  1 11:14:13 2008
@@ -1,6 +1,8 @@
 # List of source files containing translatable strings.
 # Please keep this file sorted alphabetically.
 [encoding: UTF-8]
+cut-n-paste-code/libegg/eggdesktopfile.c
+cut-n-paste-code/libegg/eggsmclient.c
 data/browser.xml
 data/nautilus.xml.in
 libnautilus-extension/nautilus-column.c
@@ -37,6 +39,7 @@
 libnautilus-private/nautilus-undo-signal-handlers.c
 libnautilus-private/nautilus-vfs-file.c
 nautilus-autorun-software.desktop.in.in
+nautilus-browser.desktop.in.in
 nautilus-computer.desktop.in.in
 nautilus-file-management-properties.desktop.in.in
 nautilus-folder-handler.desktop.in.in

Modified: trunk/po/POTFILES.skip
==============================================================================
--- trunk/po/POTFILES.skip	(original)
+++ trunk/po/POTFILES.skip	Mon Dec  1 11:14:13 2008
@@ -7,3 +7,4 @@
 nautilus-folder-handler.desktop.in
 nautilus-home.desktop.in
 nautilus.desktop.in
+nautilus-browser.desktop.in

Modified: trunk/src/nautilus-main.c
==============================================================================
--- trunk/src/nautilus-main.c	(original)
+++ trunk/src/nautilus-main.c	Mon Dec  1 11:14:13 2008
@@ -374,7 +374,9 @@
 	browser_window = FALSE;
 
 	g_set_prgname ("nautilus");
-        egg_set_desktop_file (DATADIR "/applications/nautilus.desktop");
+	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);