evolution r36843 - branches/gnome-2-24/shell

[msuman svn gnome org]

Author: msuman
Date: Mon Dec  8 08:08:49 2008
New Revision: 36843
URL: http://svn.gnome.org/viewvc/evolution?rev=36843&view=rev

Log:
Jeff Cai ** Fix for bug #563077 (Don't pass NULL to gtk_icon_info_get_filename(), fixes a crash if the gnome-settings-daemon is not running).

Modified:
   branches/gnome-2-24/shell/ChangeLog
   branches/gnome-2-24/shell/e-shell-window.c

Modified: branches/gnome-2-24/shell/e-shell-window.c
==============================================================================
--- branches/gnome-2-24/shell/e-shell-window.c	(original)
+++ branches/gnome-2-24/shell/e-shell-window.c	Mon Dec  8 08:08:49 2008
@@ -795,7 +795,7 @@
 			info->icon_name, width, 0);
 		g_string_append_printf(xml, "\" pixtype=\"filename\" pixname=\"%s\"/>"
 				       "</placeholder></submenu></submenu>\n",
-				       gtk_icon_info_get_filename (icon_info));
+				       icon_info ? gtk_icon_info_get_filename (icon_info) : "");
 		gtk_icon_info_free (icon_info);
 		bonobo_ui_component_set_translate (e_shell_window_peek_bonobo_ui_component (window),
 						   "/menu",