Yann Leboulanger pushed to branch master at gajim / gajim

Commits: f4cae17d by Emmanuel Gil Peyrot at 2017-12-13T23:19:16+01:00 Remove support for AWN, which isn’t maintained anymore

- - - - - 2604c22e by Yann Leboulanger at 2017-12-13T23:32:50+01:00 Merge branch 'remove-awn-support' into 'master'

Remove support for AWN

See merge request gajim/gajim!168 - - - - -

2 changed files:

- gajim/gui_interface.py - gajim/roster_window.py

Changes:

===================================== gajim/gui_interface.py ===================================== --- a/gajim/gui_interface.py +++ b/gajim/gui_interface.py @@ -2185,33 +2185,6 @@ class Interface: ################################################################################

- @staticmethod - def change_awn_icon_status(status): - if not dbus_support.supported: - # do nothing if user doesn't have D-Bus bindings - return - try: - bus = dbus.SessionBus() - if not 'com.google.code.Awn' in bus.list_names(): - # Awn is not installed - return - except Exception: - return - iconset = app.config.get('iconset') - prefix = os.path.join(helpers.get_iconset_path(iconset), '32x32') - if status in ('chat', 'away', 'xa', 'dnd', 'invisible', 'offline'): - status = status + '.png' - elif status == 'online': - prefix = '' - 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') - awn = dbus.Interface(obj, 'com.google.code.Awn') - awn.SetTaskIconByName('Gajim', os.path.abspath(path)) - except Exception: - pass - def enable_music_listener(self): listener = MusicTrackListener.get() if not self.music_track_changed_signal:

===================================== gajim/roster_window.py ===================================== --- a/gajim/roster_window.py +++ b/gajim/roster_window.py @@ -2335,7 +2335,6 @@ class RosterWindow: liststore.prepend([status_combobox_text, app.interface.jabber_state_images['16'][show], show, False]) self.status_combobox.set_active(0) - app.interface.change_awn_icon_status(show) self.combobox_callback_active = True if app.interface.systray_enabled: app.interface.systray.change_status(show)

View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/4e7fcea288ac957a746b85c9482ba6dc3a...

--- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/4e7fcea288ac957a746b85c9482ba6dc3a... You're receiving this email because of your account on dev.gajim.org.