mirrors/deluge
0
0
Fork 0
mirror of https://git.deluge-torrent.org/deluge synced 2025-08-07 00:48:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix compatibility for Python2.5 and Debian Lenny

Browse source 
Recent commit to handle warnings were >=Py2.6 and glib binding is
unavailable on Debian Lenny.
This commit is contained in:
Calum Lind 2012-02-15 22:37:36 +00:00
commit 85b1753a28
2 changed files with 13 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

8
deluge/ui/gtkui/filtertreeview.py
View file

@ -38,7 +38,6 @@
import gtk import gtk
import gtk.glade import gtk.glade
import pkg_resources import pkg_resources
import glib
import warnings import warnings
import deluge.component as component import deluge.component as component
@ -259,9 +258,12 @@ class FilterTreeView(component.Component):
count = model.get_value(row, 3) count = model.get_value(row, 3)
#Supress Warning: g_object_set_qdata: assertion `G_IS_OBJECT (object)' failed #Supress Warning: g_object_set_qdata: assertion `G_IS_OBJECT (object)' failed
with warnings.catch_warnings(): original_filters = warnings.filters[:]
warnings.simplefilter("ignore") warnings.simplefilter("ignore")
try:
pix = model.get_value(row, 4) pix = model.get_value(row, 4)
finally:
warnings.filters = original_filters
if pix: if pix:
self.renderpix.set_property("visible", True) self.renderpix.set_property("visible", True)
@ -289,7 +291,7 @@ class FilterTreeView(component.Component):
if pix: if pix:
try: try:
return gtk.gdk.pixbuf_new_from_file(deluge.common.get_pixmap("%s16.png" % pix)) return gtk.gdk.pixbuf_new_from_file(deluge.common.get_pixmap("%s16.png" % pix))
except glib.GError as e: except Exception, e:
log.warning(e) log.warning(e)
return self.get_transparent_pix(16, 16) return self.get_transparent_pix(16, 16)

7
deluge/ui/gtkui/torrentview.py
View file

@ -83,11 +83,16 @@ def cell_data_statusicon(column, cell, model, row, data):
"""Display text with an icon""" """Display text with an icon"""
try: try:
icon = ICON_STATE[model.get_value(row, data)] icon = ICON_STATE[model.get_value(row, data)]
#Supress Warning: g_object_set_qdata: assertion `G_IS_OBJECT (object)' failed #Supress Warning: g_object_set_qdata: assertion `G_IS_OBJECT (object)' failed
with warnings.catch_warnings(): original_filters = warnings.filters[:]
warnings.simplefilter("ignore") warnings.simplefilter("ignore")
try:
if cell.get_property("pixbuf") != icon: if cell.get_property("pixbuf") != icon:
cell.set_property("pixbuf", icon) cell.set_property("pixbuf", icon)
finally:
warnings.filters = original_filters
except KeyError: except KeyError:
pass pass