2.23.1

14 files changed, 10 insertions, 2764 deletions

diff --git a/.cvsignore b/.cvsignore
index a724782..f1ca2f2 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-gnome-panel-2.22.1.2.tar.bz2
+gnome-panel-2.23.1.tar.bz2
diff --git a/can-do-crash.patch b/can-do-crash.patch
deleted file mode 100644
index aefc86b..0000000
--- a/can-do-crash.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -up gnome-panel-2.22.0/applets/clock/set-timezone.c.can-do-crash gnome-panel-2.22.0/applets/clock/set-timezone.c
---- gnome-panel-2.22.0/applets/clock/set-timezone.c.can-do-crash	2008-04-02 17:13:46.000000000 -0400
-+++ gnome-panel-2.22.0/applets/clock/set-timezone.c	2008-04-02 17:13:56.000000000 -0400
-@@ -139,6 +139,9 @@ can_do (const gchar *pk_action_id)
-         DBusError dbus_error;
- 	gint res = 0;
- 
-+        pk_caller = NULL;
-+        pk_action = NULL;
-+
- 	system_bus = dbus_g_connection_get_connection (get_system_bus ());
- 	if (system_bus == NULL)
- 		goto out;
-@@ -147,9 +150,6 @@ can_do (const gchar *pk_action_id)
- 	if (pk_context == NULL)
- 		goto out;
- 	
--        pk_caller = NULL;
--        pk_action = NULL;
--
-         pk_action = polkit_action_new ();
-         polkit_action_set_action_id (pk_action, pk_action_id);
- 
diff --git a/clock-help.patch b/clock-help.patch
deleted file mode 100644
index 6d81ebb..0000000
--- a/clock-help.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-diff -up gnome-panel-2.22.1.2/applets/clock/clock.c.clock-help gnome-panel-2.22.1.2/applets/clock/clock.c
---- gnome-panel-2.22.1.2/applets/clock/clock.c.clock-help	2008-04-16 21:23:29.000000000 -0400
-+++ gnome-panel-2.22.1.2/applets/clock/clock.c	2008-04-16 21:23:33.000000000 -0400
-@@ -2954,21 +2954,6 @@ set_custom_format_cb (GtkEntry  *entry,
- }
- 
- static void
--properties_response_cb (GtkWidget *widget,
--			int        id,
--			ClockData *cd)
--{
--        /* FMQ: was used from old preferences dialog; fix this up */
--
--	if (id == GTK_RESPONSE_HELP)
--		clock_utils_display_help (cd->applet,
--					  "clock", "clock", "clock-settings");
--
--	else
--		gtk_widget_destroy (widget);
--}
--
--static void
- prefs_locations_changed (GtkTreeSelection *selection, ClockData *cd)
- {
- 	gint n;
-@@ -3693,6 +3678,13 @@ prefs_hide_event (GtkWidget *widget, Gdk
-         return TRUE;
- }
- 
-+static void
-+prefs_help (GtkWidget *widget, ClockData *cd)
-+{
-+	clock_utils_display_help (cd->applet,
-+				  "clock", "clock", "clock-settings");
-+}
-+
- typedef struct {
-   const gchar *name;
-   const gchar *country_code;
-@@ -4147,6 +4139,7 @@ ensure_prefs_window_is_created (ClockDat
- {
-         GtkWidget *edit_window;
- 	GtkWidget *prefs_close_button;
-+	GtkWidget *prefs_help_button;
-         GtkWidget *edit_cancel_button;
-         GtkWidget *edit_ok_button;
-         GtkWidget *zone_combo;
-@@ -4163,6 +4156,7 @@ ensure_prefs_window_is_created (ClockDat
- 	gtk_window_set_icon_name (GTK_WINDOW (cd->prefs_window), CLOCK_ICON);
- 
-         prefs_close_button = glade_xml_get_widget (cd->glade_xml, "prefs-close-button");
-+        prefs_help_button = glade_xml_get_widget (cd->glade_xml, "prefs-help-button");
-         cd->prefs_locations = GTK_TREE_VIEW (glade_xml_get_widget (cd->glade_xml, "cities_list"));
- 
-         selection = gtk_tree_view_get_selection (cd->prefs_locations);
-@@ -4175,6 +4169,9 @@ ensure_prefs_window_is_created (ClockDat
-         g_signal_connect (G_OBJECT (prefs_close_button), "clicked",
-                           G_CALLBACK (prefs_hide), cd);
- 
-+        g_signal_connect (G_OBJECT (prefs_help_button), "clicked",
-+                          G_CALLBACK (prefs_help), cd);
-+
-         cd->prefs_location_remove_button = glade_xml_get_widget (cd->glade_xml, "prefs-locations-remove-button");
- 
-         g_signal_connect (G_OBJECT (cd->prefs_location_remove_button), "clicked",
diff --git a/clock1.patch b/clock1.patch
deleted file mode 100644
index df895f0..0000000
--- a/clock1.patch
+++ /dev/null
@@ -1,108 +0,0 @@
---- trunk/applets/clock/clock.c	2008/04/10 13:05:02	11046
-+++ trunk/applets/clock/clock.c	2008/04/10 16:25:30	11047
-@@ -2208,7 +2208,11 @@
-                 return;
-         }
- 
--        loc = clock_location_new (name, timezone, latitude, longitude, code, &prefs);
-+	loc = clock_location_find_and_ref (cd->locations, name, timezone,
-+					   latitude, longitude, code);
-+	if (!loc)
-+		loc = clock_location_new (name, timezone,
-+					  latitude, longitude, code, &prefs);
- 
- 	if (current && clock_location_is_current_timezone (loc))
- 		clock_location_make_current (loc, NULL, NULL, NULL);
-@@ -3087,9 +3091,10 @@
- 		clock_location_is_current (loc);
- 
-                 cd->locations = g_list_append (cd->locations, loc);
--                locations_changed (cd);
-         }
- 
-+	/* This will update everything related to locations to take into
-+	 * account the new location (via the gconf notification) */
-         save_cities_store (cd);
- 
-         edit_hide (edit_window, cd);
-@@ -3828,12 +3833,11 @@
-         ClockLocation *loc = NULL;
- 
-         gtk_tree_model_get (model, iter, COL_CITY_LOC, &loc, -1);
--
--        gtk_list_store_remove (cd->cities_store, iter);
- 	cd->locations = g_list_remove (cd->locations, loc);
--	locations_changed (cd);
- 	g_object_unref (loc);
- 
-+	/* This will update everything related to locations to take into
-+	 * account the removed location (via the gconf notification) */
-         save_cities_store (cd);
- }
- 
---- trunk/applets/clock/clock-location.h	2008/04/10 13:05:02	11046
-+++ trunk/applets/clock/clock-location.h	2008/04/10 16:25:30	11047
-@@ -38,6 +38,13 @@
- 				   const gchar *code,
- 				   WeatherPrefs *prefs);
- 
-+ClockLocation *clock_location_find_and_ref (GList       *locations,
-+                                            const gchar *name,
-+                                            const gchar *timezone,
-+                                            gfloat       latitude,
-+                                            gfloat       longitude,
-+                                            const gchar *code);
-+
- gchar *clock_location_get_tzname (ClockLocation *loc);
- 
- const gchar *clock_location_get_name (ClockLocation *loc);
---- trunk/applets/clock/clock-location.c	2008/04/10 13:05:02	11046
-+++ trunk/applets/clock/clock-location.c	2008/04/10 16:25:30	11047
-@@ -67,6 +67,34 @@
- #define PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), CLOCK_LOCATION_TYPE, ClockLocationPrivate))
- 
- ClockLocation *
-+clock_location_find_and_ref (GList       *locations,
-+                             const gchar *name,
-+                             const gchar *timezone,
-+                             gfloat       latitude,
-+                             gfloat       longitude,
-+                             const gchar *code)
-+{
-+        GList *l;
-+        ClockLocationPrivate *priv;
-+
-+        for (l = locations; l != NULL; l = l->next) {
-+                priv = PRIVATE (l->data);
-+
-+                if (priv->latitude == latitude &&
-+                    priv->longitude == longitude &&
-+                    g_strcmp0 (priv->weather_code, code) == 0 &&
-+                    g_strcmp0 (priv->timezone, timezone) == 0 &&
-+                    g_strcmp0 (priv->name, name) == 0)
-+                        break;
-+        }
-+
-+        if (l != NULL)
-+                return g_object_ref (CLOCK_LOCATION (l->data));
-+        else
-+                return NULL;
-+}
-+
-+ClockLocation *
- clock_location_new (const gchar *name, const gchar *timezone,
- 		    gfloat latitude, gfloat longitude,
- 		    const gchar *code, WeatherPrefs *prefs)
-@@ -467,6 +495,12 @@
-         gchar *filename;
- 	MakeCurrentData *mcdata;
- 
-+        if (loc == current_location) {
-+                if (destroy)
-+                        destroy (data);
-+                return;
-+        }
-+
- 	if (clock_location_is_current_timezone (loc)) {
- 		if (current_location)
- 			g_object_remove_weak_pointer (G_OBJECT (current_location), 
diff --git a/clock2.patch b/clock2.patch
deleted file mode 100644
index 20bc39f..0000000
--- a/clock2.patch
+++ /dev/null
@@ -1,125 +0,0 @@
---- trunk/applets/clock/clock.c	2008/04/10 16:25:30	11047
-+++ trunk/applets/clock/clock.c	2008/04/10 20:01:41	11048
-@@ -3410,8 +3410,12 @@
-                           G_CALLBACK (location_row_activated), cd);
- 
- 	model = gweather_xml_load_locations ();
--	gtk_tree_view_set_model (tree, model);
--        g_object_unref (model);
-+
-+	/* Can be NULL if libgweather is not correctly installed */
-+	if (model) {
-+		gtk_tree_view_set_model (tree, model);
-+		g_object_unref (model);
-+	}
- }
- 
- static void
-@@ -3421,23 +3425,41 @@
- 	GtkWidget *name_entry = glade_xml_get_widget (cd->glade_xml, "edit-location-name-entry");
-         GtkWidget *window;
- 	const char *find;
-+	const char *location;
- 
- 	fill_location_tree (cd);
-         window = glade_xml_get_widget (cd->glade_xml, "find-location-window");
- 
- 	/* prefill the find entry if it's empty */
- 	find = gtk_entry_get_text (GTK_ENTRY (cd->find_location_entry));
--	if (!find || !find[0]) {
--		const char *location;
-+	location = gtk_entry_get_text (GTK_ENTRY (name_entry));
- 
--		location = gtk_entry_get_text (GTK_ENTRY (name_entry));
--		gtk_entry_set_text (GTK_ENTRY (cd->find_location_entry),
--				    location);
-+	if (g_strcmp0 (find, location) != 0 || !find || !find[0]) {
-+		GtkWidget *scroll = glade_xml_get_widget (cd->glade_xml, "find-location-scroll");
-+		GtkAdjustment *adjustment;
-+
-+		/* If we autofill the entry, reset the state of the treeview
-+		 * first so that it looks like a brand new search */
-+		gtk_tree_view_collapse_all (GTK_TREE_VIEW (cd->location_tree));
-+
-+		adjustment = gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (scroll));
-+		gtk_adjustment_set_value (adjustment, 0);
-+		gtk_scrolled_window_set_vadjustment (GTK_SCROLLED_WINDOW (scroll),
-+						     adjustment);
-+
-+		if (g_strcmp0 (find, location) != 0)
-+			gtk_entry_set_text (GTK_ENTRY (cd->find_location_entry),
-+					    location);
- 	}
-+
- 	gtk_widget_grab_focus (cd->find_location_entry);
-+	gtk_editable_set_position (GTK_EDITABLE (cd->find_location_entry),
-+				   -1);
- 
--        gtk_window_set_transient_for (GTK_WINDOW (window), GTK_WINDOW (edit_window));
--        gtk_window_present_with_time (GTK_WINDOW (window), gtk_get_current_event_time ());
-+        gtk_window_set_transient_for (GTK_WINDOW (window),
-+				      GTK_WINDOW (edit_window));
-+        gtk_window_present_with_time (GTK_WINDOW (window),
-+				      gtk_get_current_event_time ());
- }
- 
- static gboolean
-@@ -3512,6 +3534,10 @@
- 
- 	tree = GTK_TREE_VIEW (cd->location_tree);
- 	model = gtk_tree_view_get_model (tree);
-+	/* Can happen if libgweather is not correctly installed */
-+	if (!model)
-+		return;
-+
- 	entry = GTK_ENTRY (cd->find_location_entry);
- 	selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (tree));
- 
-@@ -3556,6 +3582,9 @@
- 
- 	tree = GTK_TREE_VIEW (cd->location_tree);
- 	model = gtk_tree_view_get_model (tree);
-+	/* Can happen if libgweather is not correctly installed */
-+	if (!model)
-+		return;
- 
- 	selection = gtk_tree_view_get_selection (tree);
- 	gtk_tree_model_get_iter_first (model, &iter);
-@@ -3601,8 +3630,6 @@
-         GtkWidget *lon_entry = glade_xml_get_widget (cd->glade_xml, "edit-location-longitude-entry");
-         GtkWidget *lat_combo = glade_xml_get_widget (cd->glade_xml, "edit-location-latitude-combo");
-         GtkWidget *lon_combo = glade_xml_get_widget (cd->glade_xml, "edit-location-longitude-combo");
--        GtkWidget *scroll = glade_xml_get_widget (cd->glade_xml, "find-location-scroll");
--	GtkAdjustment *adjustment;
- 
-         /* clear out the old data */
-         gtk_combo_box_set_active (GTK_COMBO_BOX (zone_combo), -1);
-@@ -3614,16 +3641,6 @@
- 
-         gtk_combo_box_set_active (GTK_COMBO_BOX (lat_combo), -1);
-         gtk_combo_box_set_active (GTK_COMBO_BOX (lon_combo), -1);
--
--	/* reset the state of the find window */
--	gtk_entry_set_text (GTK_ENTRY (cd->find_location_entry), "");
--
--	gtk_tree_view_collapse_all (GTK_TREE_VIEW (cd->location_tree));
--
--	adjustment = gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (scroll));
--	gtk_adjustment_set_value (adjustment, 0);
--	gtk_scrolled_window_set_vadjustment (GTK_SCROLLED_WINDOW (scroll),
--					     adjustment);
- }
- 
- static void
-@@ -3730,7 +3747,10 @@
-   data.distance = 1e6;
-   data.location = NULL;
- 
--  gtk_tree_model_foreach (GTK_TREE_MODEL (model), compare_location, &data);
-+  /* Can be NULL if libgweather is not correctly installed */
-+  if (model)
-+	  gtk_tree_model_foreach (GTK_TREE_MODEL (model),
-+			  	  compare_location, &data);
- 
-   if (data.location)
-     code = g_strdup (data.location->code);
diff --git a/current.patch b/current.patch
deleted file mode 100644
index 290e5ca..0000000
--- a/current.patch
+++ /dev/null
@@ -1,351 +0,0 @@
-diff -up gnome-panel-2.21.92/applets/clock/clock-location.h.current gnome-panel-2.21.92/applets/clock/clock-location.h
---- gnome-panel-2.21.92/applets/clock/clock-location.h.current	2008-02-26 08:17:49.000000000 -0500
-+++ gnome-panel-2.21.92/applets/clock/clock-location.h	2008-03-03 17:53:43.000000000 -0500
-@@ -27,6 +27,8 @@ typedef struct
-         GObjectClass g_object_class;
- 
- 	void (* weather_updated) (ClockLocation *location, WeatherInfo *info);
-+
-+	void (* set_current) (ClockLocation *location);
- } ClockLocationClass;
- 
- GType clock_location_get_type (void);
-@@ -40,7 +42,7 @@ ClockLocation *clock_location_new_from_e
- 
- gchar *clock_location_get_tzname (ClockLocation *loc);
- 
--gchar *clock_location_get_name (ClockLocation *loc);
-+const gchar *clock_location_get_name (ClockLocation *loc);
- void clock_location_set_name (ClockLocation *loc, const gchar *name);
- 
- gchar *clock_location_get_timezone (ClockLocation *loc);
-@@ -56,6 +58,7 @@ void clock_location_make_current (ClockL
- 				  GFunc          callback,
- 				  gpointer       data,
- 				  GDestroyNotify destroy);
-+gboolean clock_location_is_current_timezone (ClockLocation *loc);
- 
- const gchar *clock_location_get_weather_code (ClockLocation *loc);
- void         clock_location_set_weather_code (ClockLocation *loc, const gchar *code);
-diff -up gnome-panel-2.21.92/applets/clock/clock-location-tile.c.current gnome-panel-2.21.92/applets/clock/clock-location-tile.c
---- gnome-panel-2.21.92/applets/clock/clock-location-tile.c.current	2008-03-03 13:52:38.000000000 -0500
-+++ gnome-panel-2.21.92/applets/clock/clock-location-tile.c	2008-03-03 18:59:59.000000000 -0500
-@@ -19,7 +19,6 @@ G_DEFINE_TYPE (ClockLocationTile, clock_
- 
- enum {
- 	TILE_PRESSED,
--	TIMEZONE_SET,
- 	NEED_CLOCK_FORMAT,
- 	LAST_SIGNAL
- };
-@@ -106,14 +105,6 @@ clock_location_tile_class_init (ClockLoc
- 					      NULL,
- 					      g_cclosure_marshal_VOID__VOID,
- 					      G_TYPE_NONE, 0);
--	signals[TIMEZONE_SET] = g_signal_new ("timezone-set",
--					      G_TYPE_FROM_CLASS (g_obj_class),
--					      G_SIGNAL_RUN_FIRST,
--					      G_STRUCT_OFFSET (ClockLocationTileClass, timezone_set),
--					      NULL,
--					      NULL,
--					      g_cclosure_marshal_VOID__VOID,
--					      G_TYPE_NONE, 0);
- 	signals[NEED_CLOCK_FORMAT] = g_signal_new ("need-clock-format",
- 						   G_TYPE_FROM_CLASS (g_obj_class),
- 						   G_SIGNAL_RUN_LAST,
-@@ -180,13 +171,9 @@ press_on_tile      (GtkWidget           
- static void
- make_current_cb (gpointer data, GError *error)
- {
--	ClockLocationTile *tile = data;
- 	GtkWidget *dialog;
- 
--        if (error == NULL) {
--		g_signal_emit (tile, signals[TIMEZONE_SET], 0);
--        }
--        else {
-+        if (error) {
-                 dialog = gtk_message_dialog_new (NULL,
-                                                  0,
-                                                  GTK_MESSAGE_ERROR,
-@@ -232,7 +219,10 @@ enter_or_leave_tile (GtkWidget          
- 	if (event->type == GDK_ENTER_NOTIFY) {
- 		gint can_set;
- 
--		can_set = can_set_system_timezone ();
-+		if (clock_location_is_current_timezone (priv->location))
-+			can_set = 2;
-+		else
-+			can_set = can_set_system_timezone ();
- 		if (can_set != 0) {
- 			gtk_label_set_markup (GTK_LABEL (priv->current_label),
- 						can_set == 1 ?
-@@ -317,6 +307,7 @@ clock_location_tile_fill (ClockLocationT
-         gtk_widget_show (priv->current_label);
-         gtk_widget_set_no_show_all (priv->current_button, TRUE);
-         gtk_container_add (GTK_CONTAINER (priv->current_button), priv->current_label);
-+	/* FIXME: this needs to talk about locations, not timezones */
-         gtk_widget_set_tooltip_text (priv->current_button, _("Set as current timezone for this computer"));
- 
- 	priv->current_marker = gtk_image_new_from_icon_name ("go-home", GTK_ICON_SIZE_BUTTON);
-diff -up gnome-panel-2.21.92/applets/clock/clock.c.current gnome-panel-2.21.92/applets/clock/clock.c
---- gnome-panel-2.21.92/applets/clock/clock.c.current	2008-03-03 15:51:48.000000000 -0500
-+++ gnome-panel-2.21.92/applets/clock/clock.c	2008-03-03 19:01:31.000000000 -0500
-@@ -237,6 +237,7 @@ static void applet_change_orient (PanelA
- 				  ClockData         *cd);
- 
- static void edit_hide (GtkWidget *unused, ClockData *cd);
-+static void save_cities_store (ClockData *cd);
- 
- static void
- unfix_size (ClockData *cd)
-@@ -962,8 +963,8 @@ sort_locations_by_name (gconstpointer a,
-         ClockLocation *loc_a = (ClockLocation *) a;
-         ClockLocation *loc_b = (ClockLocation *) b;
- 
--        char *name_a = clock_location_get_name (loc_a);
--        char *name_b = clock_location_get_name (loc_b);
-+        const char *name_a = clock_location_get_name (loc_a);
-+        const char *name_b = clock_location_get_name (loc_b);
- 
-         return strcmp (name_a, name_b);
- }
-@@ -1069,15 +1070,6 @@ location_tile_pressed_cb (ClockLocationT
- }
- 
- static void
--location_tile_timezone_set_cb (ClockLocationTile *tile, gpointer data)
--{
--        ClockData *cd = data;
--
--        clock_map_refresh (CLOCK_MAP (cd->map_widget));
--	update_location_tiles (cd);
--}
--
--static void
- location_tile_weather_updated_cb (ClockLocationTile *tile, GdkPixbuf *weather_icon, const char *temperature, gpointer data)
- {
-         ClockData *cd = data;
-@@ -1131,8 +1123,6 @@ create_cities_section (ClockData *cd)
-                 city = clock_location_tile_new (loc, CLOCK_FACE_SMALL);
-                 g_signal_connect (city, "tile-pressed",
-                                   G_CALLBACK (location_tile_pressed_cb), cd);
--                g_signal_connect (city, "timezone-set",
--                                  G_CALLBACK (location_tile_timezone_set_cb), cd);
-                 g_signal_connect (city, "need-clock-format",
-                                   G_CALLBACK (location_tile_need_clock_format_cb), cd);
- 
-@@ -2064,6 +2054,21 @@ location_weather_updated_cb (ClockLocati
- }
- 
- static void
-+location_set_current_cb (ClockLocation *loc, 
-+			 gpointer       data)
-+{
-+	ClockData *cd = data;
-+	WeatherInfo *info;
-+
-+	info = clock_location_get_weather_info (loc);
-+	location_weather_updated_cb (loc, info, cd);
-+
-+        clock_map_refresh (CLOCK_MAP (cd->map_widget));
-+        update_location_tiles (cd);
-+	save_cities_store (cd);	
-+}
-+
-+static void
- locations_changed (ClockData *cd)
- {
- 	GList *l;
-@@ -2078,6 +2083,8 @@ locations_changed (ClockData *cd)
- 			id = g_signal_connect (loc, "weather-updated",
- 						G_CALLBACK (location_weather_updated_cb), cd);
- 			g_object_set_data (G_OBJECT (loc), "weather-updated", GINT_TO_POINTER (id));
-+			g_signal_connect (loc, "set-current", 
-+					  G_CALLBACK (location_set_current_cb), cd);
- 		}
- 	}
- 
-@@ -2122,6 +2129,7 @@ location_start_element (GMarkupParseCont
-         gfloat latitude = 0.0;
-         gfloat longitude = 0.0;
- 	gchar *code = NULL;
-+	gboolean current = FALSE;
- 
-         int index = 0;
- 
-@@ -2147,6 +2155,11 @@ location_start_element (GMarkupParseCont
-                 } else if (strcmp (att_name, "code") == 0) {
-                         code = (gchar *)attribute_values[index];
-                 }
-+		else if (strcmp (att_name, "current") == 0) {
-+			if (strcmp (attribute_values[index], "true") == 0) {
-+				current = TRUE;
-+			}
-+		}
-         }
- 
-         setlocale (LC_NUMERIC, "");
-@@ -2157,6 +2170,9 @@ location_start_element (GMarkupParseCont
- 
-         loc = clock_location_new (name, timezone, latitude, longitude, code, &prefs);
- 
-+	if (current)
-+		clock_location_make_current (loc, NULL, NULL, NULL);
-+
-         data->cities = g_list_append (data->cities, loc);
- }
- 
-@@ -2912,13 +2928,14 @@ loc_to_string (ClockLocation *loc)
-         clock_location_get_coords (loc, &latitude, &longitude);
- 
-         prev_locale = setlocale (LC_NUMERIC, "POSIX");
--
-+	
-         ret = g_markup_printf_escaped
--                ("<location name=\"%s\" timezone=\"%s\" latitude=\"%f\" longitude=\"%f\" code=\"%s\"/>",
-+                ("<location name=\"%s\" timezone=\"%s\" latitude=\"%f\" longitude=\"%f\" code=\"%s\" current=\"%s\"/>",
-                  clock_location_get_name (loc),
-                  clock_location_get_timezone (loc),
-                  latitude, longitude,
--		 clock_location_get_weather_code (loc));
-+		 clock_location_get_weather_code (loc),
-+		 clock_location_is_current (loc) ? "true" : "false");
- 
-         setlocale (LC_NUMERIC, "");
- 
-diff -up gnome-panel-2.21.92/applets/clock/clock-location-tile.h.current gnome-panel-2.21.92/applets/clock/clock-location-tile.h
---- gnome-panel-2.21.92/applets/clock/clock-location-tile.h.current	2008-03-03 18:58:50.000000000 -0500
-+++ gnome-panel-2.21.92/applets/clock/clock-location-tile.h	2008-03-03 18:58:58.000000000 -0500
-@@ -26,7 +26,6 @@ typedef struct
-         GtkAlignmentClass parent_class;
- 
- 	void (* tile_pressed) (ClockLocationTile *tile);
--	void (* timezone_set) (ClockLocationTile *tile);
-         int  (* need_clock_format) (ClockLocationTile *tile);
- } ClockLocationTileClass;
- 
-diff -up gnome-panel-2.21.92/applets/clock/clock-location.c.current gnome-panel-2.21.92/applets/clock/clock-location.c
---- gnome-panel-2.21.92/applets/clock/clock-location.c.current	2008-02-26 08:17:49.000000000 -0500
-+++ gnome-panel-2.21.92/applets/clock/clock-location.c	2008-03-03 19:01:45.000000000 -0500
-@@ -51,6 +51,7 @@ typedef struct {
- 
- enum {
- 	WEATHER_UPDATED,
-+	SET_CURRENT,
- 	LAST_SIGNAL
- };
- 
-@@ -232,6 +233,7 @@ guess_zone_from_tree (const gchar *local
- }
- 
- static gchar *current_zone = NULL;
-+static ClockLocation *current_location = NULL;
- static GFileMonitor *monitor = NULL;
- 
- static void
-@@ -409,6 +411,15 @@ clock_location_class_init (ClockLocation
- 			      _clock_marshal_VOID__POINTER,
- 			      G_TYPE_NONE, 1, G_TYPE_POINTER);
- 
-+	location_signals[SET_CURRENT] = 
-+		g_signal_new ("set-current",
-+			      G_OBJECT_CLASS_TYPE (g_obj_class),
-+			      G_SIGNAL_RUN_FIRST,
-+			      G_STRUCT_OFFSET (ClockLocationClass, set_current),
-+			      NULL, NULL,
-+			      _clock_marshal_VOID__VOID,
-+			      G_TYPE_NONE, 0);
-+
-         g_type_class_add_private (this_class, sizeof (ClockLocationPrivate));
- }
- 
-@@ -482,7 +493,7 @@ clock_location_finalize (GObject *g_obj)
-         G_OBJECT_CLASS (clock_location_parent_class)->finalize (g_obj);
- }
- 
--gchar *
-+const gchar *
- clock_location_get_name (ClockLocation *loc)
- {
-         ClockLocationPrivate *priv = PRIVATE (loc);
-@@ -629,15 +640,37 @@ clock_location_localtime (ClockLocation 
- }
- 
- gboolean
--clock_location_is_current (ClockLocation *loc)
-+clock_location_is_current_timezone (ClockLocation *loc)
- {
-         ClockLocationPrivate *priv = PRIVATE (loc);
- 	const char *zone;
- 
--	if ((zone = zone_from_etc_sysconfig_clock ()))
-+	if ((zone = zone_from_etc_sysconfig_clock ())) {
- 		return strcmp (zone, priv->timezone) == 0;
-+	}
-+	else {
-+		return clock_location_get_offset (loc) == 0;
-+	}
-+}
- 
--	return clock_location_get_offset (loc) == 0;
-+gboolean
-+clock_location_is_current (ClockLocation *loc)
-+{
-+
-+	if (current_location == loc)
-+		return TRUE;
-+	else if (current_location != NULL)
-+		return FALSE;
-+
-+	if (clock_location_is_current_timezone (loc)) {
-+		current_location = loc;
-+		g_object_add_weak_pointer (G_OBJECT (current_location), 
-+					   (gpointer *)&current_location);
-+
-+		return TRUE;
-+	}
-+
-+	return FALSE;
- }
- 
- 
-@@ -700,6 +733,15 @@ make_current_cb (gpointer data, GError *
-  	 	 */
- 		g_free (current_zone);
- 		current_zone = g_strdup (priv->timezone);
-+
-+		if (current_location)
-+			g_object_remove_weak_pointer (G_OBJECT (current_location), 
-+						      (gpointer *)&current_location);
-+		current_location = mcdata->location;
-+		g_object_add_weak_pointer (G_OBJECT (current_location), 
-+					   (gpointer *)&current_location);
-+		g_signal_emit (current_location, location_signals[SET_CURRENT],
-+			       0, NULL);
- 	}
- 
- 	if (mcdata->callback)
-@@ -730,6 +772,22 @@ clock_location_make_current (ClockLocati
-         gchar *filename;
- 	MakeCurrentData *mcdata;
- 
-+	if (clock_location_is_current_timezone (loc)) {
-+		if (current_location)
-+			g_object_remove_weak_pointer (G_OBJECT (current_location), 
-+						      (gpointer *)&current_location);
-+		current_location = loc;
-+		g_object_add_weak_pointer (G_OBJECT (current_location), 
-+					   (gpointer *)&current_location);
-+		g_signal_emit (current_location, location_signals[SET_CURRENT],
-+		       0, NULL);
-+		if (callback)
-+               		callback (data, NULL);
-+		if (destroy)
-+			destroy (data);	
-+		return;
-+	}
-+
- 	mcdata = g_new (MakeCurrentData, 1);
- 
- 	mcdata->location = g_object_ref (loc);
diff --git a/dbus-timeout.patch b/dbus-timeout.patch
deleted file mode 100644
index 2d29852..0000000
--- a/dbus-timeout.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -up gnome-panel-2.22.0/applets/clock/set-timezone.c.dbus-timeout gnome-panel-2.22.0/applets/clock/set-timezone.c
---- gnome-panel-2.22.0/applets/clock/set-timezone.c.dbus-timeout	2008-04-04 20:44:52.000000000 -0400
-+++ gnome-panel-2.22.0/applets/clock/set-timezone.c	2008-04-04 20:44:58.000000000 -0400
-@@ -291,7 +291,17 @@ set_time_notify (DBusGProxy     *proxy,
- 			data->callback (data->data, NULL);
- 	}
- 	else {
--		if (dbus_g_error_has_name (error, "org.gnome.ClockApplet.Mechanism.NotPrivileged")) {
-+		if (error->domain == DBUS_GERROR &&
-+		    error->code == DBUS_GERROR_NO_REPLY) {
-+			/* these errors happen because dbus doesn't
-+			 * use monotonic clocks
-+			 */	
-+			g_warning ("ignoring no-reply error when setting time");
-+			g_error_free (error);
-+			if (data->callback)
-+				data->callback (data->data, NULL);
-+		}
-+		else if (dbus_g_error_has_name (error, "org.gnome.ClockApplet.Mechanism.NotPrivileged")) {
- 			gchar **tokens;
- 
- 			tokens = g_strsplit (error->message, " ", 2);
diff --git a/expose.patch b/expose.patch
deleted file mode 100644
index dd8aa3d..0000000
--- a/expose.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -up gnome-panel-2.21.92/applets/clock/clock-map.c.expose gnome-panel-2.21.92/applets/clock/clock-map.c
---- gnome-panel-2.21.92/applets/clock/clock-map.c.expose	2008-03-03 20:26:50.000000000 -0500
-+++ gnome-panel-2.21.92/applets/clock/clock-map.c	2008-03-03 20:26:55.000000000 -0500
-@@ -247,8 +247,9 @@ clock_map_expose (GtkWidget *this, GdkEv
-         /* draw a simple outline */
-         cairo_rectangle (
-                 cr,
--                region.x + 0.5, region.y + 0.5,
--                region.width - 1, region.height - 1);
-+                allocation.x + 0.5, allocation.y + 0.5,
-+	        gdk_pixbuf_get_width (priv->rotated_map_pixbuf) - 1,
-+	        gdk_pixbuf_get_height (priv->rotated_map_pixbuf) - 1);
- 
-         cairo_set_source_rgb (
-                 cr,
diff --git a/gnome-panel.spec b/gnome-panel.spec
index 857677f..167d46b 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -16,15 +16,16 @@
 %define dbus_version 0.60
 %define dbus_glib_version 0.60
 %define gnome_doc_utils_version 0.3.2
+%define libgweather_version 2.22.1
 
 %define use_evolution_data_server 1
 
 Summary: GNOME panel
 Name: gnome-panel
-Version: 2.22.1.2
-Release: 6%{?dist}
+Version: 2.23.1
+Release: 1%{?dist}
 URL: http://www.gnome.org
-Source0: http://download.gnome.org/sources/gnome-panel/2.22/%{name}-%{version}.tar.bz2
+Source0: http://download.gnome.org/sources/gnome-panel/2.23/%{name}-%{version}.tar.bz2
 
 Source3: redhat-panel-default-setup.entries
 Source4: gnome-compiler-flags.m4
@@ -82,7 +83,7 @@ BuildRequires: dbus-devel >= %{dbus_version}
 %endif
 BuildRequires: PolicyKit-devel
 BuildRequires: PolicyKit-gnome-devel
-BuildRequires: libgweather-devel
+BuildRequires: libgweather-devel >= %{libgweather_version}
 BuildRequires: librsvg2-devel
 BuildRequires: NetworkManager-devel
 
@@ -116,17 +117,9 @@ Patch24: gnome-panel-2.21.92-allow-spurious-view-done-signals.patch
 # fixed upstream
 Patch28: gnome-panel-larger-find-window.patch
 
-# some upstream fixes 
-Patch30: clock1.patch
-Patch31: clock2.patch
-
-Patch32: clock-help.patch
-
 Patch33: gnome-panel-use-gio.patch
 # http://bugzilla.gnome.org/show_bug.cgi?id=529243
 Patch34: gnome-panel-launch-with-gio.patch
-# fixed in upstream svn
-Patch35: timezone-64.patch
 Patch36: timezone-debug.patch
 
 Conflicts: gnome-power-manager < 2.15.3
@@ -177,12 +170,8 @@ Panel Applets using the libpanel-applet library.
 %patch14 -p1 -b .ck-shutdown
 %patch24 -p1 -b .allow-spurious-view-done-signals
 %patch28 -p1 -b .larger-find-window
-%patch30 -p1 -b .clock1
-%patch31 -p1 -b .clock2
-%patch32 -p1 -b .clock-help
 %patch33 -p1 -b .use-gio
 %patch34 -p1 -b .launch-with-gio
-%patch35 -p1 -b .timezone-64
 %patch36 -p1 -b .timezone-debug
 
 . %{SOURCE6}
@@ -368,6 +357,9 @@ fi
 %{_datadir}/gtk-doc/html/*
 
 %changelog
+* Fri Apr 25 2008 Matthias Clasen  <mclasen@redhat.com> - 2.23.1-1
+- Update to 2.23.1
+
 * Wed Apr 23 2008 Matthias Clasen  <mclasen@redhat.com> - 2.22.1.2-6
 - Remove an erroneous addition in the last patch
 
diff --git a/location-edit.patch b/location-edit.patch
deleted file mode 100644
index 012423f..0000000
--- a/location-edit.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -up gnome-panel-2.22.0/applets/clock/clock.c.location-edit gnome-panel-2.22.0/applets/clock/clock.c
---- gnome-panel-2.22.0/applets/clock/clock.c.location-edit	2008-03-28 11:25:10.000000000 -0400
-+++ gnome-panel-2.22.0/applets/clock/clock.c	2008-03-28 11:25:16.000000000 -0400
-@@ -1003,6 +1003,13 @@ create_cities_store (ClockData *cd)
- 
-                 list = list->next;
- 	}
-+
-+	 
-+	if (cd->prefs_window) { 	 
-+		GtkWidget *widget = glade_xml_get_widget (cd->glade_xml, "cities_list"); 	 
-+		gtk_tree_view_set_model (GTK_TREE_VIEW (widget), 	 
-+		GTK_TREE_MODEL (cd->cities_store)); 	 
-+	}
- }
- 
- static gint
diff --git a/populate.patch b/populate.patch
deleted file mode 100644
index 5e17c5d..0000000
--- a/populate.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -up gnome-panel-2.22.0/applets/clock/clock.c.populate gnome-panel-2.22.0/applets/clock/clock.c
---- gnome-panel-2.22.0/applets/clock/clock.c.populate	2008-03-14 17:15:02.000000000 -0400
-+++ gnome-panel-2.22.0/applets/clock/clock.c	2008-03-14 17:15:06.000000000 -0400
-@@ -1002,12 +1002,6 @@ create_cities_store (ClockData *cd)
- 
-                 list = list->next;
- 	}
--
--	if (cd->prefs_window) {
--                GtkWidget *widget = glade_xml_get_widget (cd->glade_xml, "cities_list");
--                gtk_tree_view_set_model (GTK_TREE_VIEW (widget),
--                                         GTK_TREE_MODEL (cd->cities_store));
--        }
- }
- 
- static gint
-@@ -3832,6 +3826,9 @@ fill_prefs_window (ClockData *cd)
- 	renderer = gtk_cell_renderer_text_new ();
-         col = gtk_tree_view_column_new_with_attributes (_("City Time Zone"), renderer, "text", COL_CITY_TZ, NULL);
-         gtk_tree_view_insert_column (GTK_TREE_VIEW (widget), col, -1);
-+	
-+	if (cd->cities_store == NULL)
-+		create_cities_store (cd);
- 
-         gtk_tree_view_set_model (GTK_TREE_VIEW (widget),
-                                  GTK_TREE_MODEL (cd->cities_store));
diff --git a/set-time-window.patch b/set-time-window.patch
deleted file mode 100644
index 39c3985..0000000
--- a/set-time-window.patch
+++ /dev/null
@@ -1,1864 +0,0 @@
-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-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);
- }
- 
-+static gboolean
-+delete_time_settings (GtkWidget *widget, GdkEvent *event, gpointer data)
-+{
-+	cancel_time_settings (widget, data);
-+
-+	return TRUE;
-+}
-+
- static void
- fill_time_settings_window (ClockData *cd)
- {
-@@ -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");
-+	g_signal_connect (cd->set_time_window, "delete_event",
-+			  G_CALLBACK (delete_time_settings), cd); 
- 
-         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-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>
-+<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">
-+    <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>
--	<widget class="GtkLabel" id="label212">
--	  <property name="visible">True</property>
--	  <property name="label" translatable="yes">&lt;b&gt;Time Settings&lt;/b&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="padding">0</property>
--	  <property name="expand">False</property>
--	  <property name="fill">False</property>
--	</packing>
--      </child>
-+      <property name="spacing">24</property>
- 
-       <child>
--	<widget class="GtkHBox" id="time_settings_box">
-+	<widget class="GtkVBox" id="vbox26">
- 	  <property name="visible">True</property>
- 	  <property name="homogeneous">False</property>
--	  <property name="spacing">0</property>
-+	  <property name="spacing">6</property>
- 
- 	  <child>
--	    <widget class="GtkLabel" id="label217">
-+	    <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>
--	      <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>
-+	      <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>
-+	      <property name="expand">True</property>
-+	      <property name="fill">True</property>
- 	    </packing>
- 	  </child>
- 
- 	  <child>
--	    <widget class="GtkHBox" id="hbox52">
-+	    <widget class="GtkHBox" id="hbox56">
- 	      <property name="visible">True</property>
- 	      <property name="homogeneous">False</property>
--	      <property name="spacing">12</property>
-+	      <property name="spacing">6</property>
- 
- 	      <child>
--		<widget class="GtkCalendar" id="calendar">
-+		<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>
-+		  <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>
-+		  <property name="expand">False</property>
-+		  <property name="fill">False</property>
- 		</packing>
- 	      </child>
- 
- 	      <child>
--		<widget class="GtkVBox" id="vbox22">
-+		<widget class="GtkEntry" id="find-location-entryx">
- 		  <property name="visible">True</property>
--		  <property name="homogeneous">False</property>
--		  <property name="spacing">6</property>
--
--		  <child>
--		    <widget class="GtkLabel" id="label218">
--		      <property name="visible">True</property>
--		      <property name="label" translatable="yes">Current Time:</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>
--
--		  <child>
--		    <widget class="GtkLabel" id="label219">
--		      <property name="visible">True</property>
--		      <property name="label" translatable="yes">Time:</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>
-+		  <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">
-+		<widget class="GtkButton" id="find-next-location-buttonx">
- 		  <property name="visible">True</property>
--		  <property name="homogeneous">False</property>
--		  <property name="spacing">6</property>
-+		  <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">
-+		    <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>
--		      <property name="justify">GTK_JUSTIFY_LEFT</property>
--		      <property name="wrap">False</property>
--		      <property name="selectable">False</property>
--		      <property name="xalign">0</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="GtkHBox" id="hbox53">
--		      <property name="visible">True</property>
--		      <property name="homogeneous">False</property>
--		      <property name="spacing">0</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="GtkSpinButton" id="hours_spin">
-+			<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>
--			  <property name="numeric">True</property>
--			  <property name="update_policy">GTK_UPDATE_ALWAYS</property>
--			  <property name="snap_to_ticks">False</property>
--			  <property name="wrap">True</property>
--			  <property name="adjustment">23 0 23 1 12 12</property>
--			</widget>
--			<packing>
--			  <property name="padding">0</property>
--			  <property name="expand">True</property>
--			  <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>
--			  <property name="can_focus">True</property>
--			  <property name="climb_rate">1</property>
--			  <property name="digits">0</property>
--			  <property name="numeric">True</property>
--			  <property name="update_policy">GTK_UPDATE_ALWAYS</property>
--			  <property name="snap_to_ticks">False</property>
--			  <property name="wrap">True</property>
--			  <property name="adjustment">59 0 59 1 30 30</property>
--			</widget>
--			<packing>
--			  <property name="padding">0</property>
--			  <property name="expand">True</property>
--			  <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>
--			  <property name="can_focus">True</property>
--			  <property name="climb_rate">1</property>
--			  <property name="digits">0</property>
--			  <property name="numeric">True</property>
--			  <property name="update_policy">GTK_UPDATE_ALWAYS</property>
--			  <property name="snap_to_ticks">False</property>
--			  <property name="wrap">True</property>
--			  <property name="adjustment">59 0 59 1 30 30</property>
--			</widget>
--			<packing>
--			  <property name="padding">0</property>
--			  <property name="expand">True</property>
--			  <property name="fill">True</property>
--			</packing>
--		      </child>
--		    </widget>
--		    <packing>
--		      <property name="padding">0</property>
--		      <property name="expand">False</property>
--		      <property name="fill">True</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="padding">0</property>
--	      <property name="expand">True</property>
--	      <property name="fill">True</property>
--	    </packing>
--	  </child>
--	</widget>
--	<packing>
--	  <property name="padding">0</property>
--	  <property name="expand">False</property>
--	  <property name="fill">False</property>
--	</packing>
--      </child>
--
--      <child>
--	<widget class="GtkHBox" id="hbox58">
--	  <property name="visible">True</property>
--	  <property name="homogeneous">False</property>
--	  <property name="spacing">0</property>
--
--	  <child>
--	    <widget class="GtkHButtonBox" id="hbuttonbox21">
--	      <property name="visible">True</property>
--	      <property name="layout_style">GTK_BUTTONBOX_END</property>
--	      <property name="spacing">6</property>
--
--	      <child>
--		<widget class="GtkButton" id="cancel-set-time-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>
--		</widget>
--	      </child>
--
--	      <child>
--		<widget class="GtkButton" id="set-time-button">
--		  <property name="visible">True</property>
--		  <property name="can_focus">True</property>
--		  <property name="label" translatable="yes">Set System Time</property>
--		  <property name="use_underline">True</property>
--		  <property name="relief">GTK_RELIEF_NORMAL</property>
--		  <property name="focus_on_click">True</property>
--		</widget>
--	      </child>
--	    </widget>
--	    <packing>
--	      <property name="padding">0</property>
--	      <property name="expand">True</property>
--	      <property name="fill">True</property>
--	    </packing>
--	  </child>
--	</widget>
--	<packing>
--	  <property name="padding">0</property>
--	  <property name="expand">False</property>
--	  <property name="fill">False</property>
--	  <property name="pack_type">GTK_PACK_END</property>
--	</packing>
--      </child>
--    </widget>
--  </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="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="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>
- 
-+<widget class="GtkDialog" id="set-time-window">
-+  <property name="border_width">5</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>
-+  <property name="has_separator">False</property>
-+
-+  <child internal-child="vbox">
-+    <widget class="GtkVBox" id="dialog-vbox2">
-+      <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_area2">
-+	  <property name="visible">True</property>
-+	  <property name="layout_style">GTK_BUTTONBOX_END</property>
-+
-+	  <child>
-+	    <widget class="GtkButton" id="cancel-set-time-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">0</property>
-+	    </widget>
-+	  </child>
-+
-+	  <child>
-+	    <widget class="GtkButton" id="set-time-button">
-+	      <property name="visible">True</property>
-+	      <property name="can_focus">True</property>
-+	      <property name="label" translatable="yes">Set System Time</property>
-+	      <property name="use_underline">True</property>
-+	      <property name="relief">GTK_RELIEF_NORMAL</property>
-+	      <property name="focus_on_click">True</property>
-+	      <property name="response_id">0</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="vbox31">
-+	  <property name="border_width">5</property>
-+	  <property name="visible">True</property>
-+	  <property name="homogeneous">False</property>
-+	  <property name="spacing">6</property>
-+
-+	  <child>
-+	    <widget class="GtkLabel" id="label233">
-+	      <property name="visible">True</property>
-+	      <property name="label" translatable="yes">&lt;b&gt;Time Settings&lt;/b&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="padding">0</property>
-+	      <property name="expand">False</property>
-+	      <property name="fill">False</property>
-+	    </packing>
-+	  </child>
-+
-+	  <child>
-+	    <widget class="GtkHBox" id="time_settings_box">
-+	      <property name="visible">True</property>
-+	      <property name="homogeneous">False</property>
-+	      <property name="spacing">0</property>
-+
-+	      <child>
-+		<widget class="GtkLabel" id="label234">
-+		  <property name="visible">True</property>
-+		  <property name="label">    </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.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="GtkHBox" id="hbox60">
-+		  <property name="visible">True</property>
-+		  <property name="homogeneous">False</property>
-+		  <property name="spacing">12</property>
-+
-+		  <child>
-+		    <widget class="GtkCalendar" id="calendar">
-+		      <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="expand">True</property>
-+		      <property name="fill">True</property>
-+		    </packing>
-+		  </child>
-+
-+		  <child>
-+		    <widget class="GtkVBox" id="vbox32">
-+		      <property name="visible">True</property>
-+		      <property name="homogeneous">False</property>
-+		      <property name="spacing">6</property>
-+
-+		      <child>
-+			<widget class="GtkLabel" id="label235">
-+			  <property name="visible">True</property>
-+			  <property name="label" translatable="yes">Current Time:</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>
-+
-+		      <child>
-+			<widget class="GtkLabel" id="label236">
-+			  <property name="visible">True</property>
-+			  <property name="label" translatable="yes">Time:</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="padding">0</property>
-+		      <property name="expand">True</property>
-+		      <property name="fill">True</property>
-+		    </packing>
-+		  </child>
-+
-+		  <child>
-+		    <widget class="GtkVBox" id="vbox33">
-+		      <property name="visible">True</property>
-+		      <property name="homogeneous">False</property>
-+		      <property name="spacing">6</property>
-+
-+		      <child>
-+			<widget class="GtkLabel" id="current_time_label">
-+			  <property name="visible">True</property>
-+			  <property name="label">23:59:59</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>
-+
-+		      <child>
-+			<widget class="GtkHBox" id="hbox61">
-+			  <property name="visible">True</property>
-+			  <property name="homogeneous">False</property>
-+			  <property name="spacing">0</property>
-+
-+			  <child>
-+			    <widget class="GtkSpinButton" id="hours_spin">
-+			      <property name="visible">True</property>
-+			      <property name="can_focus">True</property>
-+			      <property name="climb_rate">1</property>
-+			      <property name="digits">0</property>
-+			      <property name="numeric">True</property>
-+			      <property name="update_policy">GTK_UPDATE_ALWAYS</property>
-+			      <property name="snap_to_ticks">False</property>
-+			      <property name="wrap">True</property>
-+			      <property name="adjustment">23 0 23 1 12 12</property>
-+			    </widget>
-+			    <packing>
-+			      <property name="padding">0</property>
-+			      <property name="expand">True</property>
-+			      <property name="fill">True</property>
-+			    </packing>
-+			  </child>
-+
-+			  <child>
-+			    <widget class="GtkSpinButton" id="minutes_spin">
-+			      <property name="visible">True</property>
-+			      <property name="can_focus">True</property>
-+			      <property name="climb_rate">1</property>
-+			      <property name="digits">0</property>
-+			      <property name="numeric">True</property>
-+			      <property name="update_policy">GTK_UPDATE_ALWAYS</property>
-+			      <property name="snap_to_ticks">False</property>
-+			      <property name="wrap">True</property>
-+			      <property name="adjustment">59 0 59 1 30 30</property>
-+			    </widget>
-+			    <packing>
-+			      <property name="padding">0</property>
-+			      <property name="expand">True</property>
-+			      <property name="fill">True</property>
-+			    </packing>
-+			  </child>
-+
-+			  <child>
-+			    <widget class="GtkSpinButton" id="seconds_spin">
-+			      <property name="visible">True</property>
-+			      <property name="can_focus">True</property>
-+			      <property name="climb_rate">1</property>
-+			      <property name="digits">0</property>
-+			      <property name="numeric">True</property>
-+			      <property name="update_policy">GTK_UPDATE_ALWAYS</property>
-+			      <property name="snap_to_ticks">False</property>
-+			      <property name="wrap">True</property>
-+			      <property name="adjustment">59 0 59 1 30 30</property>
-+			    </widget>
-+			    <packing>
-+			      <property name="padding">0</property>
-+			      <property name="expand">True</property>
-+			      <property name="fill">True</property>
-+			    </packing>
-+			  </child>
-+			</widget>
-+			<packing>
-+			  <property name="padding">0</property>
-+			  <property name="expand">False</property>
-+			  <property name="fill">True</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="padding">0</property>
-+		  <property name="expand">True</property>
-+		  <property name="fill">True</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>
-+
-+<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>
diff --git a/sources b/sources
index a3f1a66..e57c770 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-bf89eb75655557c6a1ab9dbd37f028a6  gnome-panel-2.22.1.2.tar.bz2
+315e85cbd56c838d538fefe7f4aa9868  gnome-panel-2.23.1.tar.bz2
diff --git a/timezone-64.patch b/timezone-64.patch
deleted file mode 100644
index 5b4d304..0000000
--- a/timezone-64.patch
+++ /dev/null
@@ -1,130 +0,0 @@
-diff -up gnome-panel-2.22.1.2/applets/clock/system-timezone.c.timezone-64 gnome-panel-2.22.1.2/applets/clock/system-timezone.c
---- gnome-panel-2.22.1.2/applets/clock/system-timezone.c.timezone-64	2008-04-10 08:38:24.000000000 -0400
-+++ gnome-panel-2.22.1.2/applets/clock/system-timezone.c	2008-04-22 12:38:10.000000000 -0400
-@@ -443,14 +443,14 @@ system_timezone_write_key_file (const ch
-                                 const char  *value,
-                                 GError     **error)
- {
--        GError        *our_error;
--        char          *content;
--        unsigned int   len;
--        char          *key_eq;
--        char         **lines;
--        gboolean       replaced;
--        gboolean       retval;
--        int            n;
-+        GError    *our_error;
-+        char      *content;
-+        gsize      len;
-+        char      *key_eq;
-+        char     **lines;
-+        gboolean   replaced;
-+        gboolean   retval;
-+        int        n;
-         
-         if (!g_file_test (filename, G_FILE_TEST_IS_REGULAR))
-                 return TRUE;
-@@ -613,16 +613,16 @@ system_timezone_read_etc_localtime_softl
-         return tz;
- }
- 
--typedef gboolean (*CompareFiles) (struct stat  *a_stat,
--                                  struct stat  *b_stat,
--                                  const char   *a_content,
--                                  unsigned int  a_content_len,
--                                  const char   *b_filename);
-+typedef gboolean (*CompareFiles) (struct stat *a_stat,
-+                                  struct stat *b_stat,
-+                                  const char  *a_content,
-+                                  gsize        a_content_len,
-+                                  const char  *b_filename);
- 
- static char *
- recursive_compare (struct stat  *localtime_stat,
-                    const char   *localtime_content,
--                   unsigned int  localtime_content_len,
-+                   gsize         localtime_content_len,
-                    char         *file,
-                    CompareFiles  compare_func)
- {
-@@ -675,11 +675,11 @@ recursive_compare (struct stat  *localti
- 
- 
- static gboolean
--files_are_identical_inode (struct stat  *a_stat,
--                           struct stat  *b_stat,
--                           const char   *a_content,
--                           unsigned int  a_content_len,
--                           const char   *b_filename)
-+files_are_identical_inode (struct stat *a_stat,
-+                           struct stat *b_stat,
-+                           const char  *a_content,
-+                           gsize        a_content_len,
-+                           const char  *b_filename)
- {
-         return (a_stat->st_ino == b_stat->st_ino);
- }
-@@ -706,15 +706,15 @@ system_timezone_read_etc_localtime_hardl
- }
- 
- static gboolean
--files_are_identical_content (struct stat  *a_stat,
--                             struct stat  *b_stat,
--                             const char   *a_content,
--                             unsigned int  a_content_len,
--                             const char   *b_filename)
--{
--        char         *b_content = NULL;
--        unsigned int  b_content_len = -1;
--        int           cmp;
-+files_are_identical_content (struct stat *a_stat,
-+                             struct stat *b_stat,
-+                             const char  *a_content,
-+                             gsize        a_content_len,
-+                             const char  *b_filename)
-+{
-+        char  *b_content = NULL;
-+        gsize  b_content_len = -1;
-+        int    cmp;
- 
-         if (a_stat->st_size != b_stat->st_size)
-                 return FALSE;
-@@ -740,7 +740,7 @@ system_timezone_read_etc_localtime_conte
- {
-         struct stat   stat_localtime;
-         char         *localtime_content = NULL;
--        unsigned int  localtime_content_len = -1;
-+        gsize         localtime_content_len = -1;
- 
-         if (g_stat (ETC_LOCALTIME, &stat_localtime) != 0)
-                 return NULL;
-@@ -819,11 +819,11 @@ static gboolean
- system_timezone_is_zone_file_valid (const char  *zone_file,
-                                     GError     **error)
- {
--        GError       *our_error;
--        GIOChannel   *channel;
--        GIOStatus     status;
--        char          buffer[strlen (TZ_MAGIC)];
--        unsigned int  read;
-+        GError     *our_error;
-+        GIOChannel *channel;
-+        GIOStatus   status;
-+        char        buffer[strlen (TZ_MAGIC)];
-+        gsize       read;
- 
-         /* First, check the zone_file is properly rooted */
-         if (!g_str_has_prefix (zone_file, SYSTEM_ZONEINFODIR"/")) {
-@@ -878,9 +878,9 @@ static gboolean
- system_timezone_set_etc_timezone (const char  *zone_file,
-                                   GError     **error)
- {
--        GError       *our_error;
--        char         *content;
--        unsigned int  len;
-+        GError *our_error;
-+        char   *content;
-+        gsize   len;
- 
-         if (!system_timezone_is_zone_file_valid (zone_file, error))
-                 return FALSE;