From 6760cc72334346b8654fcd9fe1440890db55ac1b Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Fri, 7 Nov 2008 22:25:30 +0000 Subject: Merge revisions 36730:36736 from trunk. svn path=/branches/kill-bonobo/; revision=36764 --- plugins/groupwise-features/ChangeLog | 7 +++++++ plugins/groupwise-features/proxy-login.c | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) (limited to 'plugins') diff --git a/plugins/groupwise-features/ChangeLog b/plugins/groupwise-features/ChangeLog index 884301b517..9f9161496f 100644 --- a/plugins/groupwise-features/ChangeLog +++ b/plugins/groupwise-features/ChangeLog @@ -1,3 +1,10 @@ +2008-11-04 Sankar P + + ** Fix for bug bnc #434968 + + * plugins/groupwise-features/proxy-login.c: + Show correct icon for the proxy login dialog + 2008-10-17 Matthew Barnes * send-options.c (org_gnome_send-options): diff --git a/plugins/groupwise-features/proxy-login.c b/plugins/groupwise-features/proxy-login.c index 1dc35e940b..46210d0956 100644 --- a/plugins/groupwise-features/proxy-login.c +++ b/plugins/groupwise-features/proxy-login.c @@ -441,7 +441,7 @@ proxy_login_update_tree (void) char *proxy_email; EGwConnection *cnc; proxyLoginPrivate *priv = pld->priv; - gchar *file_name = e_icon_factory_get_icon_filename ("stock_person", 48); + gchar *file_name = e_icon_factory_get_icon_filename ("stock_person", E_ICON_SIZE_DIALOG); broken_image = file_name ? gdk_pixbuf_new_from_file (file_name, NULL) : NULL; cnc = proxy_login_get_cnc (pld->account, priv->main ? (GTK_WINDOW (gtk_widget_get_toplevel (priv->main))) : NULL); -- cgit