aboutsummaryrefslogtreecommitdiffstats
path: root/shell/e-shell-view.c
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@redhat.com>2008-08-07 22:29:49 +0800
committerMatthew Barnes <mbarnes@src.gnome.org>2008-08-07 22:29:49 +0800
commitc714d8efd156f22661de6d2055e82522de17b382 (patch)
tree930cb413b6fe34f44a648173f05866e9e2205491 /shell/e-shell-view.c
parent92bc398f6b596236019c34029f85fac5c6449e20 (diff)
downloadgsoc2013-evolution-c714d8efd156f22661de6d2055e82522de17b382.tar.gz
gsoc2013-evolution-c714d8efd156f22661de6d2055e82522de17b382.tar.zst
gsoc2013-evolution-c714d8efd156f22661de6d2055e82522de17b382.zip
** Fixes bug #467115
2008-08-07 Matthew Barnes <mbarnes@redhat.com> ** 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
Diffstat (limited to 'shell/e-shell-view.c')
-rw-r--r--shell/e-shell-view.c12
1 files changed, 3 insertions, 9 deletions
diff --git a/shell/e-shell-view.c b/shell/e-shell-view.c
index ebcc9c03fe..daa9794e3b 100644
--- a/shell/e-shell-view.c
+++ b/shell/e-shell-view.c
@@ -61,7 +61,7 @@ impl_ShellView_setComponent(PortableServer_Servant _servant, const CORBA_char *i
struct change_icon_struct {
const char *component_name;
- GdkPixbuf *icon;
+ const char *icon_name;
};
static gboolean
@@ -72,7 +72,7 @@ change_button_icon_func (EShell *shell, EShellWindow *window, gpointer user_data
g_return_val_if_fail (window != NULL, FALSE);
g_return_val_if_fail (cis != NULL, FALSE);
- e_shell_window_change_component_button_icon (window, cis->component_name, cis->icon);
+ e_shell_window_change_component_button_icon (window, cis->component_name, cis->icon_name);
return TRUE;
}
@@ -85,15 +85,9 @@ impl_ShellView_setButtonIcon (PortableServer_Servant _servant, const CORBA_char
struct change_icon_struct cis;
cis.component_name = id;
- cis.icon = NULL;
-
- if (iconName)
- cis.icon = e_icon_factory_get_icon (iconName, E_ICON_SIZE_BUTTON);
+ cis.icon_name = iconName;
e_shell_foreach_shell_window (shell, change_button_icon_func, &cis);
-
- if (cis.icon)
- g_object_unref (cis.icon);
}
static void