diff -u alacarte-0.11.10/debian/changelog alacarte-0.11.10/debian/changelog --- alacarte-0.11.10/debian/changelog +++ alacarte-0.11.10/debian/changelog @@ -1,3 +1,11 @@ +alacarte (0.11.10-0ubuntu2) karmic; urgency=low + + * debian/patches/01_properties_button.patch + - don't activate properties and delete button on menu-tree, + don't activate properties button on seperator. (LP: #366723) + + -- Andreas Moog Mon, 27 Apr 2009 18:19:22 +0200 + alacarte (0.11.10-0ubuntu1) jaunty; urgency=low * New upstream version diff -u alacarte-0.11.10/debian/patches/01_properties_button.patch alacarte-0.11.10/debian/patches/01_properties_button.patch --- alacarte-0.11.10/debian/patches/01_properties_button.patch +++ alacarte-0.11.10/debian/patches/01_properties_button.patch @@ -1,7 +1,7 @@ -diff -Nur -x '*.orig' -x '*~' alacarte-0.11.5/Alacarte/MainWindow.py alacarte-0.11.5.new/Alacarte/MainWindow.py ---- alacarte-0.11.5/Alacarte/MainWindow.py 2008-02-19 06:56:48.000000000 +0100 -+++ alacarte-0.11.5.new/Alacarte/MainWindow.py 2008-09-06 17:00:57.000000000 +0200 -@@ -321,6 +321,12 @@ +diff -Nur -x '*.orig' -x '*~' alacarte-0.11.10/Alacarte/MainWindow.py alacarte-0.11.10.new/Alacarte/MainWindow.py +--- alacarte-0.11.10/Alacarte/MainWindow.py 2009-04-27 18:15:07.000000000 +0200 ++++ alacarte-0.11.10.new/Alacarte/MainWindow.py 2009-04-27 18:29:24.000000000 +0200 +@@ -320,6 +320,12 @@ parent = menus[iter][2] self.editor.createSeparator(parent, after=after) @@ -14,9 +14,37 @@ def on_edit_delete_activate(self, menu): item_tree = self.tree.get_widget('item_tree') items, iter = item_tree.get_selection().get_selected() -diff -Nur -x '*.orig' -x '*~' alacarte-0.11.5/alacarte.glade alacarte-0.11.5.new/alacarte.glade ---- alacarte-0.11.5/data/alacarte.glade 2008-02-17 02:01:23.000000000 +0100 -+++ alacarte-0.11.5.new/data/alacarte.glade 2008-09-06 17:00:50.000000000 +0200 +@@ -391,6 +397,8 @@ + self.tree.get_widget('move_up_button').set_sensitive(False) + self.tree.get_widget('move_down_button').set_sensitive(False) + self.tree.get_widget('new_separator_button').set_sensitive(False) ++ self.tree.get_widget('properties_button').set_sensitive(False) ++ self.tree.get_widget('delete_button').set_sensitive(False) + + def on_menu_tree_drag_data_get(self, treeview, context, selection, target_id, etime): + menus, iter = treeview.get_selection().get_selected() +@@ -437,6 +445,7 @@ + return + item = items[iter][3] + self.tree.get_widget('edit_delete').set_sensitive(True) ++ self.tree.get_widget('delete_button').set_sensitive(True) + self.tree.get_widget('new_separator_button').set_sensitive(True) + if self.editor.canRevert(item): + self.tree.get_widget('edit_revert_to_original').set_sensitive(True) +@@ -444,8 +453,10 @@ + self.tree.get_widget('edit_revert_to_original').set_sensitive(False) + if not item.get_type() == gmenu.TYPE_SEPARATOR: + self.tree.get_widget('edit_properties').set_sensitive(True) ++ self.tree.get_widget('properties_button').set_sensitive(True) + else: + self.tree.get_widget('edit_properties').set_sensitive(False) ++ self.tree.get_widget('properties_button').set_sensitive(False) + + # If first item... + if items.get_path(iter)[0] == 0: +diff -Nur -x '*.orig' -x '*~' alacarte-0.11.10/data/alacarte.glade alacarte-0.11.10.new/data/alacarte.glade +--- alacarte-0.11.10/data/alacarte.glade 2009-04-27 18:15:07.000000000 +0200 ++++ alacarte-0.11.10.new/data/alacarte.glade 2009-04-27 18:28:14.000000000 +0200 @@ -664,8 +664,62 @@