← Back to branch summary

~matttbe/ubuntu/raring/alacarte/lp1086369

« back to all changes in this revision

Viewing changes to debian/patches/git_use_glib-gerror.patch

  • Committer: Matthieu Baerts
  • Date: 2013-01-31 01:38:31 UTC
  • Revision ID: matttbe@gmail.com-20130131013831-noqgthvfve7o0zgx
https://launchpad.net/bugs/1086369
* debian/patches/git_use_glib-gerror.patch:
  - Use GLib.GError for catching errors (LP: #1086369)

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/git_use_glib-gerror.patch
 
1
From 2f2e0b0bac463f545f409c67f1a15f5bf672529f Mon Sep 17 00:00:00 2001
 
2
From: Jasper St. Pierre <jstpierre@mecheye.net>
 
3
Date: Wed, 16 Jan 2013 15:55:43 +0000
 
4
Subject: Use GLib.Error for catching errors
 
5
 
 
6
While gi._glib.GError works on my machine, it seems it's on track
 
7
to be removed, or doesn't work on some PyGObject builds.
 
8
---
 
9
Index: alacarte/Alacarte/util.py
 
10
===================================================================
 
11
--- alacarte.orig/Alacarte/util.py      2013-01-31 02:34:04.466464660 +0100
 
12
+++ alacarte/Alacarte/util.py   2013-01-31 02:34:04.422464661 +0100
 
13
@@ -21,9 +21,6 @@
 
14
 from collections import Sequence
 
15
 from gi.repository import Gtk, GdkPixbuf, GMenu, GLib
 
16
 
 
17
-# XXX: look into pygobject error marshalling
 
18
-from gi._glib import GError
 
19
-
 
20
 DESKTOP_GROUP = GLib.KEY_FILE_DESKTOP_GROUP
 
21
 KEY_FILE_FLAGS = GLib.KeyFileFlags.KEEP_COMMENTS | GLib.KeyFileFlags.KEEP_TRANSLATIONS
 
22
 
 
23
@@ -153,7 +150,7 @@
 
24
         return None
 
25
     try:
 
26
         pixbuf = info.load_icon()
 
27
-    except GError:
 
28
+    except GLib.GError:
 
29
         return None
 
30
     if pixbuf is None:
 
31
         return None