From bfed62628f536cecd2392291ebfc1f90cf750ab7 Mon Sep 17 00:00:00 2001
From: Suman Manjunath <msuman@src.gnome.org>
Date: Sat, 23 Feb 2008 17:07:39 +0000
Subject: Fix for bug #471779 (Timezone entries in the timezone dialog
 combo-box are now sorted alphabetically)

svn path=/trunk/; revision=35077
---
 widgets/e-timezone-dialog/e-timezone-dialog.glade | 56 ++---------------------
 1 file changed, 5 insertions(+), 51 deletions(-)

(limited to 'widgets/e-timezone-dialog/e-timezone-dialog.glade')

diff --git a/widgets/e-timezone-dialog/e-timezone-dialog.glade b/widgets/e-timezone-dialog/e-timezone-dialog.glade
index 39de73f145..cdb892bc2c 100644
--- a/widgets/e-timezone-dialog/e-timezone-dialog.glade
+++ b/widgets/e-timezone-dialog/e-timezone-dialog.glade
@@ -247,7 +247,7 @@ Use the right mouse button to zoom out.</property>
 	      <property name="yalign">0.5</property>
 	      <property name="xpad">0</property>
 	      <property name="ypad">0</property>
-	      <property name="mnemonic_widget">combo-entry1</property>
+	      <property name="mnemonic_widget">timezone-combo</property>
 	    </widget>
 	    <packing>
 	      <property name="padding">0</property>
@@ -284,59 +284,13 @@ Use the right mouse button to zoom out.</property>
 	      </child>
 
 	      <child>
-		<widget class="GtkCombo" id="timezone-combo">
+		<widget class="GtkComboBox" id="timezone-combo">
 		  <property name="visible">True</property>
-		  <property name="value_in_list">False</property>
-		  <property name="allow_empty">True</property>
-		  <property name="case_sensitive">False</property>
-		  <property name="enable_arrow_keys">True</property>
-		  <property name="enable_arrows_always">False</property>
+		  <property name="add_tearoffs">False</property>
+		  <property name="focus_on_click">True</property>
 		  <accessibility>
-		    <atkproperty name="AtkObject::accessible_name" translatable="yes">TimeZone Combobox</atkproperty>
+		    <atkproperty name="AtkObject::accessible_name" translatable="yes">TimeZone ComboBox</atkproperty>
 		  </accessibility>
-
-		  <child internal-child="entry">
-		    <widget class="GtkEntry" id="combo-entry1">
-		      <property name="visible">True</property>
-		      <property name="can_focus">True</property>
-		      <property name="editable">False</property>
-		      <property name="visibility">True</property>
-		      <property name="max_length">0</property>
-		      <property name="text" translatable="yes"></property>
-		      <property name="has_frame">True</property>
-		      <property name="invisible_char">*</property>
-		      <property name="activates_default">False</property>
-		    </widget>
-		  </child>
-
-		  <child internal-child="list">
-		    <widget class="GtkList" id="convertwidget3">
-		      <property name="visible">True</property>
-		      <property name="selection_mode">GTK_SELECTION_BROWSE</property>
-
-		      <child>
-			<widget class="GtkListItem" id="convertwidget4">
-			  <property name="visible">True</property>
-
-			  <child>
-			    <widget class="GtkLabel" id="convertwidget5">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes"></property>
-			      <property name="use_underline">False</property>
-			      <property name="use_markup">False</property>
-			      <property name="justify">GTK_JUSTIFY_LEFT</property>
-			      <property name="wrap">False</property>
-			      <property name="selectable">False</property>
-			      <property name="xalign">0</property>
-			      <property name="yalign">0.5</property>
-			      <property name="xpad">0</property>
-			      <property name="ypad">0</property>
-			    </widget>
-			  </child>
-			</widget>
-		      </child>
-		    </widget>
-		  </child>
 		</widget>
 		<packing>
 		  <property name="padding">0</property>
-- 
cgit v1.2.3