Merge lp:~muktupavels/alacarte/fix-creating-new-menus-and-items into lp:ubuntu/trusty/alacarte

[Alberts Muktupāvels]

Backport upstream patches to:
* fix creating new items.
* fix creating new menus.
* make the restore button work.

Backport upstream patches to:
* fix creating new items.
* fix creating new menus.
* make the restore button work.

[lp:~muktupavels/alacarte/fix-creating-new-menus-and-items]

72. By Alberts Muktupāvels on 2014-04-10

Update version...

[Dmitry Shachnev (mitya57)]

Refreshed patches, fixed the changelog, and uploaded. Waiting in the review queue as we are in the final freeze now.

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2013-10-03 22:04:16 +0000
+++ debian/changelog	2014-04-10 19:30:25 +0000
@@ -1,3 +1,12 @@
+alacarte (3.10.0-1ubuntu2) UNRELEASED; urgency=medium
+
+  * Backport upstream patches to:
+    - fix creating new items.
+    - fix creating new menus.
+    - make the restore button work. 
+
+ -- Alberts Muktupāvels <[e-mail]>  Thu, 10 Apr 2014 22:28:53 +0300
+
 alacarte (3.10.0-1) unstable; urgency=low
 
   * New upstream release.

=== added file 'debian/patches/git-fix-creating-new-items.patch'
--- debian/patches/git-fix-creating-new-items.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/git-fix-creating-new-items.patch	2014-04-10 19:30:25 +0000
@@ -0,0 +1,40 @@
+From 1166883e5d7fcfc24ce24b5f5b158053c59be7a2 Mon Sep 17 00:00:00 2001
+From: Matthias Clasen <[e-mail]>
+Date: Thu, 27 Feb 2014 19:29:49 -0500
+Subject: Fix creating new items
+
+Just as for menus, the code to insert the new item in
+the right place was dropped in refactoring.
+Bring it back.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=725360
+
+diff --git a/Alacarte/MainWindow.py b/Alacarte/MainWindow.py
+index a0c884c..f52f216 100644
+--- a/Alacarte/MainWindow.py
++++ b/Alacarte/MainWindow.py
+@@ -261,11 +261,19 @@ class MainWindow(object):
+             menu_tree.get_selection().select_path((0,))
+         else:
+             parent = menus[iter][2]
+-        file_path = os.path.join(util.getUserItemPath(), util.getUniqueFileId('alacarte-made', '.desktop'))
++        file_name = util.getUniqueFileId('alacarte-made', '.desktop')
++        file_path = os.path.join(util.getUserItemPath(), file_name)
+ 
+         editor = LauncherEditor(self.main_window, file_path)
++        editor.file_name = file_name;
++        editor.parent = parent.get_menu_id()
++        editor.connect ('response', self.on_item_created)
+         editor.run()
+ 
++    def on_item_created(self, editor, response):
++        if response == True:
++            self.editor.insertExternalItem(editor.file_name, editor.parent)
++
+     def on_new_separator_button_clicked(self, button):
+         item_tree = self.tree.get_object('item_tree')
+         items, iter = item_tree.get_selection().get_selected()
+-- 
+cgit v0.10.1
+
+

=== added file 'debian/patches/git-fix-creating-new-menus.patch'
--- debian/patches/git-fix-creating-new-menus.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/git-fix-creating-new-menus.patch	2014-04-10 19:30:25 +0000
@@ -0,0 +1,40 @@
+From fd2c16c3929e57f5f2071ed3bc36f02c77930bab Mon Sep 17 00:00:00 2001
+From: Matthias Clasen <[e-mail]>
+Date: Wed, 26 Feb 2014 20:29:51 -0500
+Subject: Fix creating new menus
+
+We were still creating the .directory file, but some
+refactoring dropped the code that inserted the menu
+into the menu tree. Bring it back.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=725287
+
+diff --git a/Alacarte/MainWindow.py b/Alacarte/MainWindow.py
+index aa36aaa..a0c884c 100644
+--- a/Alacarte/MainWindow.py
++++ b/Alacarte/MainWindow.py
+@@ -239,11 +239,19 @@ class MainWindow(object):
+             menu_tree.get_selection().select_path((0,))
+         else:
+             parent = menus[iter][2]
+-        file_path = os.path.join(util.getUserDirectoryPath(), util.getUniqueFileId('alacarte-made', '.directory'))
++	file_name = util.getUniqueFileId('alacarte-made', '.directory')
++        file_path = os.path.join(util.getUserDirectoryPath(), file_name)
+ 
+         editor = DirectoryEditor(self.main_window, file_path)
++        editor.file_name = file_name;
++        editor.parent = parent.get_menu_id()
++        editor.connect ('response', self.on_directory_created)
+         editor.run()
+ 
++    def on_directory_created(self, editor, response):
++        if response == True:
++            self.editor.insertExternalMenu(editor.file_name, editor.parent)
++
+     def on_new_item_button_clicked(self, button):
+         menu_tree = self.tree.get_object('menu_tree')
+         menus, iter = menu_tree.get_selection().get_selected()
+-- 
+cgit v0.10.1
+
+

=== added file 'debian/patches/git-make-the-restore-button-work.patch'
--- debian/patches/git-make-the-restore-button-work.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/git-make-the-restore-button-work.patch	2014-04-10 19:30:25 +0000
@@ -0,0 +1,25 @@
+From ba22fb0db948a65f19a22fc3e6f390d336a11eac Mon Sep 17 00:00:00 2001
+From: Matthias Clasen <[e-mail]>
+Date: Mon, 17 Feb 2014 18:04:16 -0500
+Subject: Make the Restore button work
+
+The callback assumes that the first argument is 'self', not
+the button that was clicked.
+
+diff --git a/data/alacarte.ui b/data/alacarte.ui
+index 28905c2..90941a6 100644
+--- a/data/alacarte.ui
++++ b/data/alacarte.ui
+@@ -77,7 +77,7 @@
+                 <property name="receives_default">False</property>
+                 <property name="tooltip_text" translatable="yes">Restore the default menu layout</property>
+                 <property name="use_stock">True</property>
+-                <signal name="clicked" handler="on_restore_button_clicked" swapped="no"/>
++                <signal name="clicked" handler="on_restore_button_clicked" swapped="yes"/>
+               </object>
+               <packing>
+                 <property name="expand">False</property>
+-- 
+cgit v0.10.1
+
+

=== modified file 'debian/patches/series'
--- debian/patches/series	2013-10-03 22:04:16 +0000
+++ debian/patches/series	2014-04-10 19:30:25 +0000
@@ -1,2 +1,5 @@
 03-bind_textdomain_codeset.patch
 30-python_private_dir.patch
+git-fix-creating-new-items.patch
+git-fix-creating-new-menus.patch
+git-make-the-restore-button-work.patch