Merge lp:~matttbe/ubuntu/raring/alacarte/lp1086369 into lp:ubuntu/raring/alacarte

[Matthieu Baerts]

Hello,

This branch fixes the bug #1086369
Without this tiny modification (patch from upstream devs), it's not possible to launch Alacarte on Raring. I guess this bug can be considered as critical :)

Regards,

Matt

[Sebastien Bacher (seb128)]

Thanks for the patch!

review: Approve

[Matthieu Baerts (matttbe)]

Thank you for your help! :)

=== modified file '.pc/applied-patches'
--- .pc/applied-patches	2012-11-08 12:07:16 +0000
+++ .pc/applied-patches	2013-01-31 01:48:22 +0000
@@ -2,3 +2,4 @@
 30-python_private_dir.patch
 40-call-exo-d-i-e-on-xfce.patch
 50-xdg-menu-prefix.patch
+git_use_glib-gerror.patch

=== added directory '.pc/git_use_glib-gerror.patch'
=== added directory '.pc/git_use_glib-gerror.patch/Alacarte'
=== added file '.pc/git_use_glib-gerror.patch/Alacarte/util.py'
--- .pc/git_use_glib-gerror.patch/Alacarte/util.py	1970-01-01 00:00:00 +0000
+++ .pc/git_use_glib-gerror.patch/Alacarte/util.py	2013-01-31 01:48:22 +0000
@@ -0,0 +1,174 @@
+# -*- coding: utf-8 -*-
+#   Alacarte Menu Editor - Simple fd.o Compliant Menu Editor
+#   Copyright (C) 2006  Travis Watkins
+#
+#   This library is free software; you can redistribute it and/or
+#   modify it under the terms of the GNU Library General Public
+#   License as published by the Free Software Foundation; either
+#   version 2 of the License, or (at your option) any later version.
+#
+#   This library is distributed in the hope that it will be useful,
+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+#   Library General Public License for more details.
+#
+#   You should have received a copy of the GNU Library General Public
+#   License along with this library; if not, write to the Free Software
+#   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+import os
+import xml.dom.minidom
+from collections import Sequence
+from gi.repository import Gtk, GdkPixbuf, GMenu, GLib
+
+# XXX: look into pygobject error marshalling
+from gi._glib import GError
+
+DESKTOP_GROUP = GLib.KEY_FILE_DESKTOP_GROUP
+KEY_FILE_FLAGS = GLib.KeyFileFlags.KEEP_COMMENTS | GLib.KeyFileFlags.KEEP_TRANSLATIONS
+
+def fillKeyFile(keyfile, items):
+    for key, item in items.iteritems():
+        if item is None:
+            continue
+
+        if isinstance(item, bool):
+            keyfile.set_boolean(DESKTOP_GROUP, key, item)
+        elif isinstance(item, Sequence):
+            keyfile.set_string_list(DESKTOP_GROUP, key, item)
+        elif isinstance(item, basestring):
+            keyfile.set_string(DESKTOP_GROUP, key, item)
+
+def getUniqueFileId(name, extension):
+    append = 0
+    while 1:
+        if append == 0:
+            filename = name + extension
+        else:
+            filename = name + '-' + str(append) + extension
+        if extension == '.desktop':
+            path = getUserItemPath()
+            if not os.path.isfile(os.path.join(path, filename)) and not getItemPath(filename):
+                break
+        elif extension == '.directory':
+            path = getUserDirectoryPath()
+            if not os.path.isfile(os.path.join(path, filename)) and not getDirectoryPath(filename):
+                break
+        append += 1
+    return filename
+
+def getUniqueRedoFile(filepath):
+    append = 0
+    while 1:
+        new_filepath = filepath + '.redo-' + str(append)
+        if not os.path.isfile(new_filepath):
+            break
+        else:
+            append += 1
+    return new_filepath
+
+def getUniqueUndoFile(filepath):
+    filename, extension = os.path.split(filepath)[1].rsplit('.', 1)
+    append = 0
+    while 1:
+        if extension == 'desktop':
+            path = getUserItemPath()
+        elif extension == 'directory':
+            path = getUserDirectoryPath()
+        elif extension == 'menu':
+            path = getUserMenuPath()
+        new_filepath = os.path.join(path, filename + '.' + extension + '.undo-' + str(append))
+        if not os.path.isfile(new_filepath):
+            break
+        else:
+            append += 1
+    return new_filepath
+
+def getItemPath(file_id):
+    for path in GLib.get_system_data_dirs():
+        file_path = os.path.join(path, 'applications', file_id)
+        if os.path.isfile(file_path):
+            return file_path
+    return None
+
+def getUserItemPath():
+    item_dir = os.path.join(GLib.get_user_data_dir(), 'applications')
+    if not os.path.isdir(item_dir):
+        os.makedirs(item_dir)
+    return item_dir
+
+def getDirectoryPath(file_id):
+    for path in GLib.get_system_data_dirs():
+        file_path = os.path.join(path, 'desktop-directories', file_id)
+        if os.path.isfile(file_path):
+            return file_path
+    return None
+
+def getUserDirectoryPath():
+    menu_dir = os.path.join(GLib.get_user_data_dir(), 'desktop-directories')
+    if not os.path.isdir(menu_dir):
+        os.makedirs(menu_dir)
+    return menu_dir
+
+def getUserMenuPath():
+    menu_dir = os.path.join(GLib.get_user_config_dir(), 'menus')
+    if not os.path.isdir(menu_dir):
+        os.makedirs(menu_dir)
+    return menu_dir
+
+def getSystemMenuPath(file_id):
+    for path in GLib.get_system_config_dirs():
+        file_path = os.path.join(path, 'menus', file_id)
+        if os.path.isfile(file_path):
+            return file_path
+    return None
+
+def getUserMenuXml(tree):
+    system_file = getSystemMenuPath(os.path.basename(tree.get_canonical_menu_path()))
+    name = tree.get_root_directory().get_menu_id()
+    menu_xml = "<!DOCTYPE Menu PUBLIC '-//freedesktop//DTD Menu 1.0//EN' 'http://standards.freedesktop.org/menu-spec/menu-1.0.dtd'>\n"
+    menu_xml += "<Menu>\n  <Name>" + name + "</Name>\n  "
+    menu_xml += "<MergeFile type=\"parent\">" + system_file +    "</MergeFile>\n</Menu>\n"
+    return menu_xml
+
+def getIcon(item):
+    pixbuf = None
+    if item is None:
+        return None
+
+    if isinstance(item, GMenu.TreeDirectory):
+        gicon = item.get_icon()
+    elif isinstance(item, GMenu.TreeEntry):
+        app_info = item.get_app_info()
+        gicon = app_info.get_icon()
+    else:
+        return None
+
+    if gicon is None:
+        return None
+
+    icon_theme = Gtk.IconTheme.get_default()
+    info = icon_theme.lookup_by_gicon(gicon, 24, 0)
+    if info is None:
+        return None
+    try:
+        pixbuf = info.load_icon()
+    except GError:
+        return None
+    if pixbuf is None:
+        return None
+    if pixbuf.get_width() != 24 or pixbuf.get_height() != 24:
+        pixbuf = pixbuf.scale_simple(24, 24, GdkPixbuf.InterpType.HYPER)
+    return pixbuf
+
+def removeWhitespaceNodes(node):
+    remove_list = []
+    for child in node.childNodes:
+        if child.nodeType == xml.dom.minidom.Node.TEXT_NODE:
+            child.data = child.data.strip()
+            if not child.data.strip():
+                remove_list.append(child)
+        elif child.hasChildNodes():
+            removeWhitespaceNodes(child)
+    for node in remove_list:
+        node.parentNode.removeChild(node)

