some more clock improvements

2 files changed, 1223 insertions, 87 deletions

diff --git a/gnome-panel.spec b/gnome-panel.spec
index 864eabb..678a043 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -22,7 +22,7 @@
 Summary: GNOME panel
 Name: gnome-panel
 Version: 2.22.0
-Release: 6%{?dist}
+Release: 7%{?dist}
 URL: http://www.gnome.org
 Source0: http://download.gnome.org/sources/gnome-panel/2.22/%{name}-%{version}.tar.bz2
 
@@ -357,6 +357,9 @@ fi
 %{_datadir}/gtk-doc/html/*
 
 %changelog
+* Fri Mar 28 2008 Matthias Clasen  <mclasen@redhat.com> - 2.22.0-7
+- Convert the edit and find location windows to dialogs
+
 * Thu Mar 27 2008 Matthias Clasen  <mclasen@redhat.com> - 2.22.0-6
 - Improve the time settings window
 
diff --git a/set-time-window.patch b/set-time-window.patch
index 8dcbaf1..39c3985 100644
--- a/set-time-window.patch
+++ b/set-time-window.patch
@@ -1,7 +1,15 @@
 diff -up gnome-panel-2.22.0/applets/clock/clock.c.set-time-window gnome-panel-2.22.0/applets/clock/clock.c
---- gnome-panel-2.22.0/applets/clock/clock.c.set-time-window	2008-03-27 23:07:01.000000000 -0400
-+++ gnome-panel-2.22.0/applets/clock/clock.c	2008-03-27 23:07:01.000000000 -0400
-@@ -1735,6 +1735,14 @@ cancel_time_settings (GtkWidget *button,
+--- gnome-panel-2.22.0/applets/clock/clock.c.set-time-window	2008-03-28 00:21:34.000000000 -0400
++++ gnome-panel-2.22.0/applets/clock/clock.c	2008-03-28 00:22:00.000000000 -0400
+@@ -237,6 +237,7 @@ static void applet_change_orient (PanelA
+ 				  ClockData         *cd);
+ 
+ static void edit_hide (GtkWidget *unused, ClockData *cd);
++static gboolean edit_delete (GtkWidget *unused, GdkEvent *event, ClockData *cd);
+ static void save_cities_store (ClockData *cd);
+ 
+ static void
+@@ -1735,6 +1736,14 @@ cancel_time_settings (GtkWidget *button,
          refresh_clock_timeout (cd);
  }
  
@@ -16,7 +24,7 @@ diff -up gnome-panel-2.22.0/applets/clock/clock.c.set-time-window gnome-panel-2.
  static void
  fill_time_settings_window (ClockData *cd)
  {
-@@ -1803,6 +1811,8 @@ ensure_time_settings_window_is_created (
+@@ -1803,6 +1812,8 @@ ensure_time_settings_window_is_created (
  		return;
  
  	cd->set_time_window = glade_xml_get_widget (cd->glade_xml, "set-time-window");
@@ -25,33 +33,154 @@ diff -up gnome-panel-2.22.0/applets/clock/clock.c.set-time-window gnome-panel-2.
  
          cd->calendar = glade_xml_get_widget (cd->glade_xml, "calendar");
          cd->hours_spin = glade_xml_get_widget (cd->glade_xml, "hours_spin");
+@@ -3492,6 +3503,14 @@ edit_hide (GtkWidget *unused, ClockData 
+ }
+ 
+ static gboolean
++edit_delete (GtkWidget *unused, GdkEvent *event, ClockData *cd)
++{
++	edit_hide (unused, cd);
++
++	return TRUE;
++}
++
++static gboolean
+ edit_hide_event (GtkWidget *widget, GdkEvent *event, ClockData *cd)
+ {
+         edit_hide (widget, cd);
+@@ -3617,6 +3636,13 @@ run_prefs_locations_add (GtkButton *butt
+ 
+         g_object_set_data (G_OBJECT (edit_window), "clock-location", NULL);
+         gtk_window_set_transient_for (GTK_WINDOW (edit_window), GTK_WINDOW (cd->prefs_window));
++
++	if (g_object_get_data (G_OBJECT (edit_window), "delete-handler")
++ == NULL) {
++		g_object_set_data (G_OBJECT (edit_window), "delete-handler",
++				   GINT_TO_POINTER (g_signal_connect (edit_window, "delete_event", G_CALLBACK (edit_delete), cd)));
++	}
++
+         gtk_window_present_with_time (GTK_WINDOW (edit_window), gtk_get_current_event_time ());
+ }
+ 
 diff -up gnome-panel-2.22.0/applets/clock/clock.glade.set-time-window gnome-panel-2.22.0/applets/clock/clock.glade
---- gnome-panel-2.22.0/applets/clock/clock.glade.set-time-window	2008-03-27 23:07:17.000000000 -0400
-+++ gnome-panel-2.22.0/applets/clock/clock.glade	2008-03-27 23:07:22.000000000 -0400
-@@ -473,346 +473,13 @@ South</property>
+--- gnome-panel-2.22.0/applets/clock/clock.glade.set-time-window	2008-03-28 00:21:34.000000000 -0400
++++ gnome-panel-2.22.0/applets/clock/clock.glade	2008-03-28 00:22:02.000000000 -0400
+@@ -4,7 +4,7 @@
+ <glade-interface>
+ <requires lib="gnome"/>
+ 
+-<widget class="GtkWindow" id="edit-location-window">
++<widget class="GtkWindow" id="edit-location-windowx">
+   <property name="title"></property>
+   <property name="type">GTK_WINDOW_TOPLEVEL</property>
+   <property name="window_position">GTK_WIN_POS_NONE</property>
+@@ -152,7 +152,7 @@
+ 		  </child>
+ 
+ 		  <child>
+-		    <widget class="GtkEntry" id="edit-location-longitude-entry">
++		    <widget class="GtkEntry" id="edit-location-longitude-entryx">
+ 		      <property name="visible">True</property>
+ 		      <property name="can_focus">True</property>
+ 		      <property name="editable">True</property>
+@@ -173,7 +173,7 @@
+ 		  </child>
+ 
+ 		  <child>
+-		    <widget class="GtkComboBox" id="edit-location-longitude-combo">
++		    <widget class="GtkComboBox" id="edit-location-longitude-combox">
+ 		      <property name="visible">True</property>
+ 		      <property name="items" translatable="yes">East
+ West</property>
+@@ -247,7 +247,7 @@ West</property>
+ 		  </child>
+ 
+ 		  <child>
+-		    <widget class="GtkComboBox" id="edit-location-latitude-combo">
++		    <widget class="GtkComboBox" id="edit-location-latitude-combox">
+ 		      <property name="visible">True</property>
+ 		      <property name="items" translatable="yes">North
+ South</property>
+@@ -265,7 +265,7 @@ South</property>
+ 		  </child>
+ 
+ 		  <child>
+-		    <widget class="GtkEntry" id="edit-location-latitude-entry">
++		    <widget class="GtkEntry" id="edit-location-latitude-entryx">
+ 		      <property name="visible">True</property>
+ 		      <property name="can_focus">True</property>
+ 		      <property name="editable">True</property>
+@@ -348,7 +348,7 @@ South</property>
+ 		      <property name="spacing">6</property>
+ 
+ 		      <child>
+-			<widget class="GtkEntry" id="edit-location-name-entry">
++			<widget class="GtkEntry" id="edit-location-name-entryx">
+ 			  <property name="visible">True</property>
+ 			  <property name="can_focus">True</property>
+ 			  <property name="editable">True</property>
+@@ -367,7 +367,7 @@ South</property>
+ 		      </child>
+ 
+ 		      <child>
+-			<widget class="GtkButton" id="find-location-button">
++			<widget class="GtkButton" id="find-location-buttonx">
+ 			  <property name="visible">True</property>
+ 			  <property name="can_focus">True</property>
+ 			  <property name="label" translatable="yes">Find...</property>
+@@ -393,7 +393,7 @@ South</property>
+ 		  </child>
+ 
+ 		  <child>
+-		    <widget class="GtkComboBoxEntry" id="edit-location-timezone-combo">
++		    <widget class="GtkComboBoxEntry" id="edit-location-timezone-combox">
+ 		      <property name="visible">True</property>
+ 		      <property name="items">Dummy Item</property>
+ 		      <property name="add_tearoffs">False</property>
+@@ -440,7 +440,7 @@ South</property>
+ 	  <property name="spacing">6</property>
+ 
+ 	  <child>
+-	    <widget class="GtkButton" id="edit-location-cancel-button">
++	    <widget class="GtkButton" id="edit-location-cancel-buttonx">
+ 	      <property name="visible">True</property>
+ 	      <property name="can_default">True</property>
+ 	      <property name="can_focus">True</property>
+@@ -452,7 +452,7 @@ South</property>
+ 	  </child>
+ 
+ 	  <child>
+-	    <widget class="GtkButton" id="edit-location-ok-button">
++	    <widget class="GtkButton" id="edit-location-ok-buttonx">
+ 	      <property name="visible">True</property>
+ 	      <property name="can_default">True</property>
+ 	      <property name="can_focus">True</property>
+@@ -473,12 +473,13 @@ South</property>
    </child>
  </widget>
  
 -<widget class="GtkWindow" id="set-time-window">
 -  <property name="border_width">12</property>
 -  <property name="title" translatable="yes">Time Settings</property>
--  <property name="type">GTK_WINDOW_TOPLEVEL</property>
--  <property name="window_position">GTK_WIN_POS_NONE</property>
--  <property name="modal">False</property>
--  <property name="resizable">True</property>
--  <property name="destroy_with_parent">False</property>
--  <property name="decorated">True</property>
--  <property name="skip_taskbar_hint">False</property>
--  <property name="skip_pager_hint">False</property>
--  <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
--  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
--  <property name="focus_on_map">True</property>
--  <property name="urgency_hint">False</property>
--
--  <child>
++<widget class="GtkWindow" id="find-location-windowx">
++  <property name="title" translatable="yes"></property>
+   <property name="type">GTK_WINDOW_TOPLEVEL</property>
+   <property name="window_position">GTK_WIN_POS_NONE</property>
+   <property name="modal">False</property>
++  <property name="default_width">400</property>
++  <property name="default_height">500</property>
+   <property name="resizable">True</property>
+   <property name="destroy_with_parent">False</property>
+   <property name="decorated">True</property>
+@@ -490,141 +491,91 @@ South</property>
+   <property name="urgency_hint">False</property>
+ 
+   <child>
 -    <widget class="GtkVBox" id="vbox20">
--      <property name="visible">True</property>
--      <property name="homogeneous">False</property>
++    <widget class="GtkVBox" id="vbox25">
++      <property name="border_width">12</property>
+       <property name="visible">True</property>
+       <property name="homogeneous">False</property>
 -      <property name="spacing">6</property>
 -
 -      <child>
@@ -78,16 +207,20 @@ diff -up gnome-panel-2.22.0/applets/clock/clock.glade.set-time-window gnome-pane
 -	  <property name="fill">False</property>
 -	</packing>
 -      </child>
--
--      <child>
++      <property name="spacing">24</property>
+ 
+       <child>
 -	<widget class="GtkHBox" id="time_settings_box">
--	  <property name="visible">True</property>
--	  <property name="homogeneous">False</property>
++	<widget class="GtkVBox" id="vbox26">
+ 	  <property name="visible">True</property>
+ 	  <property name="homogeneous">False</property>
 -	  <property name="spacing">0</property>
--
--	  <child>
++	  <property name="spacing">6</property>
+ 
+ 	  <child>
 -	    <widget class="GtkLabel" id="label217">
--	      <property name="visible">True</property>
++	    <widget class="GtkScrolledWindow" id="scrolledwindow11">
+ 	      <property name="visible">True</property>
 -	      <property name="label">    </property>
 -	      <property name="use_underline">False</property>
 -	      <property name="use_markup">False</property>
@@ -102,36 +235,78 @@ diff -up gnome-panel-2.22.0/applets/clock/clock.glade.set-time-window gnome-pane
 -	      <property name="width_chars">-1</property>
 -	      <property name="single_line_mode">False</property>
 -	      <property name="angle">0</property>
--	    </widget>
--	    <packing>
--	      <property name="padding">0</property>
++	      <property name="can_focus">True</property>
++	      <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
++	      <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
++	      <property name="shadow_type">GTK_SHADOW_IN</property>
++	      <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
++
++	      <child>
++		<widget class="GtkTreeView" id="find-location-treex">
++		  <property name="visible">True</property>
++		  <property name="can_focus">True</property>
++		  <property name="headers_visible">False</property>
++		  <property name="rules_hint">False</property>
++		  <property name="reorderable">False</property>
++		  <property name="enable_search">False</property>
++		  <property name="fixed_height_mode">False</property>
++		  <property name="hover_selection">False</property>
++		  <property name="hover_expand">False</property>
++		</widget>
++	      </child>
+ 	    </widget>
+ 	    <packing>
+ 	      <property name="padding">0</property>
 -	      <property name="expand">False</property>
 -	      <property name="fill">False</property>
--	    </packing>
--	  </child>
--
--	  <child>
++	      <property name="expand">True</property>
++	      <property name="fill">True</property>
+ 	    </packing>
+ 	  </child>
+ 
+ 	  <child>
 -	    <widget class="GtkHBox" id="hbox52">
--	      <property name="visible">True</property>
--	      <property name="homogeneous">False</property>
++	    <widget class="GtkHBox" id="hbox56">
+ 	      <property name="visible">True</property>
+ 	      <property name="homogeneous">False</property>
 -	      <property name="spacing">12</property>
--
--	      <child>
++	      <property name="spacing">6</property>
+ 
+ 	      <child>
 -		<widget class="GtkCalendar" id="calendar">
--		  <property name="visible">True</property>
++		<widget class="GtkLabel" id="label221">
+ 		  <property name="visible">True</property>
 -		  <property name="can_focus">True</property>
 -		  <property name="display_options">GTK_CALENDAR_SHOW_HEADING</property>
--		</widget>
--		<packing>
--		  <property name="padding">0</property>
++		  <property name="label" translatable="yes">_Find:</property>
++		  <property name="use_underline">True</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.5</property>
++		  <property name="yalign">0.5</property>
++		  <property name="xpad">0</property>
++		  <property name="ypad">0</property>
++		  <property name="mnemonic_widget">find-location-entryx</property>
++		  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
++		  <property name="width_chars">-1</property>
++		  <property name="single_line_mode">False</property>
++		  <property name="angle">0</property>
+ 		</widget>
+ 		<packing>
+ 		  <property name="padding">0</property>
 -		  <property name="expand">True</property>
 -		  <property name="fill">True</property>
--		</packing>
--	      </child>
--
--	      <child>
++		  <property name="expand">False</property>
++		  <property name="fill">False</property>
+ 		</packing>
+ 	      </child>
+ 
+ 	      <child>
 -		<widget class="GtkVBox" id="vbox22">
--		  <property name="visible">True</property>
++		<widget class="GtkEntry" id="find-location-entryx">
+ 		  <property name="visible">True</property>
 -		  <property name="homogeneous">False</property>
 -		  <property name="spacing">6</property>
 -
@@ -184,23 +359,34 @@ diff -up gnome-panel-2.22.0/applets/clock/clock.glade.set-time-window gnome-pane
 -		      <property name="fill">False</property>
 -		    </packing>
 -		  </child>
--		</widget>
--		<packing>
--		  <property name="padding">0</property>
--		  <property name="expand">True</property>
--		  <property name="fill">True</property>
--		</packing>
--	      </child>
--
--	      <child>
++		  <property name="can_focus">True</property>
++		  <property name="editable">True</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>
+ 		<packing>
+ 		  <property name="padding">0</property>
+@@ -634,357 +585,71 @@ South</property>
+ 	      </child>
+ 
+ 	      <child>
 -		<widget class="GtkVBox" id="vbox23">
--		  <property name="visible">True</property>
++		<widget class="GtkButton" id="find-next-location-buttonx">
+ 		  <property name="visible">True</property>
 -		  <property name="homogeneous">False</property>
 -		  <property name="spacing">6</property>
--
--		  <child>
++		  <property name="can_focus">True</property>
++		  <property name="relief">GTK_RELIEF_NORMAL</property>
++		  <property name="focus_on_click">True</property>
+ 
+ 		  <child>
 -		    <widget class="GtkLabel" id="current_time_label">
--		      <property name="visible">True</property>
++		    <widget class="GtkAlignment" id="alignment31">
+ 		      <property name="visible">True</property>
 -		      <property name="label">23:59:59</property>
 -		      <property name="use_underline">False</property>
 -		      <property name="use_markup">False</property>
@@ -208,7 +394,8 @@ diff -up gnome-panel-2.22.0/applets/clock/clock.glade.set-time-window gnome-pane
 -		      <property name="wrap">False</property>
 -		      <property name="selectable">False</property>
 -		      <property name="xalign">0</property>
--		      <property name="yalign">0.5</property>
++		      <property name="xalign">0.5</property>
+ 		      <property name="yalign">0.5</property>
 -		      <property name="xpad">0</property>
 -		      <property name="ypad">0</property>
 -		      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
@@ -228,10 +415,17 @@ diff -up gnome-panel-2.22.0/applets/clock/clock.glade.set-time-window gnome-pane
 -		      <property name="visible">True</property>
 -		      <property name="homogeneous">False</property>
 -		      <property name="spacing">0</property>
--
--		      <child>
++		      <property name="xscale">0</property>
++		      <property name="yscale">0</property>
++		      <property name="top_padding">0</property>
++		      <property name="bottom_padding">0</property>
++		      <property name="left_padding">0</property>
++		      <property name="right_padding">0</property>
+ 
+ 		      <child>
 -			<widget class="GtkSpinButton" id="hours_spin">
--			  <property name="visible">True</property>
++			<widget class="GtkHBox" id="hbox57">
+ 			  <property name="visible">True</property>
 -			  <property name="can_focus">True</property>
 -			  <property name="climb_rate">1</property>
 -			  <property name="digits">0</property>
@@ -247,7 +441,9 @@ diff -up gnome-panel-2.22.0/applets/clock/clock.glade.set-time-window gnome-pane
 -			  <property name="fill">True</property>
 -			</packing>
 -		      </child>
--
++			  <property name="homogeneous">False</property>
++			  <property name="spacing">2</property>
+ 
 -		      <child>
 -			<widget class="GtkSpinButton" id="minutes_spin">
 -			  <property name="visible">True</property>
@@ -266,7 +462,23 @@ diff -up gnome-panel-2.22.0/applets/clock/clock.glade.set-time-window gnome-pane
 -			  <property name="fill">True</property>
 -			</packing>
 -		      </child>
--
++			  <child>
++			    <widget class="GtkImage" id="image29">
++			      <property name="visible">True</property>
++			      <property name="stock">gtk-find</property>
++			      <property name="icon_size">4</property>
++			      <property name="xalign">0.5</property>
++			      <property name="yalign">0.5</property>
++			      <property name="xpad">0</property>
++			      <property name="ypad">0</property>
++			    </widget>
++			    <packing>
++			      <property name="padding">0</property>
++			      <property name="expand">False</property>
++			      <property name="fill">False</property>
++			    </packing>
++			  </child>
+ 
 -		      <child>
 -			<widget class="GtkSpinButton" id="seconds_spin">
 -			  <property name="visible">True</property>
@@ -367,26 +579,229 @@ diff -up gnome-panel-2.22.0/applets/clock/clock.glade.set-time-window gnome-pane
 -  </child>
 -</widget>
 -
- <widget class="GtkWindow" id="find-location-window">
-   <property name="title" translatable="yes"></property>
-   <property name="type">GTK_WINDOW_TOPLEVEL</property>
-   <property name="window_position">GTK_WIN_POS_NONE</property>
-   <property name="modal">False</property>
-+  <property name="default_width">400</property>
-+  <property name="default_height">500</property>
-   <property name="resizable">True</property>
-   <property name="destroy_with_parent">False</property>
-   <property name="decorated">True</property>
-@@ -822,8 +489,6 @@ South</property>
-   <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
-   <property name="focus_on_map">True</property>
-   <property name="urgency_hint">False</property>
+-<widget class="GtkWindow" id="find-location-window">
+-  <property name="title" translatable="yes"></property>
+-  <property name="type">GTK_WINDOW_TOPLEVEL</property>
+-  <property name="window_position">GTK_WIN_POS_NONE</property>
+-  <property name="modal">False</property>
+-  <property name="resizable">True</property>
+-  <property name="destroy_with_parent">False</property>
+-  <property name="decorated">True</property>
+-  <property name="skip_taskbar_hint">False</property>
+-  <property name="skip_pager_hint">False</property>
+-  <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
+-  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
+-  <property name="focus_on_map">True</property>
+-  <property name="urgency_hint">False</property>
 -  <property name="default_width">400</property>
 -  <property name="default_height">500</property>
+-
+-  <child>
+-    <widget class="GtkVBox" id="vbox25">
+-      <property name="border_width">12</property>
+-      <property name="visible">True</property>
+-      <property name="homogeneous">False</property>
+-      <property name="spacing">24</property>
+-
+-      <child>
+-	<widget class="GtkVBox" id="vbox26">
+-	  <property name="visible">True</property>
+-	  <property name="homogeneous">False</property>
+-	  <property name="spacing">6</property>
+-
+-	  <child>
+-	    <widget class="GtkScrolledWindow" id="scrolledwindow11">
+-	      <property name="visible">True</property>
+-	      <property name="can_focus">True</property>
+-	      <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+-	      <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+-	      <property name="shadow_type">GTK_SHADOW_IN</property>
+-	      <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
+-
+-	      <child>
+-		<widget class="GtkTreeView" id="find-location-tree">
+-		  <property name="visible">True</property>
+-		  <property name="can_focus">True</property>
+-		  <property name="headers_visible">False</property>
+-		  <property name="rules_hint">False</property>
+-		  <property name="reorderable">False</property>
+-		  <property name="enable_search">False</property>
+-		  <property name="fixed_height_mode">False</property>
+-		  <property name="hover_selection">False</property>
+-		  <property name="hover_expand">False</property>
+-		</widget>
+-	      </child>
+-	    </widget>
+-	    <packing>
+-	      <property name="padding">0</property>
+-	      <property name="expand">True</property>
+-	      <property name="fill">True</property>
+-	    </packing>
+-	  </child>
+-
+-	  <child>
+-	    <widget class="GtkHBox" id="hbox56">
+-	      <property name="visible">True</property>
+-	      <property name="homogeneous">False</property>
+-	      <property name="spacing">6</property>
+-
+-	      <child>
+-		<widget class="GtkLabel" id="label221">
+-		  <property name="visible">True</property>
+-		  <property name="label" translatable="yes">_Find:</property>
+-		  <property name="use_underline">True</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.5</property>
+-		  <property name="yalign">0.5</property>
+-		  <property name="xpad">0</property>
+-		  <property name="ypad">0</property>
+-		  <property name="mnemonic_widget">find-location-entry</property>
+-		  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+-		  <property name="width_chars">-1</property>
+-		  <property name="single_line_mode">False</property>
+-		  <property name="angle">0</property>
+-		</widget>
+-		<packing>
+-		  <property name="padding">0</property>
+-		  <property name="expand">False</property>
+-		  <property name="fill">False</property>
+-		</packing>
+-	      </child>
+-
+-	      <child>
+-		<widget class="GtkEntry" id="find-location-entry">
+-		  <property name="visible">True</property>
+-		  <property name="can_focus">True</property>
+-		  <property name="editable">True</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>
+-		<packing>
+-		  <property name="padding">0</property>
+-		  <property name="expand">True</property>
+-		  <property name="fill">True</property>
+-		</packing>
+-	      </child>
+-
+-	      <child>
+-		<widget class="GtkButton" id="find-next-location-button">
+-		  <property name="visible">True</property>
+-		  <property name="can_focus">True</property>
+-		  <property name="relief">GTK_RELIEF_NORMAL</property>
+-		  <property name="focus_on_click">True</property>
+-
+-		  <child>
+-		    <widget class="GtkAlignment" id="alignment31">
+-		      <property name="visible">True</property>
+-		      <property name="xalign">0.5</property>
+-		      <property name="yalign">0.5</property>
+-		      <property name="xscale">0</property>
+-		      <property name="yscale">0</property>
+-		      <property name="top_padding">0</property>
+-		      <property name="bottom_padding">0</property>
+-		      <property name="left_padding">0</property>
+-		      <property name="right_padding">0</property>
+-
+-		      <child>
+-			<widget class="GtkHBox" id="hbox57">
+-			  <property name="visible">True</property>
+-			  <property name="homogeneous">False</property>
+-			  <property name="spacing">2</property>
+-
+-			  <child>
+-			    <widget class="GtkImage" id="image29">
+-			      <property name="visible">True</property>
+-			      <property name="stock">gtk-find</property>
+-			      <property name="icon_size">4</property>
+-			      <property name="xalign">0.5</property>
+-			      <property name="yalign">0.5</property>
+-			      <property name="xpad">0</property>
+-			      <property name="ypad">0</property>
+-			    </widget>
+-			    <packing>
+-			      <property name="padding">0</property>
+-			      <property name="expand">False</property>
+-			      <property name="fill">False</property>
+-			    </packing>
+-			  </child>
+-
+-			  <child>
+-			    <widget class="GtkLabel" id="label222">
+-			      <property name="visible">True</property>
+-			      <property name="label" translatable="yes">Find _Next</property>
+-			      <property name="use_underline">True</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.5</property>
+-			      <property name="yalign">0.5</property>
+-			      <property name="xpad">0</property>
+-			      <property name="ypad">0</property>
+-			      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+-			      <property name="width_chars">-1</property>
+-			      <property name="single_line_mode">False</property>
+-			      <property name="angle">0</property>
+-			    </widget>
+-			    <packing>
+-			      <property name="padding">0</property>
+-			      <property name="expand">False</property>
+-			      <property name="fill">False</property>
+-			    </packing>
+-			  </child>
++			  <child>
++			    <widget class="GtkLabel" id="label222">
++			      <property name="visible">True</property>
++			      <property name="label" translatable="yes">Find _Next</property>
++			      <property name="use_underline">True</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.5</property>
++			      <property name="yalign">0.5</property>
++			      <property name="xpad">0</property>
++			      <property name="ypad">0</property>
++			      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
++			      <property name="width_chars">-1</property>
++			      <property name="single_line_mode">False</property>
++			      <property name="angle">0</property>
++			    </widget>
++			    <packing>
++			      <property name="padding">0</property>
++			      <property name="expand">False</property>
++			      <property name="fill">False</property>
++			    </packing>
++			  </child>
+ 			</widget>
+ 		      </child>
+ 		    </widget>
+@@ -1018,7 +683,7 @@ South</property>
+ 	  <property name="spacing">0</property>
  
-   <child>
-     <widget class="GtkVBox" id="vbox25">
-@@ -1840,4 +1505,342 @@ South</property>
+ 	  <child>
+-	    <widget class="GtkButton" id="find-location-cancel-button">
++	    <widget class="GtkButton" id="find-location-cancel-buttonx">
+ 	      <property name="visible">True</property>
+ 	      <property name="can_default">True</property>
+ 	      <property name="can_focus">True</property>
+@@ -1030,7 +695,7 @@ South</property>
+ 	  </child>
+ 
+ 	  <child>
+-	    <widget class="GtkButton" id="find-location-ok-button">
++	    <widget class="GtkButton" id="find-location-ok-buttonx">
+ 	      <property name="visible">True</property>
+ 	      <property name="can_default">True</property>
+ 	      <property name="can_focus">True</property>
+@@ -1840,4 +1505,1060 @@ South</property>
    </child>
  </widget>
  
@@ -728,4 +1143,722 @@ diff -up gnome-panel-2.22.0/applets/clock/clock.glade.set-time-window gnome-pane
 +  </child>
 +</widget>
 +
++<widget class="GtkDialog" id="edit-location-window">
++  <property name="border_width">5</property>
++  <property name="title"></property>
++  <property name="type">GTK_WINDOW_TOPLEVEL</property>
++  <property name="window_position">GTK_WIN_POS_NONE</property>
++  <property name="modal">False</property>
++  <property name="resizable">True</property>
++  <property name="destroy_with_parent">False</property>
++  <property name="decorated">True</property>
++  <property name="skip_taskbar_hint">False</property>
++  <property name="skip_pager_hint">False</property>
++  <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
++  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
++  <property name="focus_on_map">True</property>
++  <property name="urgency_hint">False</property>
++  <property name="has_separator">False</property>
++
++  <child internal-child="vbox">
++    <widget class="GtkVBox" id="dialog-vbox3">
++      <property name="visible">True</property>
++      <property name="homogeneous">False</property>
++      <property name="spacing">0</property>
++
++      <child internal-child="action_area">
++	<widget class="GtkHButtonBox" id="dialog-action_area3">
++	  <property name="visible">True</property>
++	  <property name="layout_style">GTK_BUTTONBOX_END</property>
++
++	  <child>
++	    <widget class="GtkButton" id="edit-location-cancel-button">
++	      <property name="visible">True</property>
++	      <property name="can_default">True</property>
++	      <property name="can_focus">True</property>
++	      <property name="label">gtk-cancel</property>
++	      <property name="use_stock">True</property>
++	      <property name="relief">GTK_RELIEF_NORMAL</property>
++	      <property name="focus_on_click">True</property>
++	      <property name="response_id">-6</property>
++	    </widget>
++	  </child>
++
++	  <child>
++	    <widget class="GtkButton" id="edit-location-ok-button">
++	      <property name="visible">True</property>
++	      <property name="can_default">True</property>
++	      <property name="can_focus">True</property>
++	      <property name="label">gtk-ok</property>
++	      <property name="use_stock">True</property>
++	      <property name="relief">GTK_RELIEF_NORMAL</property>
++	      <property name="focus_on_click">True</property>
++	      <property name="response_id">-5</property>
++	    </widget>
++	  </child>
++	</widget>
++	<packing>
++	  <property name="padding">0</property>
++	  <property name="expand">False</property>
++	  <property name="fill">True</property>
++	  <property name="pack_type">GTK_PACK_END</property>
++	</packing>
++      </child>
++
++      <child>
++	<widget class="GtkTable" id="table26">
++	  <property name="visible">True</property>
++	  <property name="n_rows">1</property>
++	  <property name="n_columns">3</property>
++	  <property name="homogeneous">False</property>
++	  <property name="row_spacing">6</property>
++	  <property name="column_spacing">6</property>
++
++	  <child>
++	    <widget class="GtkVBox" id="vbox34">
++	      <property name="visible">True</property>
++	      <property name="homogeneous">False</property>
++	      <property name="spacing">6</property>
++
++	      <child>
++		<widget class="GtkScrolledWindow" id="scrolledwindow12">
++		  <property name="visible">True</property>
++		  <property name="can_focus">True</property>
++		  <property name="hscrollbar_policy">GTK_POLICY_NEVER</property>
++		  <property name="vscrollbar_policy">GTK_POLICY_NEVER</property>
++		  <property name="shadow_type">GTK_SHADOW_NONE</property>
++		  <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
++
++		  <child>
++		    <widget class="GtkViewport" id="viewport3">
++		      <property name="visible">True</property>
++		      <property name="shadow_type">GTK_SHADOW_NONE</property>
++
++		      <child>
++			<widget class="GtkImage" id="image30">
++			  <property name="visible">True</property>
++			  <property name="xalign">0.5</property>
++			  <property name="yalign">0.5</property>
++			  <property name="xpad">0</property>
++			  <property name="ypad">0</property>
++			</widget>
++		      </child>
++		    </widget>
++		  </child>
++		</widget>
++		<packing>
++		  <property name="padding">0</property>
++		  <property name="expand">True</property>
++		  <property name="fill">True</property>
++		</packing>
++	      </child>
++
++	      <child>
++		<widget class="GtkTable" id="table27">
++		  <property name="border_width">5</property>
++		  <property name="visible">True</property>
++		  <property name="n_rows">4</property>
++		  <property name="n_columns">4</property>
++		  <property name="homogeneous">False</property>
++		  <property name="row_spacing">6</property>
++		  <property name="column_spacing">6</property>
++
++		  <child>
++		    <widget class="GtkVBox" id="vbox35">
++		      <property name="visible">True</property>
++		      <property name="homogeneous">True</property>
++		      <property name="spacing">6</property>
++
++		      <child>
++			<widget class="GtkLabel" id="label237">
++			  <property name="visible">True</property>
++			  <property name="label" translatable="yes">Latitude:</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>
++			  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
++			  <property name="width_chars">-1</property>
++			  <property name="single_line_mode">False</property>
++			  <property name="angle">0</property>
++			</widget>
++			<packing>
++			  <property name="padding">0</property>
++			  <property name="expand">False</property>
++			  <property name="fill">False</property>
++			</packing>
++		      </child>
++		    </widget>
++		    <packing>
++		      <property name="left_attach">0</property>
++		      <property name="right_attach">1</property>
++		      <property name="top_attach">2</property>
++		      <property name="bottom_attach">3</property>
++		      <property name="x_options">fill</property>
++		    </packing>
++		  </child>
++
++		  <child>
++		    <widget class="GtkLabel" id="label238">
++		      <property name="visible">True</property>
++		      <property name="label" translatable="yes">Longitude:</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>
++		      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
++		      <property name="width_chars">-1</property>
++		      <property name="single_line_mode">False</property>
++		      <property name="angle">0</property>
++		    </widget>
++		    <packing>
++		      <property name="left_attach">0</property>
++		      <property name="right_attach">1</property>
++		      <property name="top_attach">3</property>
++		      <property name="bottom_attach">4</property>
++		      <property name="x_options">fill</property>
++		      <property name="y_options"></property>
++		    </packing>
++		  </child>
++
++		  <child>
++		    <widget class="GtkEntry" id="edit-location-longitude-entry">
++		      <property name="visible">True</property>
++		      <property name="can_focus">True</property>
++		      <property name="editable">True</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>
++		    <packing>
++		      <property name="left_attach">1</property>
++		      <property name="right_attach">2</property>
++		      <property name="top_attach">3</property>
++		      <property name="bottom_attach">4</property>
++		      <property name="y_options"></property>
++		    </packing>
++		  </child>
++
++		  <child>
++		    <widget class="GtkComboBox" id="edit-location-longitude-combo">
++		      <property name="visible">True</property>
++		      <property name="items" translatable="yes">East
++West</property>
++		      <property name="add_tearoffs">False</property>
++		      <property name="focus_on_click">True</property>
++		    </widget>
++		    <packing>
++		      <property name="left_attach">2</property>
++		      <property name="right_attach">3</property>
++		      <property name="top_attach">3</property>
++		      <property name="bottom_attach">4</property>
++		      <property name="x_options">fill</property>
++		      <property name="y_options">fill</property>
++		    </packing>
++		  </child>
++
++		  <child>
++		    <widget class="GtkLabel" id="label239">
++		      <property name="visible">True</property>
++		      <property name="label" translatable="yes">&lt;i&gt;(optional)&lt;/i&gt;</property>
++		      <property name="use_underline">False</property>
++		      <property name="use_markup">True</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>
++		      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
++		      <property name="width_chars">-1</property>
++		      <property name="single_line_mode">False</property>
++		      <property name="angle">0</property>
++		    </widget>
++		    <packing>
++		      <property name="left_attach">3</property>
++		      <property name="right_attach">4</property>
++		      <property name="top_attach">3</property>
++		      <property name="bottom_attach">4</property>
++		      <property name="x_options">fill</property>
++		      <property name="y_options"></property>
++		    </packing>
++		  </child>
++
++		  <child>
++		    <widget class="GtkLabel" id="label240">
++		      <property name="visible">True</property>
++		      <property name="label" translatable="yes">&lt;i&gt;(optional)&lt;/i&gt;</property>
++		      <property name="use_underline">False</property>
++		      <property name="use_markup">True</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>
++		      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
++		      <property name="width_chars">-1</property>
++		      <property name="single_line_mode">False</property>
++		      <property name="angle">0</property>
++		    </widget>
++		    <packing>
++		      <property name="left_attach">3</property>
++		      <property name="right_attach">4</property>
++		      <property name="top_attach">2</property>
++		      <property name="bottom_attach">3</property>
++		      <property name="x_options">fill</property>
++		      <property name="y_options"></property>
++		    </packing>
++		  </child>
++
++		  <child>
++		    <widget class="GtkComboBox" id="edit-location-latitude-combo">
++		      <property name="visible">True</property>
++		      <property name="items" translatable="yes">North
++South</property>
++		      <property name="add_tearoffs">False</property>
++		      <property name="focus_on_click">True</property>
++		    </widget>
++		    <packing>
++		      <property name="left_attach">2</property>
++		      <property name="right_attach">3</property>
++		      <property name="top_attach">2</property>
++		      <property name="bottom_attach">3</property>
++		      <property name="x_options">fill</property>
++		      <property name="y_options">fill</property>
++		    </packing>
++		  </child>
++
++		  <child>
++		    <widget class="GtkEntry" id="edit-location-latitude-entry">
++		      <property name="visible">True</property>
++		      <property name="can_focus">True</property>
++		      <property name="editable">True</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>
++		    <packing>
++		      <property name="left_attach">1</property>
++		      <property name="right_attach">2</property>
++		      <property name="top_attach">2</property>
++		      <property name="bottom_attach">3</property>
++		      <property name="y_options"></property>
++		    </packing>
++		  </child>
++
++		  <child>
++		    <widget class="GtkLabel" id="label241">
++		      <property name="visible">True</property>
++		      <property name="label" translatable="yes">Location Name:</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>
++		      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
++		      <property name="width_chars">-1</property>
++		      <property name="single_line_mode">False</property>
++		      <property name="angle">0</property>
++		    </widget>
++		    <packing>
++		      <property name="left_attach">0</property>
++		      <property name="right_attach">1</property>
++		      <property name="top_attach">0</property>
++		      <property name="bottom_attach">1</property>
++		      <property name="x_options">fill</property>
++		      <property name="y_options"></property>
++		    </packing>
++		  </child>
++
++		  <child>
++		    <widget class="GtkLabel" id="label242">
++		      <property name="visible">True</property>
++		      <property name="label" translatable="yes">Timezone:</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>
++		      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
++		      <property name="width_chars">-1</property>
++		      <property name="single_line_mode">False</property>
++		      <property name="angle">0</property>
++		    </widget>
++		    <packing>
++		      <property name="left_attach">0</property>
++		      <property name="right_attach">1</property>
++		      <property name="top_attach">1</property>
++		      <property name="bottom_attach">2</property>
++		      <property name="x_options">fill</property>
++		      <property name="y_options"></property>
++		    </packing>
++		  </child>
++
++		  <child>
++		    <widget class="GtkHBox" id="hbox62">
++		      <property name="visible">True</property>
++		      <property name="homogeneous">False</property>
++		      <property name="spacing">6</property>
++
++		      <child>
++			<widget class="GtkEntry" id="edit-location-name-entry">
++			  <property name="visible">True</property>
++			  <property name="can_focus">True</property>
++			  <property name="editable">True</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>
++			<packing>
++			  <property name="padding">0</property>
++			  <property name="expand">True</property>
++			  <property name="fill">True</property>
++			</packing>
++		      </child>
++
++		      <child>
++			<widget class="GtkButton" id="find-location-button">
++			  <property name="visible">True</property>
++			  <property name="can_focus">True</property>
++			  <property name="label" translatable="yes">Find...</property>
++			  <property name="use_underline">True</property>
++			  <property name="relief">GTK_RELIEF_NORMAL</property>
++			  <property name="focus_on_click">True</property>
++			</widget>
++			<packing>
++			  <property name="padding">0</property>
++			  <property name="expand">False</property>
++			  <property name="fill">False</property>
++			</packing>
++		      </child>
++		    </widget>
++		    <packing>
++		      <property name="left_attach">1</property>
++		      <property name="right_attach">4</property>
++		      <property name="top_attach">0</property>
++		      <property name="bottom_attach">1</property>
++		      <property name="x_options">fill</property>
++		      <property name="y_options">fill</property>
++		    </packing>
++		  </child>
++
++		  <child>
++		    <widget class="GtkComboBoxEntry" id="edit-location-timezone-combo">
++		      <property name="visible">True</property>
++		      <property name="items">Dummy Item</property>
++		      <property name="add_tearoffs">False</property>
++		      <property name="has_frame">True</property>
++		      <property name="focus_on_click">True</property>
++		    </widget>
++		    <packing>
++		      <property name="left_attach">1</property>
++		      <property name="right_attach">4</property>
++		      <property name="top_attach">1</property>
++		      <property name="bottom_attach">2</property>
++		      <property name="x_options">fill</property>
++		      <property name="y_options">fill</property>
++		    </packing>
++		  </child>
++		</widget>
++		<packing>
++		  <property name="padding">0</property>
++		  <property name="expand">True</property>
++		  <property name="fill">True</property>
++		</packing>
++	      </child>
++	    </widget>
++	    <packing>
++	      <property name="left_attach">0</property>
++	      <property name="right_attach">3</property>
++	      <property name="top_attach">0</property>
++	      <property name="bottom_attach">1</property>
++	      <property name="y_options"></property>
++	    </packing>
++	  </child>
++	</widget>
++	<packing>
++	  <property name="padding">0</property>
++	  <property name="expand">True</property>
++	  <property name="fill">True</property>
++	</packing>
++      </child>
++    </widget>
++  </child>
++</widget>
++
++<widget class="GtkDialog" id="find-location-window">
++  <property name="border_width">5</property>
++  <property name="title" translatable="yes"></property>
++  <property name="type">GTK_WINDOW_TOPLEVEL</property>
++  <property name="window_position">GTK_WIN_POS_NONE</property>
++  <property name="modal">False</property>
++  <property name="resizable">True</property>
++  <property name="destroy_with_parent">False</property>
++  <property name="decorated">True</property>
++  <property name="skip_taskbar_hint">False</property>
++  <property name="skip_pager_hint">False</property>
++  <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
++  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
++  <property name="focus_on_map">True</property>
++  <property name="urgency_hint">False</property>
++  <property name="has_separator">False</property>
++
++  <child internal-child="vbox">
++    <widget class="GtkVBox" id="dialog-vbox4">
++      <property name="visible">True</property>
++      <property name="homogeneous">False</property>
++      <property name="spacing">0</property>
++
++      <child internal-child="action_area">
++	<widget class="GtkHButtonBox" id="dialog-action_area4">
++	  <property name="visible">True</property>
++	  <property name="layout_style">GTK_BUTTONBOX_END</property>
++
++	  <child>
++	    <widget class="GtkButton" id="find-location-cancel-button">
++	      <property name="visible">True</property>
++	      <property name="can_default">True</property>
++	      <property name="can_focus">True</property>
++	      <property name="label">gtk-cancel</property>
++	      <property name="use_stock">True</property>
++	      <property name="relief">GTK_RELIEF_NORMAL</property>
++	      <property name="focus_on_click">True</property>
++	      <property name="response_id">-6</property>
++	    </widget>
++	  </child>
++
++	  <child>
++	    <widget class="GtkButton" id="find-location-ok-button">
++	      <property name="visible">True</property>
++	      <property name="can_default">True</property>
++	      <property name="can_focus">True</property>
++	      <property name="label">gtk-ok</property>
++	      <property name="use_stock">True</property>
++	      <property name="relief">GTK_RELIEF_NORMAL</property>
++	      <property name="focus_on_click">True</property>
++	      <property name="response_id">-5</property>
++	    </widget>
++	  </child>
++	</widget>
++	<packing>
++	  <property name="padding">0</property>
++	  <property name="expand">False</property>
++	  <property name="fill">True</property>
++	  <property name="pack_type">GTK_PACK_END</property>
++	</packing>
++      </child>
++
++      <child>
++	<widget class="GtkVBox" id="vbox36">
++	  <property name="border_width">5</property>
++	  <property name="visible">True</property>
++	  <property name="homogeneous">False</property>
++	  <property name="spacing">6</property>
++
++	  <child>
++	    <widget class="GtkScrolledWindow" id="scrolledwindow13">
++	      <property name="visible">True</property>
++	      <property name="can_focus">True</property>
++	      <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
++	      <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
++	      <property name="shadow_type">GTK_SHADOW_IN</property>
++	      <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
++
++	      <child>
++		<widget class="GtkTreeView" id="find-location-tree">
++		  <property name="visible">True</property>
++		  <property name="can_focus">True</property>
++		  <property name="headers_visible">False</property>
++		  <property name="rules_hint">False</property>
++		  <property name="reorderable">False</property>
++		  <property name="enable_search">False</property>
++		  <property name="fixed_height_mode">False</property>
++		  <property name="hover_selection">False</property>
++		  <property name="hover_expand">False</property>
++		</widget>
++	      </child>
++	    </widget>
++	    <packing>
++	      <property name="padding">0</property>
++	      <property name="expand">True</property>
++	      <property name="fill">True</property>
++	    </packing>
++	  </child>
++
++	  <child>
++	    <widget class="GtkHBox" id="hbox63">
++	      <property name="visible">True</property>
++	      <property name="homogeneous">False</property>
++	      <property name="spacing">6</property>
++
++	      <child>
++		<widget class="GtkLabel" id="label243">
++		  <property name="visible">True</property>
++		  <property name="label" translatable="yes">_Find:</property>
++		  <property name="use_underline">True</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.5</property>
++		  <property name="yalign">0.5</property>
++		  <property name="xpad">0</property>
++		  <property name="ypad">0</property>
++		  <property name="mnemonic_widget">find-location-entry</property>
++		  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
++		  <property name="width_chars">-1</property>
++		  <property name="single_line_mode">False</property>
++		  <property name="angle">0</property>
++		</widget>
++		<packing>
++		  <property name="padding">0</property>
++		  <property name="expand">False</property>
++		  <property name="fill">False</property>
++		</packing>
++	      </child>
++
++	      <child>
++		<widget class="GtkEntry" id="find-location-entry">
++		  <property name="visible">True</property>
++		  <property name="can_focus">True</property>
++		  <property name="editable">True</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>
++		<packing>
++		  <property name="padding">0</property>
++		  <property name="expand">True</property>
++		  <property name="fill">True</property>
++		</packing>
++	      </child>
++
++	      <child>
++		<widget class="GtkButton" id="find-next-location-button">
++		  <property name="visible">True</property>
++		  <property name="can_focus">True</property>
++		  <property name="relief">GTK_RELIEF_NORMAL</property>
++		  <property name="focus_on_click">True</property>
++
++		  <child>
++		    <widget class="GtkAlignment" id="alignment35">
++		      <property name="visible">True</property>
++		      <property name="xalign">0.5</property>
++		      <property name="yalign">0.5</property>
++		      <property name="xscale">0</property>
++		      <property name="yscale">0</property>
++		      <property name="top_padding">0</property>
++		      <property name="bottom_padding">0</property>
++		      <property name="left_padding">0</property>
++		      <property name="right_padding">0</property>
++
++		      <child>
++			<widget class="GtkHBox" id="hbox64">
++			  <property name="visible">True</property>
++			  <property name="homogeneous">False</property>
++			  <property name="spacing">2</property>
++
++			  <child>
++			    <widget class="GtkImage" id="image31">
++			      <property name="visible">True</property>
++			      <property name="stock">gtk-find</property>
++			      <property name="icon_size">4</property>
++			      <property name="xalign">0.5</property>
++			      <property name="yalign">0.5</property>
++			      <property name="xpad">0</property>
++			      <property name="ypad">0</property>
++			    </widget>
++			    <packing>
++			      <property name="padding">0</property>
++			      <property name="expand">False</property>
++			      <property name="fill">False</property>
++			    </packing>
++			  </child>
++
++			  <child>
++			    <widget class="GtkLabel" id="label244">
++			      <property name="visible">True</property>
++			      <property name="label" translatable="yes">Find _Next</property>
++			      <property name="use_underline">True</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.5</property>
++			      <property name="yalign">0.5</property>
++			      <property name="xpad">0</property>
++			      <property name="ypad">0</property>
++			      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
++			      <property name="width_chars">-1</property>
++			      <property name="single_line_mode">False</property>
++			      <property name="angle">0</property>
++			    </widget>
++			    <packing>
++			      <property name="padding">0</property>
++			      <property name="expand">False</property>
++			      <property name="fill">False</property>
++			    </packing>
++			  </child>
++			</widget>
++		      </child>
++		    </widget>
++		  </child>
++		</widget>
++		<packing>
++		  <property name="padding">0</property>
++		  <property name="expand">False</property>
++		  <property name="fill">False</property>
++		</packing>
++	      </child>
++	    </widget>
++	    <packing>
++	      <property name="padding">0</property>
++	      <property name="expand">False</property>
++	      <property name="fill">False</property>
++	    </packing>
++	  </child>
++	</widget>
++	<packing>
++	  <property name="padding">0</property>
++	  <property name="expand">True</property>
++	  <property name="fill">True</property>
++	</packing>
++      </child>
++    </widget>
++  </child>
++</widget>
++
  </glade-interface>