r39864 - in /desktop/unstable/gnome-panel/debian: changelog patches/fix-gweather-crash.patch patches/series

[biebl at users.alioth.debian.org]

Author: biebl
Date: Mon Oct 14 10:54:39 2013
New Revision: 39864

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=39864
Log:
Merge changes from 3.4.2.1-6

Specifically the fix for the crash in the clock applet.

Added:
    desktop/unstable/gnome-panel/debian/patches/fix-gweather-crash.patch
Modified:
    desktop/unstable/gnome-panel/debian/changelog
    desktop/unstable/gnome-panel/debian/patches/series

Modified: desktop/unstable/gnome-panel/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-panel/debian/changelog?rev=39864&op=diff
==============================================================================
--- desktop/unstable/gnome-panel/debian/changelog	[utf-8] (original)
+++ desktop/unstable/gnome-panel/debian/changelog	[utf-8] Mon Oct 14 10:54:39 2013
@@ -45,6 +45,30 @@
     + Fix mistake in gnome-session-flashback's Breaks.
 
  -- Emilio Pozuelo Monfort <pochu at debian.org>  Sun, 13 Oct 2013 23:43:05 +0200
+
+gnome-panel (3.4.2.1-6) unstable; urgency=low
+
+  [ Andreas Henriksson ]
+  * Add debian/patches/20_eds-api.patch
+  * Update build-dependencies for above patch:
+    - Drop libedataserverui-3.0-dev (>= 2.91.2),
+    - Bump libecal1.2-dev to >= 3.5.3
+    - Bump libedataserver1.2-dev to >= 3.5.3
+    - Bump evolution-data-server-dev to >= 3.5.3
+  * Add debian/patches/clock-schema.patch
+    - missing schema from the tarball?! Needed by next patch....
+  * Add debian/patches/clock-applet-modern-gnome-tech.patch
+    - ports to gsettings, newer gweather, etc...
+  * debian/gnome-panel-data.install: don't install etc/gconf
+  * Bump build dependency on libgweather-3-dev to >= 3.5.1 for above patch
+  * Add debian/patches/drop-gweather-xml-include.patch
+  * Above changes closes: #722022
+
+  [ Sjoerd Simons ]
+  * debian/patches/fix-gweather-crash.patch:
+    - Added. Fix a crash when adding a location to the clock
+
+ -- Sjoerd Simons <sjoerd at debian.org>  Sun, 22 Sep 2013 20:34:42 +0200
 
 gnome-panel (3.4.2.1-5) unstable; urgency=low
 

Added: desktop/unstable/gnome-panel/debian/patches/fix-gweather-crash.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-panel/debian/patches/fix-gweather-crash.patch?rev=39864&op=file
==============================================================================
--- desktop/unstable/gnome-panel/debian/patches/fix-gweather-crash.patch	(added)
+++ desktop/unstable/gnome-panel/debian/patches/fix-gweather-crash.patch	[utf-8] Mon Oct 14 10:54:39 2013
@@ -0,0 +1,27 @@
+--- a/applets/clock/clock.c
++++ b/applets/clock/clock.c
+@@ -1496,7 +1497,7 @@
+         const gchar *timezone, *weather_code;
+         gchar *city, *name;
+ 
+-        GWeatherLocation *gloc;
++        GWeatherLocation *gloc, *station_loc;
+         gfloat lat = 0;
+         gfloat lon = 0;
+ 
+@@ -1521,7 +1522,14 @@
+                 return;
+         }
+ 
+-        weather_code = gweather_location_get_code (gloc);
++        station_loc = gloc;
++        while ( gweather_location_get_level (station_loc) <
++            GWEATHER_LOCATION_WEATHER_STATION) {
++          station_loc = gweather_location_get_children (station_loc)[0];
++          g_assert (station_loc != NULL);
++        }
++
++        weather_code = gweather_location_get_code (station_loc);
+         if (gweather_location_entry_has_custom_text (cd->location_entry)) {
+                 name = gtk_editable_get_chars (GTK_EDITABLE (cd->location_entry), 0, -1);
+         }

Modified: desktop/unstable/gnome-panel/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-panel/debian/patches/series?rev=39864&op=diff
==============================================================================
--- desktop/unstable/gnome-panel/debian/patches/series	[utf-8] (original)
+++ desktop/unstable/gnome-panel/debian/patches/series	[utf-8] Mon Oct 14 10:54:39 2013
@@ -13,6 +13,7 @@
 91-fix_panels_in_separate_screens.patch
 92-fix_sunrise-times.patch
 drop-gweather-xml-include.patch
+fix-gweather-crash.patch
 git-build-with-gnome-desktop38-part1.patch
 git-build-with-gnome-desktop38-part2.patch
 git-build-with-gnome-desktop38-part3.patch