r39611 - in /desktop/unstable/libgweather/debian: changelog patches/0001-Don-t-crash-when-unsetting-the-location.patch patches/series

[sjoerd at users.alioth.debian.org]

Author: sjoerd
Date: Sat Sep 21 16:20:25 2013
New Revision: 39611

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=39611
Log:
* d/p/0001-Don-t-crash-when-unsetting-the-location.patch
  + Added, don't crash when the location is unset

Added:
    desktop/unstable/libgweather/debian/patches/0001-Don-t-crash-when-unsetting-the-location.patch
Modified:
    desktop/unstable/libgweather/debian/changelog
    desktop/unstable/libgweather/debian/patches/series

Modified: desktop/unstable/libgweather/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libgweather/debian/changelog?rev=39611&op=diff
==============================================================================
--- desktop/unstable/libgweather/debian/changelog	[utf-8] (original)
+++ desktop/unstable/libgweather/debian/changelog	[utf-8] Sat Sep 21 16:20:25 2013
@@ -1,3 +1,10 @@
+libgweather (3.8.2-3) UNRELEASED; urgency=low
+
+  * d/p/0001-Don-t-crash-when-unsetting-the-location.patch
+    + Added, don't crash when the location is unset
+
+ -- Sjoerd Simons <sjoerd at debian.org>  Sat, 21 Sep 2013 18:20:03 +0200
+
 libgweather (3.8.2-2) unstable; urgency=low
 
   [ Michael Biebl ]

Added: desktop/unstable/libgweather/debian/patches/0001-Don-t-crash-when-unsetting-the-location.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libgweather/debian/patches/0001-Don-t-crash-when-unsetting-the-location.patch?rev=39611&op=file
==============================================================================
--- desktop/unstable/libgweather/debian/patches/0001-Don-t-crash-when-unsetting-the-location.patch	(added)
+++ desktop/unstable/libgweather/debian/patches/0001-Don-t-crash-when-unsetting-the-location.patch	[utf-8] Sat Sep 21 16:20:25 2013
@@ -0,0 +1,31 @@
+From a3f9de10a20e9318b8faa5b6a8810fd8a041f703 Mon Sep 17 00:00:00 2001
+From: Sjoerd Simons <sjoerd at luon.net>
+Date: Sat, 21 Sep 2013 18:08:57 +0200
+Subject: [PATCH] Don't crash when unsetting the location
+
+Setting the location of the entry to NULL is documented to unset the
+location, unfortunately in practise it causes a crash in
+_location_equal. Fix this
+---
+ libgweather/location-entry.c | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/libgweather/location-entry.c b/libgweather/location-entry.c
+index 7fe58fc..8997312 100644
+--- a/libgweather/location-entry.c
++++ b/libgweather/location-entry.c
+@@ -318,6 +318,11 @@ gweather_location_entry_set_location (GWeatherLocationEntry *entry,
+ 
+     g_return_if_fail (GWEATHER_IS_LOCATION_ENTRY (entry));
+ 
++    if (loc == NULL) {
++      set_location_internal (entry, model, NULL, NULL);
++      return;
++    }
++
+     completion = gtk_entry_get_completion (GTK_ENTRY (entry));
+     model = gtk_entry_completion_get_model (completion);
+ 
+-- 
+1.8.4.rc3
+

Modified: desktop/unstable/libgweather/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libgweather/debian/patches/series?rev=39611&op=diff
==============================================================================
--- desktop/unstable/libgweather/debian/patches/series	[utf-8] (original)
+++ desktop/unstable/libgweather/debian/patches/series	[utf-8] Sat Sep 21 16:20:25 2013
@@ -1 +1,2 @@
 99_ltmain_as-needed.patch
+0001-Don-t-crash-when-unsetting-the-location.patch