Merge lp:~ted/ubuntu/natty/nautilus/lp750788 into lp:ubuntu/natty/nautilus

[Ted Gould]

=== modified file 'debian/changelog'
--- debian/changelog	2011-04-05 15:11:19 +0000
+++ debian/changelog	2011-04-08 20:13:27 +0000
@@ -1,3 +1,11 @@
+nautilus (1:2.32.2.1-0ubuntu13) natty; urgency=low
+
+  * 16_desktop_menu_export.patch:
+    * Protect on not being able to find the UI description file and
+      getting an error. (LP: #750788)
+
+ -- Ted Gould <[e-mail]>  Fri, 08 Apr 2011 14:35:50 -0500
+
 nautilus (1:2.32.2.1-0ubuntu12) natty; urgency=low
 
   * debian/patches/00git_help_links.patch:

=== modified file 'debian/patches/16_desktop_menu_export.patch'
--- debian/patches/16_desktop_menu_export.patch	2011-03-28 16:56:39 +0000
+++ debian/patches/16_desktop_menu_export.patch	2011-04-08 20:13:27 +0000
@@ -1,3 +1,19 @@
+=== modified file 'libnautilus-private/nautilus-ui-utilities.c'
+--- old/libnautilus-private/nautilus-ui-utilities.c	2009-12-14 13:52:15 +0000
++++ new/libnautilus-private/nautilus-ui-utilities.c	2011-04-08 19:29:19 +0000
+@@ -97,8 +97,11 @@
+ 		path = nautilus_ui_file (filename);
+ 		if (path == NULL || !g_file_get_contents (path, &ui, NULL, NULL)) {
+ 			g_warning ("Unable to load ui file %s\n", filename); 
++			ui = NULL;
+ 		} 
+ 		g_free (path);
++
++		if (ui != NULL)
+ 		g_hash_table_insert (ui_cache,
+ 				     g_strdup (filename),
+ 				     ui);
+
 === modified file 'src/Makefile.am'
 --- old/src/Makefile.am	2010-08-12 16:41:04 +0000
 +++ new/src/Makefile.am	2011-03-28 16:49:41 +0000
@@ -63,8 +79,16 @@
 
 === modified file 'src/nautilus-desktop-window.c'
 --- old/src/nautilus-desktop-window.c	2010-08-12 16:41:04 +0000
-+++ new/src/nautilus-desktop-window.c	2011-03-28 16:43:02 +0000
-@@ -41,6 +41,29 @@
++++ new/src/nautilus-desktop-window.c	2011-04-08 19:32:26 +0000
+@@ -34,6 +34,7 @@
+ #include <eel/eel-vfs-extensions.h>
+ #include <libnautilus-private/nautilus-file-utilities.h>
+ #include <libnautilus-private/nautilus-icon-names.h>
++#include <libnautilus-private/nautilus-ui-utilities.h>
+ #include <gio/gio.h>
+ #include <glib/gi18n.h>
+ 
+@@ -41,6 +42,29 @@
  	int dummy;
  };
  
@@ -94,7 +118,7 @@
  static void set_wmspec_desktop_hint (GdkWindow *window);
  
  G_DEFINE_TYPE (NautilusDesktopWindow, nautilus_desktop_window, 
-@@ -68,11 +91,75 @@
+@@ -68,11 +92,77 @@
  	gtk_widget_hide (NAUTILUS_WINDOW (window)->details->statusbar);
  	gtk_widget_hide (NAUTILUS_WINDOW (window)->details->menubar);
  
@@ -118,7 +142,9 @@
 +
 +	GtkUIManager * ui_manager = nautilus_window_get_ui_manager(NAUTILUS_WINDOW(window));
 +	const gchar * ui = nautilus_ui_string_get ("nautilus-desktop-window-ui.xml");
-+	gtk_ui_manager_add_ui_from_string (ui_manager, ui, -1, NULL);
++	if (ui != NULL) {
++		gtk_ui_manager_add_ui_from_string (ui_manager, ui, -1, NULL);
++	}
 +
 +	/* Hide actions that don't make sense on the desktop */
 +	GList * agroups = gtk_ui_manager_get_action_groups(NAUTILUS_WINDOW(window)->details->ui_manager);