From 7e4b2571126ba0f889236f9f7e70a71e49d7c33a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Apitzsch?= Date: Sat, 22 Apr 2017 23:49:11 +0200 Subject: [PATCH] fix "Unable to load icon gajim" errors caused by !84 --- src/config.py | 2 +- src/dialogs.py | 2 +- src/gui_interface.py | 4 ++-- src/history_manager.py | 2 +- src/notify.py | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/config.py b/src/config.py index f34df2cf5..69d96afb2 100644 --- a/src/config.py +++ b/src/config.py @@ -3686,7 +3686,7 @@ class AccountCreationWizardWindow: if self.modify: img.set_from_stock(Gtk.STOCK_APPLY, Gtk.IconSize.DIALOG) else: - path_to_file = gtkgui_helpers.get_icon_path('gajim', 48) + path_to_file = gtkgui_helpers.get_icon_path('org.gajim.Gajim', 48) img.set_from_file(path_to_file) self.show_vcard_checkbutton.set_active(not self.modify) self.notebook.set_current_page(6) # show finish page diff --git a/src/dialogs.py b/src/dialogs.py index 235da9c18..2058455f2 100644 --- a/src/dialogs.py +++ b/src/dialogs.py @@ -1339,7 +1339,7 @@ class AboutDialog(Gtk.AboutDialog): self.props.wrap_license = True - pixbuf = gtkgui_helpers.get_icon_pixmap('gajim', 128) + pixbuf = gtkgui_helpers.get_icon_pixmap('org.gajim.Gajim', 128) self.set_logo(pixbuf) #here you write your name in the form Name FamilyName diff --git a/src/gui_interface.py b/src/gui_interface.py index e5d2f9bce..d1589062c 100644 --- a/src/gui_interface.py +++ b/src/gui_interface.py @@ -2352,7 +2352,7 @@ class Interface: status = status + '.png' elif status == 'online': prefix = '' - status = gtkgui_helpers.get_icon_path('gajim', 32) + status = gtkgui_helpers.get_icon_path('org.gajim.Gajim', 32) path = os.path.join(prefix, status) try: obj = bus.get_object('com.google.code.Awn', '/com/google/code/Awn') @@ -3040,7 +3040,7 @@ class Interface: pixs = [] for size in (16, 32, 48, 64, 128): - pix = gtkgui_helpers.get_icon_pixmap('gajim', size) + pix = gtkgui_helpers.get_icon_pixmap('org.gajim.Gajim', size) if pix: pixs.append(pix) if pixs: diff --git a/src/history_manager.py b/src/history_manager.py index ae6841821..6b06c731a 100644 --- a/src/history_manager.py +++ b/src/history_manager.py @@ -94,7 +94,7 @@ class HistoryManager: def __init__(self): pixs = [] for size in (16, 32, 48, 64, 128): - pix = gtkgui_helpers.get_icon_pixmap('gajim', size) + pix = gtkgui_helpers.get_icon_pixmap('org.gajim.Gajim', size) if pix: pixs.append(pix) if pixs: diff --git a/src/notify.py b/src/notify.py index 855b7edaa..b7cab742f 100644 --- a/src/notify.py +++ b/src/notify.py @@ -321,7 +321,7 @@ class DesktopNotification: notification_text = ('' \ '%(title)s
%(text)s') % {'title': self.title, 'text': self.text, 'image': self.path_to_image} - gajim_icon = gtkgui_helpers.get_icon_path('gajim', 48) + gajim_icon = gtkgui_helpers.get_icon_path('org.gajim.Gajim', 48) try: self.notif.Notify( dbus.String(_('Gajim')), # app_name (string) @@ -391,7 +391,7 @@ class DesktopNotification: '%s' % (self.path_to_image, text) self.path_to_image = os.path.abspath( - gtkgui_helpers.get_icon_path('gajim', 48)) + gtkgui_helpers.get_icon_path('org.gajim.Gajim', 48)) actions = () if 'actions' in self.capabilities and self.msg_type: actions = (dbus.String('default'), dbus.String(