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-sidebar.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'shell/e-sidebar.h') diff --git a/shell/e-sidebar.h b/shell/e-sidebar.h index 319f7e8f04..3ab9350e55 100644 --- a/shell/e-sidebar.h +++ b/shell/e-sidebar.h @@ -67,14 +67,14 @@ void e_sidebar_set_selection_widget (ESidebar *sidebar, void e_sidebar_add_button (ESidebar *sidebar, const char *label, const char *tooltips, - GdkPixbuf *icon, + const char *icon_name, int id); void e_sidebar_select_button (ESidebar *sidebar, int id); void e_sidebar_change_button_icon (ESidebar *sidebar, - GdkPixbuf *icon, + const char *icon_name, int button_id); ESidebarMode e_sidebar_get_mode (ESidebar *sidebar); -- cgit