aboutsummaryrefslogtreecommitdiffstats
path: root/widgets
diff options
context:
space:
mode:
authorDan Winship <danw@src.gnome.org>2003-03-18 03:47:34 +0800
committerDan Winship <danw@src.gnome.org>2003-03-18 03:47:34 +0800
commit3f486d99c6d54f377cfd778d71844c53bf9bb9ff (patch)
tree21afbc29568c26f040cf3061445cef182125609c /widgets
parent8148ebb2d9d8716d9ad341d3ac709a26eea123f2 (diff)
downloadgsoc2013-evolution-3f486d99c6d54f377cfd778d71844c53bf9bb9ff.tar
gsoc2013-evolution-3f486d99c6d54f377cfd778d71844c53bf9bb9ff.tar.gz
gsoc2013-evolution-3f486d99c6d54f377cfd778d71844c53bf9bb9ff.tar.bz2
gsoc2013-evolution-3f486d99c6d54f377cfd778d71844c53bf9bb9ff.tar.lz
gsoc2013-evolution-3f486d99c6d54f377cfd778d71844c53bf9bb9ff.tar.xz
gsoc2013-evolution-3f486d99c6d54f377cfd778d71844c53bf9bb9ff.tar.zst
gsoc2013-evolution-3f486d99c6d54f377cfd778d71844c53bf9bb9ff.zip
Don't crash if there's no timezone set initially. #39783
* e-timezone-dialog/e-timezone-dialog.c (on_map_motion): Don't crash if there's no timezone set initially. #39783 svn path=/trunk/; revision=20313
Diffstat (limited to 'widgets')
-rw-r--r--widgets/ChangeLog5
-rw-r--r--widgets/e-timezone-dialog/e-timezone-dialog.c10
2 files changed, 11 insertions, 4 deletions
diff --git a/widgets/ChangeLog b/widgets/ChangeLog
index 50102bc562..5189811ed5 100644
--- a/widgets/ChangeLog
+++ b/widgets/ChangeLog
@@ -1,3 +1,8 @@
+2003-03-17 Dan Winship <danw@ximian.com>
+
+ * e-timezone-dialog/e-timezone-dialog.c (on_map_motion): Don't
+ crash if there's no timezone set initially. #39783
+
2003-03-11 Dan Winship <danw@ximian.com>
* e-timezone-dialog/e-timezone-dialog.c: Various cleanups.
diff --git a/widgets/e-timezone-dialog/e-timezone-dialog.c b/widgets/e-timezone-dialog/e-timezone-dialog.c
index 8cb50d465c..77002b4b7c 100644
--- a/widgets/e-timezone-dialog/e-timezone-dialog.c
+++ b/widgets/e-timezone-dialog/e-timezone-dialog.c
@@ -390,10 +390,12 @@ on_map_motion (GtkWidget *widget, GdkEventMotion *event, gpointer data)
gtk_label_get (GTK_LABEL (priv->timezone_preview), &old_zone_name);
new_zone = get_zone_from_point (etd, priv->point_hover);
- new_zone_name = zone_display_name (new_zone);
- if (strcmp (old_zone_name, new_zone_name)) {
- gtk_label_set_text (GTK_LABEL (priv->timezone_preview),
- new_zone_name);
+ if (new_zone) {
+ new_zone_name = zone_display_name (new_zone);
+ if (strcmp (old_zone_name, new_zone_name)) {
+ gtk_label_set_text (GTK_LABEL (priv->timezone_preview),
+ new_zone_name);
+ }
}
return TRUE;