aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSuman Manjunath <msuman@src.gnome.org>2008-12-08 16:09:01 +0800
committerSuman Manjunath <msuman@src.gnome.org>2008-12-08 16:09:01 +0800
commitcd622d600ec180de75830913f7284d8d66370493 (patch)
tree7042123d85779312579e3a55a7abe62c37cb6ac2
parente7a430163104edf067865306cdc1b5192bb08d4c (diff)
downloadgsoc2013-evolution-cd622d600ec180de75830913f7284d8d66370493.tar.gz
gsoc2013-evolution-cd622d600ec180de75830913f7284d8d66370493.tar.zst
gsoc2013-evolution-cd622d600ec180de75830913f7284d8d66370493.zip
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).
svn path=/trunk/; revision=36844
-rw-r--r--shell/ChangeLog10
-rw-r--r--shell/e-shell-window.c2
2 files changed, 11 insertions, 1 deletions
diff --git a/shell/ChangeLog b/shell/ChangeLog
index 307de5bf79..ef89b297a9 100644
--- a/shell/ChangeLog
+++ b/shell/ChangeLog
@@ -1,3 +1,13 @@
+2008-12-08 Jeff Cai <jeff.cai@sun.com>
+
+ ** Fix for bug #563077
+
+ * e-shell-window.c (setup_widgets): Don't pass NULL to
+ gtk_icon_info_get_filename().
+
+ Fixes a crash if the gnome-settings-daemon is not running.
+ Observed on SUN Solaris.
+
2008-11-07 Matthew Barnes <mbarnes@redhat.com>
** Fixes part of bug #557581
diff --git a/shell/e-shell-window.c b/shell/e-shell-window.c
index f2eb6bf86d..c533967c77 100644
--- a/shell/e-shell-window.c
+++ b/shell/e-shell-window.c
@@ -796,7 +796,7 @@ setup_widgets (EShellWindow *window)
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",