rpms/gnome-panel/devel gweather-api.patch, NONE, 1.1 gnome-panel.spec, 1.244, 1.245

[Matthias Clasen (mclasen)]

Author: mclasen

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

Modified Files:
	gnome-panel.spec 
Added Files:
	gweather-api.patch 
Log Message:
Adapt to libgweather api changes


gweather-api.patch:

--- NEW FILE gweather-api.patch ---
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) {


Index: gnome-panel.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-panel/devel/gnome-panel.spec,v
retrieving revision 1.244
retrieving revision 1.245
diff -u -r1.244 -r1.245
--- gnome-panel.spec	27 Nov 2007 06:18:12 -0000	1.244
+++ gnome-panel.spec	13 Dec 2007 14:38:22 -0000	1.245
@@ -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 @@
 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 @@
 
 %patch100 -p1 -b .dont-build-clock
 %patch101 -p1 -b .intlclock-build-fixes
+%patch102 -p1 -b .gweather-api
 
 . %{SOURCE6}
 
@@ -396,6 +398,9 @@
 %{_datadir}/gtk-doc/html/*
 
 %changelog
+* Thu Dec 13 2007 Matthias Clasen <mclasen at redhat.com> - 2.20.2-2
+- Adapt to libgweather api changes
+
 * Tue Nov 27 2007 Matthias Clasen <mclasen at redhat.com> - 2.20.2-1
 - Update to 2.20.2 (translation updates)