diff options
| author | Suman Manjunath <msuman@src.gnome.org> | 2008-12-08 16:08:49 +0800 |
|---|---|---|
| committer | Suman Manjunath <msuman@src.gnome.org> | 2008-12-08 16:08:49 +0800 |
| commit | 682a3ee89678c73069acf1a23f54cf1f1c4ae183 (patch) | |
| tree | 08a517de62cf279e263063d94657a1ec078fe7f8 | |
| parent | 85bea601b3a38b36aca0adb4824019d151703294 (diff) | |
| download | gsoc2013-evolution-682a3ee89678c73069acf1a23f54cf1f1c4ae183.tar gsoc2013-evolution-682a3ee89678c73069acf1a23f54cf1f1c4ae183.tar.gz gsoc2013-evolution-682a3ee89678c73069acf1a23f54cf1f1c4ae183.tar.bz2 gsoc2013-evolution-682a3ee89678c73069acf1a23f54cf1f1c4ae183.tar.lz gsoc2013-evolution-682a3ee89678c73069acf1a23f54cf1f1c4ae183.tar.xz gsoc2013-evolution-682a3ee89678c73069acf1a23f54cf1f1c4ae183.tar.zst gsoc2013-evolution-682a3ee89678c73069acf1a23f54cf1f1c4ae183.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=/branches/gnome-2-24/; revision=36843
| -rw-r--r-- | shell/ChangeLog | 10 | ||||
| -rw-r--r-- | shell/e-shell-window.c | 2 |
2 files changed, 11 insertions, 1 deletions
diff --git a/shell/ChangeLog b/shell/ChangeLog index a8ef34815b..ffe2280d38 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 Akhil Laddha <lakhil@novell.com> ** Fix for bug #557581 diff --git a/shell/e-shell-window.c b/shell/e-shell-window.c index f857390070..69861ff64a 100644 --- a/shell/e-shell-window.c +++ b/shell/e-shell-window.c @@ -795,7 +795,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", |