gnome-panel r10979 - trunk/applets/clock

[vuntz svn gnome org]

Author: vuntz
Date: Thu Apr  3 17:34:08 2008
New Revision: 10979
URL: http://svn.gnome.org/viewvc/gnome-panel?rev=10979&view=rev

Log:
2008-04-03  Vincent Untz  <vuntz gnome org>

	* clock.c: (update_timezone): if the coordinates are known to not be
	valid, just empty the timezone selection
	(run_find_location_save): updated to pass a new argument to
	update_timezone()
	Fix crash bug #522438


Modified:
   trunk/applets/clock/ChangeLog
   trunk/applets/clock/clock.c

Modified: trunk/applets/clock/clock.c
==============================================================================
--- trunk/applets/clock/clock.c	(original)
+++ trunk/applets/clock/clock.c	Thu Apr  3 17:34:08 2008
@@ -3217,13 +3217,23 @@
 }
 
 static void
-update_timezone (ClockData *cd, const char *name, gfloat lat, gfloat lon)
+update_timezone (ClockData *cd, const char *name, gboolean valid, gfloat lat, gfloat lon)
 {
         GtkWidget *zone_combo = glade_xml_get_widget (cd->glade_xml, "edit-location-timezone-combo");
 	gchar *timezone;
 	ClockLocation *loc;
 	WeatherPrefs prefs;
 
+	if (!valid) {
+                /* unfortunately gtk doesn't have an easy way to clear
+                   a combo box */
+                gtk_combo_box_prepend_text (GTK_COMBO_BOX (zone_combo), "");
+                gtk_combo_box_set_active (GTK_COMBO_BOX (zone_combo), 0);
+                gtk_combo_box_remove_text (GTK_COMBO_BOX (zone_combo), 0);
+                gtk_combo_box_set_active (GTK_COMBO_BOX (zone_combo), -1);
+		return;
+	}
+
 	prefs.temperature_unit = cd->temperature_unit;
 	prefs.speed_unit = cd->speed_unit;
 
@@ -3267,7 +3277,10 @@
 
 	update_coords (cd, loc->latlon_valid, loc->latitude*180.0/M_PI, loc->longitude*180.0/M_PI);
 
-	update_timezone (cd, loc->name, loc->latitude, loc->longitude);
+	/* FIXME: loc->zone can gives us the timezone. For Bristol, it's
+	 * :westcountry. No idea how to map this to a real timezone, though. */
+	update_timezone (cd, loc->name, loc->latlon_valid,
+			 loc->latitude, loc->longitude);
 
 	find_hide (NULL, cd);
 }