r43387 - in /desktop/unstable/brasero/debian: changelog patches/ patches/01_fix-plugin-dialog-segfault.patch patches/series

[bigon at users.alioth.debian.org]

Author: bigon
Date: Sat Oct  4 13:48:38 2014
New Revision: 43387

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=43387
Log:
Add d/p/01_fix-plugin-dialog-segfault.patch: Fix segfault when displaying
the plugin dialog

Added:
    desktop/unstable/brasero/debian/patches/
    desktop/unstable/brasero/debian/patches/01_fix-plugin-dialog-segfault.patch
    desktop/unstable/brasero/debian/patches/series
Modified:
    desktop/unstable/brasero/debian/changelog

Modified: desktop/unstable/brasero/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/brasero/debian/changelog?rev=43387&op=diff
==============================================================================
--- desktop/unstable/brasero/debian/changelog	[utf-8] (original)
+++ desktop/unstable/brasero/debian/changelog	[utf-8] Sat Oct  4 13:48:38 2014
@@ -10,8 +10,10 @@
   * debian/brasero.install: Install appdata file
   * Add debian/brasero.lintian-overrides: Override warnings regarding
     brasero-nautilus.desktop file, it's used for the nautilus extension
-
- -- Laurent Bigonville <bigon at debian.org>  Sat, 04 Oct 2014 14:23:12 +0200
+  * Add d/p/01_fix-plugin-dialog-segfault.patch: Fix segfault when displaying
+    the plugin dialog
+
+ -- Laurent Bigonville <bigon at debian.org>  Sat, 04 Oct 2014 15:48:05 +0200
 
 brasero (3.10.0-2) unstable; urgency=medium
 

Added: desktop/unstable/brasero/debian/patches/01_fix-plugin-dialog-segfault.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/brasero/debian/patches/01_fix-plugin-dialog-segfault.patch?rev=43387&op=file
==============================================================================
--- desktop/unstable/brasero/debian/patches/01_fix-plugin-dialog-segfault.patch	(added)
+++ desktop/unstable/brasero/debian/patches/01_fix-plugin-dialog-segfault.patch	[utf-8] Sat Oct  4 13:48:38 2014
@@ -0,0 +1,46 @@
+From 492d99443a76e02ff16d128779fefc8083eb82ab Mon Sep 17 00:00:00 2001
+From: Laurent Bigonville <bigon at bigon.be>
+Date: Sat, 4 Oct 2014 15:31:19 +0200
+Subject: [PATCH] Fix segfault when displaying the plugin dialog
+
+This partially revert changes from
+426841b445f8f62191f2b0569088e0da15c42068
+
+https://bugzilla.gnome.org/show_bug.cgi?id=728376
+---
+ src/brasero-plugin-manager-ui.c | 6 +-----
+ 1 file changed, 1 insertion(+), 5 deletions(-)
+
+diff --git a/src/brasero-plugin-manager-ui.c b/src/brasero-plugin-manager-ui.c
+index bca5fd4..9fde757 100644
+--- a/src/brasero-plugin-manager-ui.c
++++ b/src/brasero-plugin-manager-ui.c
+@@ -241,16 +241,12 @@ plugin_manager_ui_view_icon_cell_cb (GtkTreeViewColumn *tree_column,
+ 				     GtkTreeIter       *iter,
+ 				     gpointer           data)
+ {
+-	BraseroPlugin *plugin;
+ 	
+ 	g_return_if_fail (tree_model != NULL);
+ 	g_return_if_fail (tree_column != NULL);
+ 
+-	gtk_tree_model_get (tree_model, iter, PLUGIN_COLUMN, &plugin, -1);
+-
+ 	g_object_set (G_OBJECT (cell),
+ 		      "visible", FALSE,
+-		      "sensitive", brasero_plugin_get_gtype (plugin) != G_TYPE_NONE && !brasero_plugin_get_compulsory (plugin),
+ 		      NULL);
+ 	return;
+ /*
+@@ -271,7 +267,7 @@ plugin_manager_ui_view_icon_cell_cb (GtkTreeViewColumn *tree_column,
+ 		      "icon-name",
+ 		      brasero_plugin_get_icon_name (plugin),
+ 		      "sensitive",
+-		      brasero_plugin_get_gtype (plugin) != G_TYPE_NONE,
++		      brasero_plugin_get_gtype (plugin) != G_TYPE_NONE && !brasero_plugin_get_compulsory (plugin),
+ 		      NULL);
+ */
+ }
+-- 
+2.1.1
+

Added: desktop/unstable/brasero/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/brasero/debian/patches/series?rev=43387&op=file
==============================================================================
--- desktop/unstable/brasero/debian/patches/series	(added)
+++ desktop/unstable/brasero/debian/patches/series	[utf-8] Sat Oct  4 13:48:38 2014
@@ -0,0 +1 @@
+01_fix-plugin-dialog-segfault.patch