diff options
| author | Matthias Clasen <mclasen@fedoraproject.org> | 2008-03-14 21:22:23 +0000 |
|---|---|---|
| committer | Matthias Clasen <mclasen@fedoraproject.org> | 2008-03-14 21:22:23 +0000 |
| commit | 1e2242685f1ee7b5a9940485b2aaa72f3f765c08 (patch) | |
| tree | 6434809afb990abc213537802391e35413f99851 | |
| parent | 71bec65e78d6d36458703135972d3f5a22d23e15 (diff) | |
| download | gnome-panel-1e2242685f1ee7b5a9940485b2aaa72f3f765c08.tar.gz gnome-panel-1e2242685f1ee7b5a9940485b2aaa72f3f765c08.tar.xz gnome-panel-1e2242685f1ee7b5a9940485b2aaa72f3f765c08.zip | |
Fill the location list before showing the preference windowgnome-panel-2_22_0-3_fc9
| -rw-r--r-- | gnome-panel.spec | 9 | ||||
| -rw-r--r-- | populate.patch | 26 |
2 files changed, 34 insertions, 1 deletions
diff --git a/gnome-panel.spec b/gnome-panel.spec index 384d183..a651434 100644 --- a/gnome-panel.spec +++ b/gnome-panel.spec @@ -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 @@ Patch24: gnome-panel-2.21.92-allow-spurious-view-done-signals.patch Patch25: current.patch Patch26: expose.patch +# fixed upstream +Patch27: populate.patch + Conflicts: gnome-power-manager < 2.15.3 %description @@ -165,6 +168,7 @@ Panel Applets using the libpanel-applet library. %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 @@ fi %{_datadir}/gtk-doc/html/* %changelog +* Fri Mar 14 2008 Matthias Clasen <mclasen@redhat.com> - 2.22.0-3 +- Populate the location list before showing the preference window + * Mon Mar 10 2008 Matthias Clasen <mclasen@redhat.com> - 2.22.0-2 - Bump revision diff --git a/populate.patch b/populate.patch new file mode 100644 index 0000000..5e17c5d --- /dev/null +++ b/populate.patch @@ -0,0 +1,26 @@ +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)); |