From 66ea0e4652494beaf42ee198943d2dfc6cab7d8a Mon Sep 17 00:00:00 2001
From: Suman Manjunath <msuman@src.gnome.org>
Date: Mon, 12 Jan 2009 04:38:11 +0000
Subject: Matthew Barnes  <mbarnes@redhat.com> ** Fix for bug #567148 (Use a
 labelled button to bring up the timezone selector widget).

svn path=/trunk/; revision=37051
---
 calendar/ChangeLog              | 7 +++++++
 calendar/gui/e-timezone-entry.c | 8 +-------
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index 1771cc246a..b7aae41976 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,10 @@
+2009-01-12  Matthew Barnes  <mbarnes@redhat.com>
+
+	** Fix for bug #567148
+
+	* gui/e-timezone-entry.c (e_timezone_entry_init): Use a labelled button
+	to bring up the timezone selector widget. 
+
 2009-01-11  Matthew Barnes  <mbarnes@redhat.com>
 
 	* gui/e-cal-component-preview (on_link_clicked):
diff --git a/calendar/gui/e-timezone-entry.c b/calendar/gui/e-timezone-entry.c
index 3b11e27d46..391079a084 100644
--- a/calendar/gui/e-timezone-entry.c
+++ b/calendar/gui/e-timezone-entry.c
@@ -104,7 +104,6 @@ static void
 e_timezone_entry_init		(ETimezoneEntry	*tentry)
 {
 	ETimezoneEntryPrivate *priv;
-	GtkWidget *image;
 	AtkObject *a11y;
 
 	tentry->priv = priv = g_new0 (ETimezoneEntryPrivate, 1);
@@ -119,7 +118,7 @@ e_timezone_entry_init		(ETimezoneEntry	*tentry)
 	gtk_widget_show (priv->entry);
 	g_signal_connect (priv->entry, "changed", G_CALLBACK (on_entry_changed), tentry);
 
-	priv->button = gtk_button_new ();
+	priv->button = gtk_button_new_with_label (_("Select..."));
 	g_signal_connect (priv->button, "clicked", G_CALLBACK (on_button_clicked), tentry);
 	gtk_box_pack_start (GTK_BOX (tentry), priv->button, FALSE, FALSE, 6);
 	gtk_widget_show (priv->button);
@@ -127,11 +126,6 @@ e_timezone_entry_init		(ETimezoneEntry	*tentry)
 	if (a11y != NULL) {
 		atk_object_set_name (a11y, _("Select Timezone"));
 	}
-
-	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 v1.2.3