diff options
| author | Matthias Clasen <mclasen@fedoraproject.org> | 2007-12-13 14:38:22 +0000 |
|---|---|---|
| committer | Matthias Clasen <mclasen@fedoraproject.org> | 2007-12-13 14:38:22 +0000 |
| commit | 6e71d467cba2a43a30b7c58516e0896a54b4ef7f (patch) | |
| tree | 56dc3d11ff3cd0b7164bec2059b21ae1197148c9 | |
| parent | e7751e870e9a4b00dd171f3959edb5746f7f5b0a (diff) | |
| download | gnome-panel-6e71d467cba2a43a30b7c58516e0896a54b4ef7f.tar.gz gnome-panel-6e71d467cba2a43a30b7c58516e0896a54b4ef7f.tar.xz gnome-panel-6e71d467cba2a43a30b7c58516e0896a54b4ef7f.zip | |
Adapt to libgweather api changesgnome-panel-2_20_2-2_fc9
| -rw-r--r-- | gnome-panel.spec | 7 | ||||
| -rw-r--r-- | gweather-api.patch | 38 |
2 files changed, 44 insertions, 1 deletions
diff --git a/gnome-panel.spec b/gnome-panel.spec index e3eba50..ace997f 100644 --- a/gnome-panel.spec +++ b/gnome-panel.spec @@ -23,7 +23,7 @@ Summary: GNOME panel Name: gnome-panel Version: 2.20.2 -Release: 1%{?dist} +Release: 2%{?dist} URL: http://www.gnome.org Source0: http://download.gnome.org/sources/gnome-panel/2.20/%{name}-%{version}.tar.bz2 # we are upstream for this @@ -33,6 +33,7 @@ Source2: intlclock-20071113.tar.gz Patch98: timezone-changes.patch Patch100: dont-build-clock.patch Patch101: intlclock-build-fixes.patch +Patch102: gweather-api.patch Source3: redhat-panel-default-setup.entries Source4: gnome-compiler-flags.m4 @@ -178,6 +179,7 @@ tar xzf %{SOURCE2} %patch100 -p1 -b .dont-build-clock %patch101 -p1 -b .intlclock-build-fixes +%patch102 -p1 -b .gweather-api . %{SOURCE6} @@ -396,6 +398,9 @@ fi %{_datadir}/gtk-doc/html/* %changelog +* Thu Dec 13 2007 Matthias Clasen <mclasen@redhat.com> - 2.20.2-2 +- Adapt to libgweather api changes + * Tue Nov 27 2007 Matthias Clasen <mclasen@redhat.com> - 2.20.2-1 - Update to 2.20.2 (translation updates) diff --git a/gweather-api.patch b/gweather-api.patch new file mode 100644 index 0000000..5b5eed0 --- /dev/null +++ b/gweather-api.patch @@ -0,0 +1,38 @@ +diff -up gnome-panel-2.20.2/intlclock-1.0/src/intlclock-location-tile.c.gweatherapi gnome-panel-2.20.2/intlclock-1.0/src/intlclock-location-tile.c +--- gnome-panel-2.20.2/intlclock-1.0/src/intlclock-location-tile.c.gweatherapi 2007-12-13 13:10:34.000000000 +0100 ++++ gnome-panel-2.20.2/intlclock-1.0/src/intlclock-location-tile.c 2007-12-13 13:26:32.000000000 +0100 +@@ -455,10 +455,15 @@ void + weather_info_setup_tooltip (WeatherInfo *info, GtkTooltip *tooltip) + { + GdkPixbuf *pixbuf = NULL; ++ GtkIconTheme *theme = NULL; + gchar *conditions, *temp, *apparent, *wind; + gchar *line1, *line2, *line3, *line4, *tip; ++ const gchar *icon_name; + +- weather_info_get_pixbuf (info, &pixbuf); ++ icon_name = weather_info_get_icon_name (info); ++ theme = gtk_icon_theme_get_default (); ++ pixbuf = gtk_icon_theme_load_icon (theme, icon_name, 48, 0, NULL); ++ + if (pixbuf) + gtk_tooltip_set_icon (tooltip, pixbuf); + +@@ -526,12 +531,16 @@ update_weather_icon (IntlClockLocation * + IntlClockLocationTile *tile = data; + IntlClockLocationTilePrivate *priv = PRIVATE (tile); + GdkPixbuf *pixbuf = NULL; ++ GtkIconTheme *theme = NULL; ++ const gchar *icon_name; + const gchar *temp = NULL; + + if (!info || !weather_info_is_valid (info)) + return; + +- weather_info_get_pixbuf_mini (info, &pixbuf); ++ icon_name = weather_info_get_icon_name (info); ++ theme = gtk_icon_theme_get_default (); ++ pixbuf = gtk_icon_theme_load_icon (theme, icon_name, 16, 0, NULL); + temp = weather_info_get_temp_summary (info); + + if (pixbuf) { |