r36488 - in /desktop/unstable/gnome-control-center/debian: changelog patches/03_network_null_unref.patch patches/11_revert_printer_class.patch patches/series

[joss at users.alioth.debian.org]

Author: joss
Date: Mon Dec 17 23:27:54 2012
New Revision: 36488

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=36488
Log:
* New upstream stable release.
* 11_revert_printer_class.patch: revert, merged upstream.
* 03_network_null_unref.patch: patch from upstream git. Fix a critical 
  warning caused by g_object_unref (NULL).

Added:
    desktop/unstable/gnome-control-center/debian/patches/03_network_null_unref.patch
Removed:
    desktop/unstable/gnome-control-center/debian/patches/11_revert_printer_class.patch
Modified:
    desktop/unstable/gnome-control-center/debian/changelog
    desktop/unstable/gnome-control-center/debian/patches/series

Modified: desktop/unstable/gnome-control-center/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-control-center/debian/changelog?rev=36488&op=diff
==============================================================================
--- desktop/unstable/gnome-control-center/debian/changelog [utf-8] (original)
+++ desktop/unstable/gnome-control-center/debian/changelog [utf-8] Mon Dec 17 23:27:54 2012
@@ -1,3 +1,12 @@
+gnome-control-center (1:3.4.3.1-1) UNRELEASED; urgency=low
+
+  * New upstream stable release.
+  * 11_revert_printer_class.patch: revert, merged upstream.
+  * 03_network_null_unref.patch: patch from upstream git. Fix a critical 
+    warning caused by g_object_unref (NULL).
+
+ -- Josselin Mouette <joss at debian.org>  Mon, 17 Dec 2012 23:22:21 +0100
+
 gnome-control-center (1:3.4.2+git20121016.29d7c0-1) unstable; urgency=low
 
   [ Josselin Mouette ]

Added: desktop/unstable/gnome-control-center/debian/patches/03_network_null_unref.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-control-center/debian/patches/03_network_null_unref.patch?rev=36488&op=file
==============================================================================
--- desktop/unstable/gnome-control-center/debian/patches/03_network_null_unref.patch (added)
+++ desktop/unstable/gnome-control-center/debian/patches/03_network_null_unref.patch [utf-8] Mon Dec 17 23:27:54 2012
@@ -1,0 +1,25 @@
+From 160697df6ca870efc153c77d32f42ffb05359c1d Mon Sep 17 00:00:00 2001
+From: Richard Hughes <richard at hughsie.com>
+Date: Wed, 30 May 2012 11:39:48 +0000
+Subject: network: Do not print a critical warning when NetworkManager is restarted
+
+Resolves: https://bugzilla.gnome.org/show_bug.cgi?id=676369
+---
+(limited to 'panels/network/cc-network-panel.c')
+
+diff --git a/panels/network/cc-network-panel.c b/panels/network/cc-network-panel.c
+index 50fa7b3..4e82677 100644
+--- a/panels/network/cc-network-panel.c
++++ b/panels/network/cc-network-panel.c
+@@ -693,7 +693,8 @@ panel_refresh_killswitch_visibility (CcNetworkPanel *panel)
+                                 break;
+                         }
+                 }
+-                g_object_unref (object_tmp);
++                if (object_tmp != NULL)
++                        g_object_unref (object_tmp);
+         } while (!show_flight_toggle && gtk_tree_model_iter_next (model, &iter));
+ 
+         /* only show toggle if there are wireless devices */
+--
+cgit v0.9.0.2

Modified: desktop/unstable/gnome-control-center/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-control-center/debian/patches/series?rev=36488&op=diff
==============================================================================
--- desktop/unstable/gnome-control-center/debian/patches/series [utf-8] (original)
+++ desktop/unstable/gnome-control-center/debian/patches/series [utf-8] Mon Dec 17 23:27:54 2012
@@ -1,7 +1,7 @@
 01_menu_category.patch
 02_no_assert_on_null_streams.patch
+03_network_null_unref.patch
 06_handle_passwd_with_ldap.patch
 10_optional_wacom_support.patch
-11_revert_printer_class.patch
 90_force_fallback.patch
 revert_git_datetime_port.patch