From 2c2e946a88bd2e148f178a0975a88def2ec9947a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20H=C3=B6rist?= <forenjunkie@chello.at>
Date: Fri, 27 Oct 2017 12:48:01 +0200
Subject: [PATCH] Use icons from IconTheme in HistoryWindow
---
gajim/gtkgui_helpers.py | 4 ++--
gajim/history_window.py | 14 ++++++--------
2 files changed, 8 insertions(+), 10 deletions(-)
diff --git a/gajim/gtkgui_helpers.py b/gajim/gtkgui_helpers.py
index aaf4485763..a836188c19 100644
--- a/gajim/gtkgui_helpers.py
+++ b/gajim/gtkgui_helpers.py
@@ -140,11 +140,11 @@ def get_completion_liststore(entry):
(Pixbuf, Text) rows
"""
completion = Gtk.EntryCompletion()
- liststore = Gtk.ListStore(GdkPixbuf.Pixbuf, str)
+ liststore = Gtk.ListStore(str, str)
render_pixbuf = Gtk.CellRendererPixbuf()
completion.pack_start(render_pixbuf, False)
- completion.add_attribute(render_pixbuf, 'pixbuf', 0)
+ completion.add_attribute(render_pixbuf, 'icon_name', 0)
render_text = Gtk.CellRendererText()
completion.pack_start(render_text, True)
diff --git a/gajim/history_window.py b/gajim/history_window.py
index 7823044dcc..3543227503 100644
--- a/gajim/history_window.py
+++ b/gajim/history_window.py
@@ -169,10 +169,8 @@ class HistoryWindow:
for account in self.accounts_seen_online:
completion_dict.update(helpers.get_contact_dict_for_account(account))
- muc_active_img = gtkgui_helpers.load_icon('muc_active')
- contact_img = app.interface.jabber_state_images['16']['online']
- muc_active_pix = muc_active_img.get_pixbuf()
- contact_pix = contact_img.get_pixbuf()
+ muc_active_icon = gtkgui_helpers.get_iconset_name_for('muc-active')
+ online_icon = gtkgui_helpers.get_iconset_name_for('online')
keys = list(completion_dict.keys())
# Move the actual jid at first so we load history faster
@@ -204,7 +202,7 @@ class HistoryWindow:
if app.logger.jid_is_room_jid(completed) or\
app.logger.jid_is_from_pm(completed):
- pix = muc_active_pix
+ icon = muc_active_icon
if app.logger.jid_is_from_pm(completed):
# It's PM. Make it easier to find
room, nick = app.get_room_and_nick_from_fjid(completed)
@@ -214,11 +212,11 @@ class HistoryWindow:
completed2 = info_completion2
info_name = nick
else:
- pix = contact_pix
+ icon = online_icon
if len(completed) > 70:
completed = completed[:70] + '[\u2026]'
- liststore.append((pix, completed))
+ liststore.append((icon, completed))
self.completion_dict[key] = (info_jid, info_acc, info_name,
info_completion)
self.completion_dict[completed] = (info_jid, info_acc,
@@ -226,7 +224,7 @@ class HistoryWindow:
if completed2:
if len(completed2) > 70:
completed2 = completed2[:70] + '[\u2026]'
- liststore.append((pix, completed2))
+ liststore.append((icon, completed2))
self.completion_dict[completed2] = (info_jid, info_acc,
info_name, info_completion2)
if key == actual_jid:
--
GitLab