gajim: merge

[Gajim]

changeset f03f45a3c712 in /home/hg/repos/gajim

author: Yann Leboulanger <aste...@lagaule.org>
branches: 
details:http://hg.gajim.org/gajim?cmd=changeset;node=f03f45a3c712
description: merge

diffstat:

 src/cell_renderer_image.py |  2 +-
 src/gtkgui_helpers.py      |  8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diffs (51 lines):

diff -r 939b6bc81b28 -r f03f45a3c712 src/cell_renderer_image.py
--- a/src/cell_renderer_image.py        Sat Apr 02 14:06:20 2016 +0200
+++ b/src/cell_renderer_image.py        Sat Apr 02 14:22:02 2016 +0200
@@ -30,7 +30,7 @@
 
     __gproperties__ = {
             'image': (GObject.TYPE_OBJECT, 'Image',
-                    'Image', GObject.PARAM_READWRITE),
+                      'Image', GObject.ParamFlags.READWRITE),
     }
 
     def __init__(self, col_index, tv_index):
diff -r 939b6bc81b28 -r f03f45a3c712 src/gtkgui_helpers.py
--- a/src/gtkgui_helpers.py     Sat Apr 02 14:06:20 2016 +0200
+++ b/src/gtkgui_helpers.py     Sat Apr 02 14:22:02 2016 +0200
@@ -32,7 +32,7 @@
 from gi.repository import Gtk
 from gi.repository import Gdk
 from gi.repository import GdkPixbuf
-from gi.repository import GObject
+from gi.repository import GLib
 from gi.repository import Pango
 import os
 import sys
@@ -51,7 +51,7 @@
 def get_icon_pixmap(icon_name, size=16, quiet=False):
     try:
         return gtk_icon_theme.load_icon(icon_name, size, 0)
-    except GObject.GError as e:
+    except GLib.GError as e:
         if not quiet:
             log.error('Unable to load icon %s: %s' % (icon_name, str(e)))
 
@@ -63,7 +63,7 @@
             return ""
         else:
             return icon_info.get_filename()
-    except GObject.GError as e:
+    except GLib.GError as e:
         log.error("Unable to find icon %s: %s" % (icon_name, str(e)))
 
 import vcard
@@ -419,7 +419,7 @@
         pixbufloader.write(file_data)
         pixbufloader.close()
         pixbuf = pixbufloader.get_pixbuf()
-    except GObject.GError: # 'unknown image format'
+    except GLib.GError: # 'unknown image format'
         pixbufloader.close()
         pixbuf = None
         if want_type:
_______________________________________________
Commits mailing list
Commits@gajim.org
https://lists.gajim.org/cgi-bin/listinfo/commits