hueso/gajim-plugins
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[plugin_installer] Replace deprecated render_icon()

Browse Source
This commit is contained in:
Philipp Hörist
2017-03-06 12:14:23 +01:00
parent caf0b4e027
commit 8c3aa9730d
1 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
plugin_installer/plugin_installer.py
View File

@@ -51,7 +51,8 @@ PLUGINS_URL = 'https://ftp.gajim.org/plugins_1/'
MANIFEST_URL = 'https://ftp.gajim.org/plugins_1/manifests.zip' MANIFEST_URL = 'https://ftp.gajim.org/plugins_1/manifests.zip'
MANIFEST_IMAGE_URL = 'https://ftp.gajim.org/plugins_1/manifests_images.zip' MANIFEST_IMAGE_URL = 'https://ftp.gajim.org/plugins_1/manifests_images.zip'
MANDATORY_FIELDS = ['name', 'version', 'description', 'authors', 'homepage'] MANDATORY_FIELDS = ['name', 'version', 'description', 'authors', 'homepage']
FALLBACK_ICON = Gtk.IconTheme.get_default().load_icon(
'preferences-system', Gtk.IconSize.MENU, 0)
class Column(IntEnum): class Column(IntEnum):
PIXBUF = 0 PIXBUF = 0
@@ -82,9 +83,6 @@ class PluginInstaller(GajimPlugin):
self.available_plugins_model = None self.available_plugins_model = None
self.timeout_id = 0 self.timeout_id = 0
self.connected_ids = {} self.connected_ids = {}
icon = Gtk.Image()
self.def_icon = icon.render_icon(
Gtk.STOCK_PREFERENCES, Gtk.IconSize.MENU)
def activate(self): def activate(self):
if self.config['check_update']: if self.config['check_update']:
@@ -284,7 +282,7 @@ class PluginInstaller(GajimPlugin):
# get plugin icon # get plugin icon
icon_file = os.path.join(plugin.__path__, os.path.split( icon_file = os.path.join(plugin.__path__, os.path.split(
plugin.__path__)[1]) + '.png' plugin.__path__)[1]) + '.png'
icon = self.def_icon icon = FALLBACK_ICON
if os.path.isfile(icon_file): if os.path.isfile(icon_file):
icon = GdkPixbuf.Pixbuf.new_from_file_at_size(icon_file, 16, 16) icon = GdkPixbuf.Pixbuf.new_from_file_at_size(icon_file, 16, 16)
row = [plugin, plugin.name, is_active, plugin.activatable, icon] row = [plugin, plugin.name, is_active, plugin.activatable, icon]
@@ -339,9 +337,6 @@ class DownloadAsync(threading.Thread):
self.secure = secure self.secure = secure
self.check_update = check_update self.check_update = check_update
self.pulse = None self.pulse = None
icon = Gtk.Image()
self.def_icon = icon.render_icon(
Gtk.STOCK_PREFERENCES, Gtk.IconSize.MENU)
def model_append(self, row): def model_append(self, row):
row_data = [ row_data = [
@@ -407,7 +402,7 @@ class DownloadAsync(threading.Thread):
icon = None icon = None
remote_dir = filename.split('/')[0] remote_dir = filename.split('/')[0]
png_filename = '{0}/{0}.png'.format(remote_dir) png_filename = '{0}/{0}.png'.format(remote_dir)
icon = self.def_icon icon = FALLBACK_ICON
if png_filename in manifest_list: if png_filename in manifest_list:
data = zip_file.open(png_filename).read() data = zip_file.open(png_filename).read()
pix = GdkPixbuf.PixbufLoader() pix = GdkPixbuf.PixbufLoader()