From cea054cd54d84479352a43bbabc19c9ce9af5efb Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Fri, 8 Aug 2008 04:26:12 +0000 Subject: Merge revisions 35747:35930 from trunk. svn path=/branches/kill-bonobo/; revision=35931 --- shell/e-shell-window.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'shell/e-shell-window.c') diff --git a/shell/e-shell-window.c b/shell/e-shell-window.c index 4097a92314..5a8215df97 100644 --- a/shell/e-shell-window.c +++ b/shell/e-shell-window.c @@ -323,8 +323,8 @@ switch_view (EShellWindow *window, ComponentView *component_view) } else gtk_window_set_title (GTK_WINDOW (window), component_view->title); - if (info->button_icon) - gtk_window_set_icon (GTK_WINDOW (window), info->button_icon); + if (info->icon_name) + gtk_window_set_icon_name (GTK_WINDOW (window), info->icon_name); gconf_client_set_string (gconf_client, "/apps/evolution/shell/view_defaults/component_id", (component_view->component_alias != NULL -- cgit v1.2.3