From 7ade227e6409c98a4010992450e111cf7bb10520 Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@src.gnome.org>
Date: Thu, 14 Aug 2008 20:19:12 +0000
Subject: Merge revisions 35951:35992 from trunk.

svn path=/branches/kill-bonobo/; revision=35994
---
 calendar/gui/e-timezone-entry.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'calendar/gui/e-timezone-entry.c')

diff --git a/calendar/gui/e-timezone-entry.c b/calendar/gui/e-timezone-entry.c
index d361e622b2..d0c57dc0d3 100644
--- a/calendar/gui/e-timezone-entry.c
+++ b/calendar/gui/e-timezone-entry.c
@@ -33,7 +33,6 @@
 #include <widgets/e-timezone-dialog/e-timezone-dialog.h>
 #include <glib/gi18n.h>
 #include "e-timezone-entry.h"
-#include <e-util/e-icon-factory.h>
 
 struct _ETimezoneEntryPrivate {
 	/* The current timezone, set in e_timezone_entry_set_timezone()
@@ -106,7 +105,7 @@ static void
 e_timezone_entry_init		(ETimezoneEntry	*tentry)
 {
 	ETimezoneEntryPrivate *priv;
-	GtkWidget *gtk_image;
+	GtkWidget *image;
 	AtkObject *a11y;
 
 	tentry->priv = priv = g_new0 (ETimezoneEntryPrivate, 1);
@@ -130,9 +129,10 @@ e_timezone_entry_init		(ETimezoneEntry	*tentry)
 		atk_object_set_name (a11y, _("Select Timezone"));
 	}
 
-	gtk_image = e_icon_factory_get_image ("stock_timezone", E_ICON_SIZE_BUTTON);
-	gtk_container_add (GTK_CONTAINER (priv->button), gtk_image);
-	gtk_widget_show (gtk_image);
+	image = gtk_image_new_from_icon_name (
+		"stock_timezone", GTK_ICON_SIZE_BUTTON);
+	gtk_container_add (GTK_CONTAINER (priv->button), image);
+	gtk_widget_show (image);
 }
 
 
-- 
cgit