summaryrefslogtreecommitdiff
path: root/sysutils
diff options
context:
space:
mode:
authorKoop Mast <kwm@FreeBSD.org>2016-01-11 09:45:09 +0000
committerKoop Mast <kwm@FreeBSD.org>2016-01-11 09:45:09 +0000
commit91560f8c3772881cae471b26db140a346058ecca (patch)
tree83f027b79df73a8a8e6833f2c80179ae8edacaf0 /sysutils
parentRemove OPTIONS_DEFINE out of Mk/Uses/drupal.mk (affects many drupal ports) (diff)
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
Notes
Notes: svn path=/head/; revision=405771
Diffstat (limited to 'sysutils')
-rw-r--r--sysutils/gnome-control-center/Makefile2
-rw-r--r--sysutils/gnome-control-center/files/patch-panels_region_cc-region-panel.c29
2 files changed, 30 insertions, 1 deletions
diff --git a/sysutils/gnome-control-center/Makefile b/sysutils/gnome-control-center/Makefile
index eab2f2c028e6..f94d24d0a16e 100644
--- a/sysutils/gnome-control-center/Makefile
+++ b/sysutils/gnome-control-center/Makefile
@@ -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
diff --git a/sysutils/gnome-control-center/files/patch-panels_region_cc-region-panel.c b/sysutils/gnome-control-center/files/patch-panels_region_cc-region-panel.c
new file mode 100644
index 000000000000..bc3112887c0b
--- /dev/null
+++ b/sysutils/gnome-control-center/files/patch-panels_region_cc-region-panel.c
@@ -0,0 +1,29 @@
+From 66c69759423124f0bd661b28ceaaaab361a1c3e5 Mon Sep 17 00:00:00 2001
+From: Debarshi Ray <debarshir@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
+