From da6214f623ce8dd127d2b941561cbf50cfcd1734 Mon Sep 17 00:00:00 2001 From: Emmanuel Gil Peyrot Date: Sat, 2 Apr 2016 12:59:42 +0100 Subject: [PATCH] Fix a few deprecation warnings. --- src/cell_renderer_image.py | 2 +- src/gtkgui_helpers.py | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/cell_renderer_image.py b/src/cell_renderer_image.py index 3c2163dc7..94bc6cb0e 100644 --- a/src/cell_renderer_image.py +++ b/src/cell_renderer_image.py @@ -30,7 +30,7 @@ class CellRendererImage(Gtk.CellRendererPixbuf): __gproperties__ = { 'image': (GObject.TYPE_OBJECT, 'Image', - 'Image', GObject.PARAM_READWRITE), + 'Image', GObject.ParamFlags.READWRITE), } def __init__(self, col_index, tv_index): diff --git a/src/gtkgui_helpers.py b/src/gtkgui_helpers.py index b9ee88c3a..dc4e1821f 100644 --- a/src/gtkgui_helpers.py +++ b/src/gtkgui_helpers.py @@ -32,7 +32,7 @@ import gi 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 @@ gtk_icon_theme.append_search_path(gajim.ICONS_DIR) 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 @@ def get_icon_path(icon_name, size=16): 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 @@ def get_pixbuf_from_data(file_data, want_type = False): 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: