From c714d8efd156f22661de6d2055e82522de17b382 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Thu, 7 Aug 2008 14:29:49 +0000 Subject: ** Fixes bug #467115 2008-08-07 Matthew Barnes ** Fixes bug #467115 * shell/e-component-registry.h: Replace button and menu icon pixbufs with an icon name string. * shell/e-component-registry.c (query_components): No need to create pixbufs, just save the icon name. * shell/e-sidebar.c: Remember a default icon name rather than a default pixbuf. * shell/e-sidebar.c (e_sidebar_add_button), (e_sidebar_change_button_icon): * shell/e-shell-window.c (e_shell_window_change_component_button_icon): Take an icon name instead of a pixbuf. * shell/e-shell-window.c (switch_view): Call gtk_window_set_icon_name() instead of gtk_window_set_icon(). * shell/e-shell-window.c (setup_widgets): Change XML from pixtype="pixbuf" to pixbuf="filename" and derive an appropriate filename from the icon name. svn path=/trunk/; revision=35924 --- shell/e-component-registry.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'shell/e-component-registry.h') diff --git a/shell/e-component-registry.h b/shell/e-component-registry.h index 0c7ff03b0e..1d5943537c 100644 --- a/shell/e-component-registry.h +++ b/shell/e-component-registry.h @@ -73,10 +73,9 @@ struct _EComponentInfo { char *button_label; char *button_tooltips; - GdkPixbuf *button_icon; char *menu_label; char *menu_accelerator; - GdkPixbuf *menu_icon; + char *icon_name; int sort_order; -- cgit v1.2.3