svn commit: r405771 - in head/sysutils/gnome-control-center: . files

[Koop Mast]

Author: kwm
Date: Mon Jan 11 09:45:09 2016
New Revision: 405771
URL: https://svnweb.freebsd.org/changeset/ports/405771

Log:
  Fix a gnome-control-center crash when trying to return to the main menu
  from the region section.
  
  Submitted by:	dumbbell@
  Obtained from:	gnome-control-center upstream

Added:
  head/sysutils/gnome-control-center/files/patch-panels_region_cc-region-panel.c   (contents, props changed)
Modified:
  head/sysutils/gnome-control-center/Makefile

Modified: head/sysutils/gnome-control-center/Makefile
==============================================================================
--- head/sysutils/gnome-control-center/Makefile	Mon Jan 11 08:51:49 2016	(r405770)
+++ head/sysutils/gnome-control-center/Makefile	Mon Jan 11 09:45:09 2016	(r405771)
@@ -3,7 +3,7 @@
 
 PORTNAME=	gnome-control-center
 PORTVERSION=	3.16.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3

Added: head/sysutils/gnome-control-center/files/patch-panels_region_cc-region-panel.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/sysutils/gnome-control-center/files/patch-panels_region_cc-region-panel.c	Mon Jan 11 09:45:09 2016	(r405771)
@@ -0,0 +1,29 @@
+From 66c69759423124f0bd661b28ceaaaab361a1c3e5 Mon Sep 17 00:00:00 2001
+From: Debarshi Ray <debarshir at gnome.org>
+Date: Fri, 20 Nov 2015 18:42:44 +0100
+Subject: region: Silence a CRITICAL
+
+Fall out from abb0592866515ac43ed1ac3c9ecc0b229960011f
+
+https://bugzilla.gnome.org/show_bug.cgi?id=758417
+---
+ panels/region/cc-region-panel.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/panels/region/cc-region-panel.c b/panels/region/cc-region-panel.c
+index 8436b68..6cd5b85 100644
+--- panels/region/cc-region-panel.c
++++ panels/region/cc-region-panel.c
+@@ -166,7 +166,8 @@ cc_region_panel_finalize (GObject *object)
+         g_free (priv->system_region);
+ 
+         chooser = g_object_get_data (G_OBJECT (self), "input-chooser");
+-        gtk_widget_destroy (chooser);
++        if (chooser)
++                gtk_widget_destroy (chooser);
+ 
+ 	G_OBJECT_CLASS (cc_region_panel_parent_class)->finalize (object);
+ }
+-- 
+cgit v0.11.2
+