Philipp Hörist pushed to branch gajim_1.0 at gajim / gajim

Commits: 4caf1ffe by Philipp Hörist at 2018-02-14T20:09:34+01:00 Dont show avatars as Window icon

Avatars are now Surfaces, Gtk.Window has no method yet to add Surfaces as icons.

Transforming them back to pixbufs is not viable because pixbufs cant hold the scale information, and we have no way to set it.

This was only used with single chat windows, which is a mode that came out of style and is probably not used often anymore.

Fixes #8895

- - - - -

1 changed file:

- gajim/message_window.py

Changes:

===================================== gajim/message_window.py ===================================== --- a/gajim/message_window.py +++ b/gajim/message_window.py @@ -469,31 +469,13 @@ class MessageWindow(object):

def show_icon(self): window_mode = app.interface.msg_win_mgr.mode - icon = None - if window_mode == MessageWindowMgr.ONE_MSG_WINDOW_NEVER: - ctrl = self.get_active_control() - if not ctrl: - return - icon = ctrl.get_tab_image(count_unread=False) - elif window_mode == MessageWindowMgr.ONE_MSG_WINDOW_ALWAYS: - pass # keep default icon - elif window_mode == MessageWindowMgr.ONE_MSG_WINDOW_ALWAYS_WITH_ROSTER: - pass # keep default icon - elif window_mode == MessageWindowMgr.ONE_MSG_WINDOW_PERACCT: - pass # keep default icon - elif window_mode == MessageWindowMgr.ONE_MSG_WINDOW_PERTYPE: + icon = 'org.gajim.Gajim' + if window_mode in (MessageWindowMgr.ONE_MSG_WINDOW_PERTYPE, + MessageWindowMgr.ONE_MSG_WINDOW_NEVER): if self.type_ == 'gc': icon = gtkgui_helpers.get_iconset_name_for('muc-active') - else: - # chat, pm - icon = 'org.gajim.Gajim' - if icon: - if isinstance(icon, GdkPixbuf.Pixbuf): - self.window.set_icon(icon) - elif isinstance(icon, str): - self.window.set_icon_name(icon) - else: - self.window.set_icon(icon.get_pixbuf()) + + self.window.set_icon_name(icon)

def show_title(self, urgent=True, control=None): """

View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/4caf1ffe59951cf3d2a08b3043536260672...

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