gnome-panel r10958 - trunk/applets/clock

[matthiasc svn gnome org]

Author: matthiasc
Date: Fri Mar 14 21:20:41 2008
New Revision: 10958
URL: http://svn.gnome.org/viewvc/gnome-panel?rev=10958&view=rev

Log:
2008-03-14  Matthias Clasen  <mclasen redhat com>

        * clock.c (fill_prefs_window): Make sure that we create the
        cities store before we fill the preference window.




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	Fri Mar 14 21:20:41 2008
@@ -1001,12 +1001,6 @@
 
                 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
@@ -3815,6 +3809,9 @@
 	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));