rpms/gnome-panel/devel populate.patch, NONE, 1.1 gnome-panel.spec, 1.277, 1.278

Matthias Clasen (mclasen) fedora-extras-commits at redhat.com
Fri Mar 14 21:23:12 UTC 2008


Author: mclasen

Update of /cvs/extras/rpms/gnome-panel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1930

Modified Files:
	gnome-panel.spec 
Added Files:
	populate.patch 
Log Message:
Fill the location list before showing the preference window


populate.patch:

--- NEW FILE populate.patch ---
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));


Index: gnome-panel.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-panel/devel/gnome-panel.spec,v
retrieving revision 1.277
retrieving revision 1.278
diff -u -r1.277 -r1.278
--- gnome-panel.spec	11 Mar 2008 03:50:34 -0000	1.277
+++ gnome-panel.spec	14 Mar 2008 21:22:23 -0000	1.278
@@ -22,7 +22,7 @@
 Summary: GNOME panel
 Name: gnome-panel
 Version: 2.22.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 URL: http://www.gnome.org
 Source0: http://download.gnome.org/sources/gnome-panel/2.22/%{name}-%{version}.tar.bz2
 
@@ -116,6 +116,9 @@
 Patch25: current.patch
 Patch26: expose.patch
 
+# fixed upstream
+Patch27: populate.patch
+
 Conflicts: gnome-power-manager < 2.15.3
 
 %description
@@ -165,6 +168,7 @@
 %patch24 -p1 -b .allow-spurious-view-done-signals
 %patch25 -p1 -b .current
 %patch26 -p1 -b .expose
+%patch27 -p1 -b .populate
 
 . %{SOURCE6}
 
@@ -349,6 +353,9 @@
 %{_datadir}/gtk-doc/html/*
 
 %changelog
+* Fri Mar 14 2008 Matthias Clasen  <mclasen at redhat.com> - 2.22.0-3
+- Populate the location list before showing the preference window
+
 * Mon Mar 10 2008 Matthias Clasen  <mclasen at redhat.com> - 2.22.0-2
 - Bump revision
 




More information about the fedora-extras-commits mailing list