[SCM] ladish/master: Prevent SIGSEGV when launching gladish (LP: #835166).

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 59b3efdf0103909dc14c7b455d118c75a0b1657b
Author: Alessio Treglia <alessio at debian.org>
Date:   Wed Aug 31 09:27:30 2011 +0200

    Prevent SIGSEGV when launching gladish (LP: #835166).

diff --git a/debian/patches/0004-dont_activate_disabled_widgets.patch b/debian/patches/0004-dont_activate_disabled_widgets.patch
new file mode 100644
index 0000000..ca039c7
--- /dev/null
+++ b/debian/patches/0004-dont_activate_disabled_widgets.patch
@@ -0,0 +1,44 @@
+Author: Nedko Arnaudov <nedko at arnaudov.name>
+Description: libappmenu seems to activate disabled menu items
+ The implemented fix ignores such activations.
+Applied-Upstream: http://repo.or.cz/w/ladish.git/commitdiff_plain/e2b94615
+Bug: http://ladish.org/ticket/173
+Bug-Ubuntu: https://launchpad.net/bugs/835166
+---
+ gui/dynmenu.c  |    7 ++++++-
+ gui/gladish.ui |    1 +
+ 2 files changed, 7 insertions(+), 1 deletion(-)
+
+--- ladish.orig/gui/dynmenu.c
++++ ladish/gui/dynmenu.c
+@@ -2,7 +2,7 @@
+ /*
+  * LADI Session Handler (ladish)
+  *
+- * Copyright (C) 2010 Nedko Arnaudov <nedko at arnaudov.name>
++ * Copyright (C) 2010, 2011 Nedko Arnaudov <nedko at arnaudov.name>
+  *
+  **************************************************************************
+  * This file contains dynamic menu related code
+@@ -162,6 +162,11 @@ static void populate_dynmenu_menu(GtkMen
+   const char * prefix;
+   char * text;
+ 
++  if (!gtk_widget_get_sensitive(GTK_WIDGET(menu_item)))
++  {
++    return;
++  }
++
+   menu_dynmenu_clear(dynmenu_ptr);
+   dynmenu_ptr->add_sensitive = true;
+   if (!dynmenu_ptr->fill_callback(ladish_dynmenu_add_entry, dynmenu_ptr))
+--- ladish.orig/gui/gladish.ui
++++ ladish/gui/gladish.ui
+@@ -184,6 +184,7 @@
+                 <property name="label" translatable="yes">_Project</property>
+                 <property name="use_underline">True</property>
+                 <property name="visible">True</property>
++                <property name="sensitive">False</property>
+                 <child type="submenu">
+                   <object class="GtkMenu" id="project_menu">
+                     <property name="visible">True</property>
diff --git a/debian/patches/series b/debian/patches/series
index b542e3d..4b0004a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,7 @@
 0001-disable_stacktrace.patch
 0002-desktop_file.patch
 0003-save_as_dialog_avoid_multiplied_emits.patch
+0004-dont_activate_disabled_widgets.patch
 1004-in_terminal_execution.patch
 1005-kfreebsd.patch
 1006-gladish_dependencies.patch

-- 
ladish packaging