r42364 - in /desktop/unstable/gedit/debian: changelog patches/0001-Hold-ref-to-menus-stored-in-app.patch patches/series

[sjoerd at users.alioth.debian.org]

Author: sjoerd
Date: Sat Aug 30 10:07:43 2014
New Revision: 42364

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=42364
Log:
* debian/patches/0001-Hold-ref-to-menus-stored-in-app.patch
  + Added. Correctly reference to menu widgets retrieved from the builder,
    fixes crash with new gtk. (From upstream git)

Added:
    desktop/unstable/gedit/debian/patches/0001-Hold-ref-to-menus-stored-in-app.patch
Modified:
    desktop/unstable/gedit/debian/changelog
    desktop/unstable/gedit/debian/patches/series

Modified: desktop/unstable/gedit/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gedit/debian/changelog?rev=42364&op=diff
==============================================================================
--- desktop/unstable/gedit/debian/changelog	[utf-8] (original)
+++ desktop/unstable/gedit/debian/changelog	[utf-8] Sat Aug 30 10:07:43 2014
@@ -1,3 +1,11 @@
+gedit (3.12.2-2) UNRELEASED; urgency=medium
+
+  * debian/patches/0001-Hold-ref-to-menus-stored-in-app.patch
+    + Added. Correctly reference to menu widgets retrieved from the builder,
+      fixes crash with new gtk. (From upstream git)
+
+ -- Sjoerd Simons <sjoerd at debian.org>  Sat, 30 Aug 2014 12:04:51 +0200
+
 gedit (3.12.2-1) unstable; urgency=medium
 
   [ Emilio Pozuelo Monfort ]

Added: desktop/unstable/gedit/debian/patches/0001-Hold-ref-to-menus-stored-in-app.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gedit/debian/patches/0001-Hold-ref-to-menus-stored-in-app.patch?rev=42364&op=file
==============================================================================
--- desktop/unstable/gedit/debian/patches/0001-Hold-ref-to-menus-stored-in-app.patch	(added)
+++ desktop/unstable/gedit/debian/patches/0001-Hold-ref-to-menus-stored-in-app.patch	[utf-8] Sat Aug 30 10:07:43 2014
@@ -0,0 +1,54 @@
+From 98efe189a8a39216de1807d009d4ae5a099eddd0 Mon Sep 17 00:00:00 2001
+From: Jesse van den Kieboom <jessevdk at gnome.org>
+Date: Mon, 30 Jun 2014 19:19:48 +0200
+Subject: [PATCH] Hold ref to menus stored in app
+
+---
+ gedit/gedit-app.c | 26 +++++++++++++++++++++-----
+ 1 file changed, 21 insertions(+), 5 deletions(-)
+
+--- a/gedit/gedit-app.c
++++ b/gedit/gedit-app.c
+@@ -420,6 +420,22 @@
+ 	}
+ }
+ 
++static gpointer
++get_builder_object_ref (GtkBuilder  *builder,
++                        const gchar *name)
++{
++	gpointer ret;
++
++	ret = gtk_builder_get_object (builder, name);
++
++	if (ret != NULL)
++	{
++		g_object_ref_sink (ret);
++	}
++
++	return ret;
++}
++
+ static void
+ gedit_app_startup (GApplication *application)
+ {
+@@ -492,15 +508,15 @@
+ 			appmenu = G_MENU_MODEL (gtk_builder_get_object (builder, "appmenu"));
+ 			gtk_application_set_app_menu (GTK_APPLICATION (application), appmenu);
+ 
+-			app->priv->window_menu = G_MENU_MODEL (gtk_builder_get_object (builder, "gear_menu_withappmenu"));
++			app->priv->window_menu = G_MENU_MODEL (get_builder_object_ref (builder, "gear_menu_withappmenu"));
+ 		}
+ 		else
+ 		{
+-			app->priv->window_menu = G_MENU_MODEL (gtk_builder_get_object (builder, "gear_menu_noappmenu"));
++			app->priv->window_menu = G_MENU_MODEL (get_builder_object_ref (builder, "gear_menu_noappmenu"));
+ 		}
+ 
+-		app->priv->notebook_menu = G_MENU_MODEL (gtk_builder_get_object (builder, "notebook_menu"));
+-		app->priv->tab_width_menu = G_MENU_MODEL (gtk_builder_get_object (builder, "tab_width_menu"));
++		app->priv->notebook_menu = G_MENU_MODEL (get_builder_object_ref (builder, "notebook_menu"));
++		app->priv->tab_width_menu = G_MENU_MODEL (get_builder_object_ref (builder, "tab_width_menu"));
+ 	}
+ 
+ 	g_object_unref (builder);

Modified: desktop/unstable/gedit/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gedit/debian/patches/series?rev=42364&op=diff
==============================================================================
--- desktop/unstable/gedit/debian/patches/series	[utf-8] (original)
+++ desktop/unstable/gedit/debian/patches/series	[utf-8] Sat Aug 30 10:07:43 2014
@@ -1,3 +1,4 @@
 01_gedit-bugreport-location.patch
 03_no_gnu_gettext.patch
 08_multiarch_fallback.patch
+0001-Hold-ref-to-menus-stored-in-app.patch