Philipp Hörist pushed to branch master at gajim / gajim
Commits:
7e4b2571 by André Apitzsch at 2017-04-23T00:30:19+02:00
fix "Unable to load icon gajim" errors caused by !84
- - - - -
575afb08 by Philipp Hörist at 2017-04-23T01:01:29+02:00
Merge branch 'fixGetIcon' into 'master'
fix "Unable to load icon gajim" errors caused by !84
See merge request !87
- - - - -
5 changed files:
- src/config.py
- src/dialogs.py
- src/gui_interface.py
- src/history_manager.py
- src/notify.py
Changes:
=====================================
src/config.py
=====================================
--- 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
=====================================
src/dialogs.py
=====================================
--- 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
<someone@somewhere>
=====================================
src/gui_interface.py
=====================================
--- 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:
=====================================
src/history_manager.py
=====================================
--- 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:
=====================================
src/notify.py
=====================================
--- a/src/notify.py
+++ b/src/notify.py
@@ -321,7 +321,7 @@ class DesktopNotification:
notification_text = ('<html><img src="%(image)s" align=left />' \
'%(title)s<br/>%(text)s</html>') % {'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:
'<td>%s</td></tr></table>' % (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(
View it on GitLab:
https://dev.gajim.org/gajim/gajim/compare/25f403863efd3bff9fb42cbf7da2048d05d5e844...575afb08379662a4c384472f7aafd44faf6cb482
_______________________________________________
Commits mailing list
[email protected]
https://lists.gajim.org/cgi-bin/listinfo/commits
