r43955 - in /desktop/unstable/gnome-control-center/debian: changelog control patches/30_stack_overflow.patch patches/31_printers_border.patch patches/series

Sun Nov 30 10:32:15 UTC 2014

Author: joss
Date: Sun Nov 30 10:32:15 2014
New Revision: 43955

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=43955
Log:
* New upstream translation and bugfix release.
  + Disables SSLv3 because POODLE.
* 30_stack_overflow.patch: patch from upstream git. Prevents stack 
  overflow in sharing panel.
* 31_printers_border.patch: patch from upstream git. Removes unwanted 
  border around printer model name.

Added:
    desktop/unstable/gnome-control-center/debian/patches/30_stack_overflow.patch
    desktop/unstable/gnome-control-center/debian/patches/31_printers_border.patch
Modified:
    desktop/unstable/gnome-control-center/debian/changelog
    desktop/unstable/gnome-control-center/debian/control
    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=43955&op=diff
==============================================================================

--- desktop/unstable/gnome-control-center/debian/changelog	[utf-8] (original)
+++ desktop/unstable/gnome-control-center/debian/changelog	[utf-8] Sun Nov 30 10:32:15 2014
@@ -1,3 +1,14 @@
+gnome-control-center (1:3.14.2-1) unstable; urgency=medium
+
+  * New upstream translation and bugfix release.
+    + Disables SSLv3 because POODLE.
+  * 30_stack_overflow.patch: patch from upstream git. Prevents stack 
+    overflow in sharing panel.
+  * 31_printers_border.patch: patch from upstream git. Removes unwanted 
+    border around printer model name.
+
+ -- Josselin Mouette <joss at debian.org>  Sun, 30 Nov 2014 11:08:12 +0100
+
 gnome-control-center (1:3.14.1-1) unstable; urgency=medium
 
   * New upstream release.

Modified: desktop/unstable/gnome-control-center/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-control-center/debian/control?rev=43955&op=diff
==============================================================================
--- desktop/unstable/gnome-control-center/debian/control	[utf-8] (original)
+++ desktop/unstable/gnome-control-center/debian/control	[utf-8] Sun Nov 30 10:32:15 2014
@@ -6,7 +6,7 @@
 Section: gnome
 Priority: optional
 Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
-Uploaders: Andreas Henriksson <andreas at fatal.se>, Laurent Bigonville <bigon at debian.org>, Sjoerd Simons <sjoerd at debian.org>
+Uploaders: Andreas Henriksson <andreas at fatal.se>, Josselin Mouette <joss at debian.org>, Laurent Bigonville <bigon at debian.org>, Sjoerd Simons <sjoerd at debian.org>
 Standards-Version: 3.9.6
 Build-Depends: autotools-dev,
                cdbs (>= 0.4.41),

Added: desktop/unstable/gnome-control-center/debian/patches/30_stack_overflow.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-control-center/debian/patches/30_stack_overflow.patch?rev=43955&op=file
==============================================================================
--- desktop/unstable/gnome-control-center/debian/patches/30_stack_overflow.patch	(added)
+++ desktop/unstable/gnome-control-center/debian/patches/30_stack_overflow.patch	[utf-8] Sun Nov 30 10:32:15 2014
@@ -0,0 +1,30 @@
+From f5be9cccd8e78970d25fa3559128e827f9924651 Mon Sep 17 00:00:00 2001
+From: Rui Matos <tiagomatos at gmail.com>
+Date: Mon, 10 Nov 2014 15:06:52 +0100
+Subject: sharing: Prevent an endless loop and resulting stack overflow
+
+We need to block ourselves around the gtk_switch_set_active() call in
+the error path, when we can't speak to the sharing dbus service, or we
+end up in an endless loop since we're the ::state-set handler.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=739886
+
+diff --git a/panels/sharing/cc-sharing-networks.c b/panels/sharing/cc-sharing-networks.c
+index 181ed99..10920de 100644
+--- a/panels/sharing/cc-sharing-networks.c
++++ b/panels/sharing/cc-sharing-networks.c
+@@ -190,7 +190,11 @@ cc_sharing_networks_enable_network (GtkSwitch *widget,
+     g_warning ("Failed to %s service %s: %s", state ? "enable" : "disable",
+ 	       self->priv->service_name, error->message);
+     g_error_free (error);
++    g_signal_handlers_block_by_func (widget,
++                                     cc_sharing_networks_enable_network, self);
+     gtk_switch_set_active (widget, !state);
++    g_signal_handlers_unblock_by_func (widget,
++                                       cc_sharing_networks_enable_network, self);
+   }
+ 
+   cc_sharing_update_networks (self);
+-- 
+cgit v0.10.1
+

Added: desktop/unstable/gnome-control-center/debian/patches/31_printers_border.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-control-center/debian/patches/31_printers_border.patch?rev=43955&op=file
==============================================================================
--- desktop/unstable/gnome-control-center/debian/patches/31_printers_border.patch	(added)
+++ desktop/unstable/gnome-control-center/debian/patches/31_printers_border.patch	[utf-8] Sun Nov 30 10:32:15 2014
@@ -0,0 +1,25 @@
+From cc0ce5f2c6d52f799707a612832f3715572eeab9 Mon Sep 17 00:00:00 2001
+From: Marek Kasik <mkasik at redhat.com>
+Date: Thu, 27 Nov 2014 15:06:47 +0100
+Subject: printers: Remove border around model name
+
+The border was not there in 3.10 and it is not
+intended to be there in 3.14.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=740811
+
+diff --git a/panels/printers/printers.ui b/panels/printers/printers.ui
+index ecb545f..3891c35 100644
+--- a/panels/printers/printers.ui
++++ b/panels/printers/printers.ui
+@@ -332,6 +332,7 @@
+                         <property name="visible">True</property>
+                         <property name="can_focus">True</property>
+                         <property name="show_tabs">False</property>
++                        <property name="show_border">False</property>
+                         <child>
+                           <object class="GtkButton" id="printer-model-button">
+                             <property name="use_action_appearance">False</property>
+-- 
+cgit v0.10.1
+

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=43955&op=diff
==============================================================================
--- desktop/unstable/gnome-control-center/debian/patches/series	[utf-8] (original)
+++ desktop/unstable/gnome-control-center/debian/patches/series	[utf-8] Sun Nov 30 10:32:15 2014
@@ -1,3 +1,5 @@
 01_menu_category.patch
 06_handle_passwd_with_ldap.patch
 07_polkit_wheel_sudo_group.patch
+30_stack_overflow.patch
+31_printers_border.patch