=== modified file 'Alacarte/util.py'
--- Alacarte/util.py	2012-06-25 11:56:36 +0000
+++ Alacarte/util.py	2013-01-31 01:48:22 +0000
@@ -21,9 +21,6 @@
 from collections import Sequence
 from gi.repository import Gtk, GdkPixbuf, GMenu, GLib
 
-# XXX: look into pygobject error marshalling
-from gi._glib import GError
-
 DESKTOP_GROUP = GLib.KEY_FILE_DESKTOP_GROUP
 KEY_FILE_FLAGS = GLib.KeyFileFlags.KEEP_COMMENTS | GLib.KeyFileFlags.KEEP_TRANSLATIONS
 
@@ -153,7 +150,7 @@
         return None
     try:
         pixbuf = info.load_icon()
-    except GError:
+    except GLib.GError:
         return None
     if pixbuf is None:
         return None

=== modified file 'debian/changelog'
--- debian/changelog	2012-11-08 12:07:16 +0000
+++ debian/changelog	2013-01-31 01:48:22 +0000
@@ -1,3 +1,10 @@
+alacarte (3.6.1-0ubuntu3) raring; urgency=low
+
+  * debian/patches/git_use_glib-gerror.patch:
+    - Use GLib.GError for catching errors (LP: #1086369)
+
+ -- Matthieu Baerts (matttbe) <[e-mail]>  Thu, 31 Jan 2013 02:38:20 +0100
+
 alacarte (3.6.1-0ubuntu2) raring; urgency=low
 
   * debian/patches/50-xdg-menu-prefix.patch:

=== added file 'debian/patches/git_use_glib-gerror.patch'
--- debian/patches/git_use_glib-gerror.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/git_use_glib-gerror.patch	2013-01-31 01:48:22 +0000
@@ -0,0 +1,31 @@
+From 2f2e0b0bac463f545f409c67f1a15f5bf672529f Mon Sep 17 00:00:00 2001
+From: Jasper St. Pierre <[e-mail]>
+Date: Wed, 16 Jan 2013 15:55:43 +0000
+Subject: Use GLib.Error for catching errors
+
+While gi._glib.GError works on my machine, it seems it's on track
+to be removed, or doesn't work on some PyGObject builds.
+---
+Index: alacarte/Alacarte/util.py
+===================================================================
+--- alacarte.orig/Alacarte/util.py	2013-01-31 02:34:04.466464660 +0100
++++ alacarte/Alacarte/util.py	2013-01-31 02:34:04.422464661 +0100
+@@ -21,9 +21,6 @@
+ from collections import Sequence
+ from gi.repository import Gtk, GdkPixbuf, GMenu, GLib
+ 
+-# XXX: look into pygobject error marshalling
+-from gi._glib import GError
+-
+ DESKTOP_GROUP = GLib.KEY_FILE_DESKTOP_GROUP
+ KEY_FILE_FLAGS = GLib.KeyFileFlags.KEEP_COMMENTS | GLib.KeyFileFlags.KEEP_TRANSLATIONS
+ 
+@@ -153,7 +150,7 @@
+         return None
+     try:
+         pixbuf = info.load_icon()
+-    except GError:
++    except GLib.GError:
+         return None
+     if pixbuf is None:
+         return None

=== modified file 'debian/patches/series'
--- debian/patches/series	2012-11-08 12:07:16 +0000
+++ debian/patches/series	2013-01-31 01:48:22 +0000
@@ -2,3 +2,4 @@
 30-python_private_dir.patch
 40-call-exo-d-i-e-on-xfce.patch
 50-xdg-menu-prefix.patch
+git_use_glib-gerror.patch