From dce057d29e0c25e9e1700fede378de88227690b5 Mon Sep 17 00:00:00 2001
From: Yann Leboulanger <asterix@lagaule.org>
Date: Mon, 13 Mar 2006 13:25:51 +0000
Subject: [PATCH] avatars are in gc roster. gc avatar images are saved in
room_jid folder. Fixes #1121
---
src/common/connection.py | 17 ++++++++++++-----
src/gajim.py | 12 +++++++++---
src/groupchat_control.py | 36 +++++++++++++++++++++++++++++++-----
src/vcard.py | 5 ++++-
4 files changed, 56 insertions(+), 14 deletions(-)
diff --git a/src/common/connection.py b/src/common/connection.py
index 2220cc927c..9827ffeafd 100644
--- a/src/common/connection.py
+++ b/src/common/connection.py
@@ -325,19 +325,26 @@ class Connection:
self.save_vcard_to_hd(who, card)
# Save the decoded avatar to a separate file too, and generate files for dbus notifications
puny_jid = punycode_encode(frm)
+ puny_nick = None
+ begin_path = os.path.join(gajim.AVATAR_PATH, puny_jid)
+ if frm in self.room_jids:
+ puny_nick = punycode_encode(resource)
+ # create folder if needed
+ if not os.path.isdir(begin_path):
+ os.mkdir(begin_path, 0700)
+ begin_path = os.path.join(begin_path, puny_nick)
if photo_decoded:
- avatar_file = os.path.join(gajim.AVATAR_PATH,
- puny_jid + '_notif_size_colored.png')
+ avatar_file = begin_path + '_notif_size_colored.png'
if frm == our_jid and avatar_sha != self.vcard_sha:
- gajim.interface.save_avatar_files(frm, photo_decoded)
+ gajim.interface.save_avatar_files(frm, photo_decoded, puny_nick)
elif frm != our_jid and (not os.path.exists(avatar_file) or \
not self.vcard_shas.has_key(frm) or \
avatar_sha != self.vcard_shas[frm]):
- gajim.interface.save_avatar_files(frm, photo_decoded)
+ gajim.interface.save_avatar_files(frm, photo_decoded, puny_nick)
else:
for ext in ('.jpeg', '.png', '_notif_size_bw.png',
'_notif_size_colored.png'):
- path = os.path.join(gajim.AVATAR_PATH, puny_jid + ext)
+ path = begin_path + ext
if os.path.isfile(path):
os.remove(path)
diff --git a/src/gajim.py b/src/gajim.py
index c3dc4bc1e8..1cc1a458ae 100755
--- a/src/gajim.py
+++ b/src/gajim.py
@@ -762,8 +762,12 @@ class Interface:
if win and ctrl.type_id != message_control.TYPE_GC:
ctrl.show_avatar()
- # Show avatar in roster
- self.roster.draw_avatar(jid, account)
+ # Show avatar in roster or gc_roster
+ gc_ctrl = gajim.interface.msg_win_mgr.get_control(jid, account)
+ if gc_ctrl:
+ gc_ctrl.draw_avatar(resource)
+ else:
+ self.roster.draw_avatar(jid, account)
if self.remote_ctrl:
self.remote_ctrl.raise_signal('VcardInfo', (account, vcard))
@@ -968,10 +972,12 @@ class Interface:
path = gtkgui_helpers.get_path_to_generic_or_avatar(img)
notify.notify(_('New E-mail'), jid, account, 'gmail', path_to_image = path, text = txt)
- def save_avatar_files(self, jid, photo_decoded):
+ def save_avatar_files(self, jid, photo_decoded, puny_nick = None):
'''Save the decoded avatar to a separate file, and generate files for dbus notifications'''
puny_jid = punycode_encode(jid)
path_to_file = os.path.join(gajim.AVATAR_PATH, puny_jid)
+ if puny_nick:
+ path_to_file = os.path.join(path_to_file, puny_nick)
# remove old avatars
for typ in ('jpeg', 'png'):
path_to_original_file = path_to_file + '.' + typ
diff --git a/src/groupchat_control.py b/src/groupchat_control.py
index 962c7a9c3c..8c45e7c26a 100644
--- a/src/groupchat_control.py
+++ b/src/groupchat_control.py
@@ -61,7 +61,8 @@ C_IMG, # image to show state (online, new message etc)
C_TYPE, # type of the row ('contact' or 'group')
C_NICK, # contact nickame or group name
C_TEXT, # text shown in the cellrenderer
-) = range(4)
+C_AVATAR, # avatar of the contact
+) = range(5)
class PrivateChatControl(ChatControl):
TYPE_ID = message_control.TYPE_PM
@@ -156,7 +157,7 @@ class GroupchatControl(ChatControlBase):
self.list_treeview.connect('size-allocate', self.on_treeview_size_allocate)
#status_image, type, nickname, shown_nick
- store = gtk.TreeStore(gtk.Image, str, str, str)
+ store = gtk.TreeStore(gtk.Image, str, str, str, gtk.gdk.Pixbuf)
store.set_sort_column_id(C_TEXT, gtk.SORT_ASCENDING)
column = gtk.TreeViewColumn('contacts')
renderer_image = cell_renderer_image.CellRendererImage(0, 0)
@@ -166,8 +167,12 @@ class GroupchatControl(ChatControlBase):
renderer_text = gtk.CellRendererText()
column.pack_start(renderer_text, expand = True)
column.set_attributes(renderer_text, markup = C_TEXT)
+ renderer_pixbuf = gtk.CellRendererPixbuf() # avatar image
+ column.pack_start(renderer_pixbuf, expand = False)
+ column.add_attribute(renderer_pixbuf, 'pixbuf', C_AVATAR)
column.set_cell_data_func(renderer_image, self.tree_cell_data_func, None)
column.set_cell_data_func(renderer_text, self.tree_cell_data_func, None)
+ column.set_cell_data_func(renderer_pixbuf, self.tree_cell_data_func, None)
self.list_treeview.append_column(column)
self.list_treeview.set_model(store)
@@ -616,6 +621,21 @@ class GroupchatControl(ChatControlBase):
model[iter][C_IMG] = image
model[iter][C_TEXT] = name
+ self.draw_avatar(nick)
+
+ def draw_avatar(self, nick):
+ model = self.list_treeview.get_model()
+ iter = self.get_contact_iter(nick)
+ if gajim.config.get('show_avatars_in_roster'):
+ pixbuf = gtkgui_helpers.get_avatar_pixbuf_from_cache(self.room_jid + \
+ '/' + nick, True)
+ if pixbuf in ('ask', None):
+ scaled_pixbuf = None
+ else:
+ scaled_pixbuf = gtkgui_helpers.get_scaled_pixbuf(pixbuf, 'roster')
+ else:
+ scaled_pixbuf = None
+ model[iter][C_AVATAR] = scaled_pixbuf
def chg_contact_status(self, nick, show, status, role, affiliation, jid, reason, actor,
statusCode, new_nick):
@@ -720,15 +740,21 @@ class GroupchatControl(ChatControlBase):
role_iter = self.get_role_iter(role)
if not role_iter:
role_iter = model.append(None,
- (gajim.interface.roster.jabber_state_images['16']['closed'], 'role', role,
- '<b>%s</b>' % role_name))
- iter = model.append(role_iter, (None, 'contact', nick, name))
+ (gajim.interface.roster.jabber_state_images['16']['closed'], 'role',
+ role, '<b>%s</b>' % role_name, None))
+ iter = model.append(role_iter, (None, 'contact', nick, name, None))
if not nick in gajim.contacts.get_nick_list(self.account, self.room_jid):
gc_contact = gajim.contacts.create_gc_contact(room_jid = self.room_jid,
name = nick, show = show, status = status, role = role,
affiliation = affiliation, jid = j, resource = resource)
gajim.contacts.add_gc_contact(self.account, gc_contact)
self.draw_contact(nick)
+ self.draw_avatar(nick)
+ if gajim.config.get('ask_avatars_on_startup'):
+ fjid = self.room_jid + '/' + nick
+ pixbuf = gtkgui_helpers.get_avatar_pixbuf_from_cache(fjid, True)
+ if pixbuf == 'ask':
+ gajim.connections[self.account].request_vcard(fjid, True)
if nick == self.nick: # we became online
self.got_connected()
self.list_treeview.expand_row((model.get_path(role_iter)), False)
diff --git a/src/vcard.py b/src/vcard.py
index 889d10b652..fca54418c0 100644
--- a/src/vcard.py
+++ b/src/vcard.py
@@ -412,7 +412,10 @@ class VcardWindow:
self.fill_status_label()
- gajim.connections[self.account].request_vcard(self.contact.jid)
+ is_fake = False
+ if gajim.contacts.is_pm_from_jid(self.account, self.contact.jid):
+ is_fake = True
+ gajim.connections[self.account].request_vcard(self.contact.jid, is_fake)
def add_to_vcard(self, vcard, entry, txt):
'''Add an information to the vCard dictionary'''
--
GitLab