Commits May 2007

commits@gajim.org

4 participants
63 discussions

[commit-gajim] r8165 - trunk/src
by roidelapluie＠gajim.org 20 May '07

20 May '07

Author: roidelapluie Date: 2007-05-20 18:31:09 +0200 (Sun, 20 May 2007) New Revision: 8165 Modified: trunk/src/chat_control.py Log: Fix a bug with highlighing in groupchats. Modified: trunk/src/chat_control.py =================================================================== --- trunk/src/chat_control.py 2007-05-20 16:20:05 UTC (rev 8164) +++ trunk/src/chat_control.py 2007-05-20 16:31:09 UTC (rev 8165) @@ -568,11 +568,9 @@ if ((self.parent_win and (not self.parent_win.get_active_jid() or \ full_jid != self.parent_win.get_active_jid() or \ not self.parent_win.is_active() or not end)) or \ - ((gc_message and (other_tags_for_text == ['marked'] or \ - gajim.config.get('notify_on_all_muc_messages'))) or \ (gc_message and \ gajim.interface.minimized_controls.has_key(self.account) and \ - jid in gajim.interface.minimized_controls[self.account]))) and \ + jid in gajim.interface.minimized_controls[self.account])) and \ kind in ('incoming', 'incoming_queue'): # we want to have save this message in events list # other_tags_for_text == ['marked'] --> highlighted gc message

1 0

[commit-gajim] r8164 - trunk/src
by asterix＠gajim.org 20 May '07

20 May '07

Author: asterix Date: 2007-05-20 18:20:05 +0200 (Sun, 20 May 2007) New Revision: 8164 Modified: trunk/src/groupchat_control.py Log: fix TB Modified: trunk/src/groupchat_control.py =================================================================== --- trunk/src/groupchat_control.py 2007-05-20 15:41:20 UTC (rev 8163) +++ trunk/src/groupchat_control.py 2007-05-20 16:20:05 UTC (rev 8164) @@ -976,7 +976,7 @@ con.request_vcard(real_jid, fake_jid) else: # save sha in mem NOW - self.vcard_shas[fake_jid] = avatar_sha + con.vcard_shas[fake_jid] = avatar_sha actual_role = self.get_role(nick) if role != actual_role:

1 0

[commit-gajim] r8163 - in trunk/src: . common
by asterix＠gajim.org 20 May '07

20 May '07

Author: asterix Date: 2007-05-20 17:41:20 +0200 (Sun, 20 May 2007) New Revision: 8163 Modified: trunk/src/chat_control.py trunk/src/common/connection_handlers.py trunk/src/gajim.py trunk/src/groupchat_control.py trunk/src/roster_window.py trunk/src/vcard.py Log: handle correctly vcards in groupchats : ask them to real jid if we know it, but considere it arrive from fake jid. Fixes #3172, #3173 Modified: trunk/src/chat_control.py =================================================================== --- trunk/src/chat_control.py 2007-05-19 18:04:56 UTC (rev 8162) +++ trunk/src/chat_control.py 2007-05-20 15:41:20 UTC (rev 8163) @@ -1674,24 +1674,34 @@ if not gajim.config.get('show_avatar_in_chat'): return - jid = self.contact.jid - jid_with_resource = jid - if resource: - jid_with_resource += '/' + resource + is_fake = False + if self.TYPE_ID == message_control.TYPE_PM: + is_fake = True + jid_with_resource = self.contact.jid # fake jid + else: + jid_with_resource = self.contact.jid + if resource: + jid_with_resource += '/' + resource # we assume contact has no avatar scaled_pixbuf = None - pixbuf = None - is_fake = False - if gajim.contacts.is_pm_from_jid(self.account, jid): - is_fake = True pixbuf = gtkgui_helpers.get_avatar_pixbuf_from_cache(jid_with_resource, is_fake) if pixbuf == 'ask': # we don't have the vcard - gajim.connections[self.account].request_vcard(jid_with_resource, - is_fake) + if self.TYPE_ID == message_control.TYPE_PM: + if self.gc_contact.jid: + # We know the real jid of this contact + real_jid = self.gc_contact.jid + if self.gc_contact.resource: + real_jid += '/' + self.gc_contact.resource + else: + real_jid = jid_with_resource + gajim.connections[self.account].request_vcard(real_jid, + jid_with_resource) + else: + gajim.connections[self.account].request_vcard(jid_with_resource) return if pixbuf is not None: scaled_pixbuf = gtkgui_helpers.get_scaled_pixbuf(pixbuf, 'chat') Modified: trunk/src/common/connection_handlers.py =================================================================== --- trunk/src/common/connection_handlers.py 2007-05-19 18:04:56 UTC (rev 8162) +++ trunk/src/common/connection_handlers.py 2007-05-20 15:41:20 UTC (rev 8163) @@ -811,6 +811,7 @@ self.vcard_sha = None self.vcard_shas = {} # sha of contacts self.room_jids = [] # list of gc jids so that vcard are saved in a folder + self.groupchat_jids = {} # {ID : groupchat_jid} def add_sha(self, p, send_caps = True): c = p.setTag('x', namespace = common.xmpp.NS_VCARD_UPDATE) @@ -906,9 +907,10 @@ vcard['resource'] = gajim.get_resource_from_jid(fjid) return vcard - def request_vcard(self, jid = None, is_fake_jid = False): - '''request the VCARD. If is_fake_jid is True, it means we request a vcard - to a fake jid, like in private messages in groupchat''' + def request_vcard(self, jid = None, groupchat_jid = None): + '''request the VCARD. If groupchat_jid is not nul, it means we request a vcard + to a fake jid, like in private messages in groupchat. jid can be the + real jid of the contact, but we want to consider it comes from a fake jid''' if not self.connection: return iq = common.xmpp.Iq(typ = 'get') @@ -921,13 +923,13 @@ j = jid if not j: j = gajim.get_jid_from_account(self.name) - self.awaiting_answers[id] = (VCARD_ARRIVED, j) - if is_fake_jid: - room_jid, nick = gajim.get_room_and_nick_from_fjid(jid) + self.awaiting_answers[id] = (VCARD_ARRIVED, j, groupchat_jid) + if groupchat_jid: + room_jid, nick = gajim.get_room_and_nick_from_fjid(groupchat_jid) if not room_jid in self.room_jids: self.room_jids.append(room_jid) + self.groupchat_jids[id] = groupchat_jid self.connection.send(iq) - #('VCARD', {entry1: data, entry2: {entry21: data, ...}, ...}) def send_vcard(self, vcard): if not self.connection: @@ -1010,17 +1012,22 @@ # If vcard is empty, we send to the interface an empty vcard so that # it knows it arrived jid = self.awaiting_answers[id][1] + groupchat_jid = self.awaiting_answers[id][2] + frm = jid + if groupchat_jid: + # We do as if it comes from the fake_jid + frm = groupchat_jid our_jid = gajim.get_jid_from_account(self.name) if iq_obj.getType() == 'error' and jid == our_jid: # our server doesn't support vcard self.vcard_supported = False if not iq_obj.getTag('vCard') or iq_obj.getType() == 'error': - if jid and jid != our_jid: + if frm and frm != our_jid: # Write an empty file - self.save_vcard_to_hd(jid, '') - self.dispatch('VCARD', {'jid': jid}) - elif jid == our_jid: - self.dispatch('MYVCARD', {'jid': jid}) + self.save_vcard_to_hd(frm, '') + self.dispatch('VCARD', {'jid': frm}) + elif frm == our_jid: + self.dispatch('MYVCARD', {'jid': frm}) elif self.awaiting_answers[id][0] == AGENT_REMOVED: jid = self.awaiting_answers[id][1] self.dispatch('AGENT_REMOVED', jid) @@ -1064,10 +1071,15 @@ return if not vc.getTag('vCard').getNamespace() == common.xmpp.NS_VCARD: return + id = vc.getID() frm_iq = vc.getFrom() our_jid = gajim.get_jid_from_account(self.name) resource = '' - if frm_iq: + if id in self.groupchat_jids: + who = self.groupchat_jids[id] + frm, resource = gajim.get_room_and_nick_from_fjid(who) + del self.groupchat_jids[id] + elif frm_iq: who = helpers.get_full_jid_from_iq(vc) frm, resource = gajim.get_room_and_nick_from_fjid(who) else: @@ -1139,6 +1151,7 @@ p = self.add_sha(p) self.connection.send(p) else: + #('VCARD', {entry1: data, entry2: {entry21: data, ...}, ...}) self.dispatch('VCARD', vcard) class ConnectionHandlers(ConnectionVcard, ConnectionBytestream, ConnectionDisco, ConnectionCommands, ConnectionPubSub): @@ -1655,7 +1668,8 @@ if not ptype or ptype == 'unavailable': if gajim.config.get('log_contact_status_changes') and self.name\ not in no_log_for and jid_stripped not in no_log_for: - gc_c = gajim.contacts.get_gc_contact(self.name, jid_stripped, resource) + gc_c = gajim.contacts.get_gc_contact(self.name, jid_stripped, + resource) st = status or '' if gc_c: jid = gc_c.jid @@ -1672,25 +1686,6 @@ gajim.interface.remove_avatar_files(jid_stripped, puny_nick) # if it's a gc presence, don't ask vcard here. We may ask it to # real jid in gui part. - if self.vcard_shas.has_key(who) and not is_gc: - # Verify sha cached in mem - if avatar_sha != self.vcard_shas[who]: - # avatar has been updated - self.request_vcard(who, True) - elif not is_gc: # Verify sha cached in hdd - cached_vcard = self.get_cached_vcard(who, True) - if cached_vcard and cached_vcard.has_key('PHOTO') and \ - cached_vcard['PHOTO'].has_key('SHA'): - cached_sha = cached_vcard['PHOTO']['SHA'] - else: - cached_sha = '' - if cached_sha != avatar_sha: - # avatar has been updated - # sha in mem will be updated later - self.request_vcard(who, True) - else: - # save sha in mem NOW - self.vcard_shas[who] = avatar_sha if ns_muc_user_x: # Room has been destroyed. see # http://www.xmpp.org/extensions/xep-0045.html#destroyroom @@ -1708,7 +1703,8 @@ statusCode = prs.getStatusCode() self.dispatch('GC_NOTIFY', (jid_stripped, show, status, resource, prs.getRole(), prs.getAffiliation(), prs.getJid(), - reason, prs.getActor(), statusCode, prs.getNewNick())) + reason, prs.getActor(), statusCode, prs.getNewNick(), + avatar_sha)) return if ptype == 'subscribe': Modified: trunk/src/gajim.py =================================================================== --- trunk/src/gajim.py 2007-05-19 18:04:56 UTC (rev 8162) +++ trunk/src/gajim.py 2007-05-20 15:41:20 UTC (rev 8163) @@ -814,8 +814,7 @@ show = 'offline' gc_c = gajim.contacts.create_gc_contact(room_jid = jid, name = nick, show = show) - c = gajim.contacts.contact_from_gc_contact(gc_c) - self.roster.new_chat(c, account, private_chat = True) + self.roster.new_private_chat(gc_c, account) ctrl = self.msg_win_mgr.get_control(full_jid_with_resource, account) ctrl.print_conversation('Error %s: %s' % (array[1], array[2]), 'status') @@ -1053,7 +1052,7 @@ def handle_event_gc_notify(self, account, array): #'GC_NOTIFY' (account, (room_jid, show, status, nick, - # role, affiliation, jid, reason, actor, statusCode, newNick)) + # role, affiliation, jid, reason, actor, statusCode, newNick, avatar_sha)) nick = array[3] if not nick: return @@ -1074,7 +1073,7 @@ return if control: control.chg_contact_status(nick, show, status, array[4], array[5], - array[6], array[7], array[8], array[9], array[10]) + array[6], array[7], array[8], array[9], array[10], array[11]) if control and not control.parent_win: gajim.interface.roster.draw_contact(room_jid, account) Modified: trunk/src/groupchat_control.py =================================================================== --- trunk/src/groupchat_control.py 2007-05-19 18:04:56 UTC (rev 8162) +++ trunk/src/groupchat_control.py 2007-05-20 15:41:20 UTC (rev 8163) @@ -97,10 +97,11 @@ class PrivateChatControl(ChatControl): TYPE_ID = message_control.TYPE_PM - def __init__(self, parent_win, contact, acct): + def __init__(self, parent_win, gc_contact, contact, acct): room_jid = contact.jid.split('/')[0] room_ctrl = gajim.interface.msg_win_mgr.get_control(room_jid, acct) self.room_name = room_ctrl.name + self.gc_contact = gc_contact ChatControl.__init__(self, parent_win, contact, acct) self.TYPE_ID = 'pm' @@ -852,7 +853,7 @@ model[iter][C_AVATAR] = scaled_pixbuf def chg_contact_status(self, nick, show, status, role, affiliation, jid, - reason, actor, statusCode, new_nick, tim = None): + reason, actor, statusCode, new_nick, avatar_sha, tim = None): '''When an occupant changes his or her status''' if show == 'invisible': return @@ -861,7 +862,7 @@ role = 'visitor' if not affiliation: affiliation = 'none' - + fake_jid = self.room_jid + '/' + nick newly_created = False if show in ('offline', 'error'): if statusCode == '307': @@ -924,8 +925,7 @@ elif statusCode == 'destroyed': # Room has been destroyed self.print_conversation(reason, 'info', tim) - if len(gajim.events.get_events(self.account, - self.room_jid + '/' + nick)) == 0: + if len(gajim.events.get_events(self.account, fake_jid)) == 0: self.remove_contact(nick) else: c = gajim.contacts.get_gc_contact(self.account, self.room_jid, nick) @@ -948,20 +948,48 @@ if statusCode == '201': # We just created the room gajim.connections[self.account].request_gc_config(self.room_jid) else: + gc_c = gajim.contacts.get_gc_contact(self.account, self.room_jid, + nick) + # Re-get vcard if avatar has changed + # We do that here because we may request it to the real JID if we + # knows it. connections.py doesn't know it. + con = gajim.connections[self.account] + if gc_c.jid: + real_jid = gc_c.jid + if gc_c.resource: + real_jid += '/' + gc_c.resource + else: + real_jid = fake_jid + if con.vcard_shas.has_key(fake_jid): + if avatar_sha != con.vcard_shas[fake_jid]: + con.request_vcard(real_jid, fake_jid) + else: + cached_vcard = con.get_cached_vcard(fake_jid, True) + if cached_vcard and cached_vcard.has_key('PHOTO') and \ + cached_vcard['PHOTO'].has_key('SHA'): + cached_sha = cached_vcard['PHOTO']['SHA'] + else: + cached_sha = '' + if cached_sha != avatar_sha: + # avatar has been updated + # sha in mem will be updated later + con.request_vcard(real_jid, fake_jid) + else: + # save sha in mem NOW + self.vcard_shas[fake_jid] = avatar_sha + actual_role = self.get_role(nick) if role != actual_role: self.remove_contact(nick) self.add_contact_to_roster(nick, show, role, affiliation, status, jid) else: - c = gajim.contacts.get_gc_contact(self.account, self.room_jid, - nick) - if c.show == show and c.status == status and \ - c.affiliation == affiliation: #no change + if gc_c.show == show and gc_c.status == status and \ + gc_c.affiliation == affiliation: # no change return - c.show = show - c.affiliation = affiliation - c.status = status + gc_c.show = show + gc_c.affiliation = affiliation + gc_c.status = status self.draw_contact(nick) if self.parent_win: self.parent_win.redraw_tab(self) @@ -1028,21 +1056,16 @@ server = gajim.get_server_from_jid(self.room_jid) if gajim.config.get('ask_avatars_on_startup') and \ not server.startswith('irc'): - if j: - fjid = j - if resource: - fjid += '/' + resource - else: - fjid = self.room_jid + '/' + nick - if j: - pixbuf = gtkgui_helpers.get_avatar_pixbuf_from_cache(fjid) - else: - pixbuf = gtkgui_helpers.get_avatar_pixbuf_from_cache(fjid, True) + fake_jid = self.room_jid + '/' + nick + pixbuf = gtkgui_helpers.get_avatar_pixbuf_from_cache(fake_jid, True) if pixbuf == 'ask': if j: - gajim.connections[self.account].request_vcard(fjid) + fjid = j + if resource: + fjid += '/' + resource + gajim.connections[self.account].request_vcard(fjid, fake_jid) else: - gajim.connections[self.account].request_vcard(fjid, True) + gajim.connections[self.account].request_vcard(fake_jid, fake_jid) if nick == self.nick: # we became online self.got_connected() self.list_treeview.expand_row((model.get_path(role_iter)), False) @@ -1789,12 +1812,11 @@ def _start_private_message(self, nick): gc_c = gajim.contacts.get_gc_contact(self.account, self.room_jid, nick) - c = gajim.contacts.contact_from_gc_contact(gc_c) - nick_jid = c.jid + nick_jid = gc_c.get_full_jid() win = gajim.interface.msg_win_mgr.get_window(nick_jid, self.account) if not win: - gajim.interface.roster.new_chat(c, self.account, private_chat = True) + gajim.interface.roster.new_private_chat(gc_c, self.account) win = gajim.interface.msg_win_mgr.get_window(nick_jid, self.account) win.set_active_tab(nick_jid, self.account) win.window.present() @@ -2008,9 +2030,6 @@ '''Call vcard_information_window class to display user's information''' c = gajim.contacts.get_gc_contact(self.account, self.room_jid, nick) c2 = gajim.contacts.contact_from_gc_contact(c) - if c.jid: - c2.jid = c.jid - c2.resource = c.resource if gajim.interface.instances[self.account]['infos'].has_key(c2.jid): gajim.interface.instances[self.account]['infos'][c2.jid].window.\ present() Modified: trunk/src/roster_window.py =================================================================== --- trunk/src/roster_window.py 2007-05-19 18:04:56 UTC (rev 8162) +++ trunk/src/roster_window.py 2007-05-20 15:41:20 UTC (rev 8163) @@ -3464,12 +3464,23 @@ self.actions_menu_needs_rebuild = True self.update_status_combobox() - def new_chat(self, contact, account, private_chat = False, resource = None): + def new_private_chat(self, gc_contact, account): + contact = gajim.contacts.contact_from_gc_contact(gc_contact) + type_ = message_control.TYPE_PM + fjid = gc_contact.room_jid + '/' + gc_contact.name + mw = gajim.interface.msg_win_mgr.get_window(fjid, account) + if not mw: + mw = gajim.interface.msg_win_mgr.create_window(contact, account, type_) + + chat_control = PrivateChatControl(mw, gc_contact, contact, account) + mw.new_tab(chat_control) + if len(gajim.events.get_events(account, fjid)): + # We call this here to avoid race conditions with widget validation + chat_control.read_queue() + + def new_chat(self, contact, account, resource = None): # Get target window, create a control, and associate it with the window - if not private_chat: - type_ = message_control.TYPE_CHAT - else: - type_ = message_control.TYPE_PM + type_ = message_control.TYPE_CHAT fjid = contact.jid if resource: @@ -3478,10 +3489,7 @@ if not mw: mw = gajim.interface.msg_win_mgr.create_window(contact, account, type_) - if not private_chat: - chat_control = ChatControl(mw, contact, account, resource) - else: - chat_control = PrivateChatControl(mw, contact, account) + chat_control = ChatControl(mw, contact, account, resource) mw.new_tab(chat_control) Modified: trunk/src/vcard.py =================================================================== --- trunk/src/vcard.py 2007-05-19 18:04:56 UTC (rev 8162) +++ trunk/src/vcard.py 2007-05-20 15:41:20 UTC (rev 8163) @@ -453,8 +453,11 @@ self.fill_status_label() - gajim.connections[self.account].request_vcard(self.contact.jid, - (self.gc_contact is not None and not self.gc_contact.jid)) + if self.gc_contact: + gajim.connections[self.account].request_vcard(self.contact.jid, + self.gc_contact.get_full_jid()) + else: + gajim.connections[self.account].request_vcard(self.contact.jid) def on_close_button_clicked(self, widget): self.window.destroy()

1 0

[commit-gajim] r8162 - trunk/src
by roidelapluie＠gajim.org 19 May '07

19 May '07

Author: roidelapluie Date: 2007-05-19 20:04:56 +0200 (Sat, 19 May 2007) New Revision: 8162 Modified: trunk/src/dialogs.py Log: Fix a little bug in [1861]: now countdown starts immediately Modified: trunk/src/dialogs.py =================================================================== --- trunk/src/dialogs.py 2007-05-19 17:52:20 UTC (rev 8161) +++ trunk/src/dialogs.py 2007-05-19 18:04:56 UTC (rev 8162) @@ -372,6 +372,7 @@ '''Wait for OK or Cancel button to be pressed and return status messsage (None if users pressed Cancel or x button of WM''' if self.countdown_time > 0: + self.countdown() gobject.timeout_add(1000, self.countdown) rep = self.window.run() if rep == gtk.RESPONSE_OK:

1 0

[commit-gajim] r8161 - in trunk/src: . common
by roidelapluie＠gajim.org 19 May '07

19 May '07

Author: roidelapluie Date: 2007-05-19 19:52:20 +0200 (Sat, 19 May 2007) New Revision: 8161 Modified: trunk/src/common/config.py trunk/src/dialogs.py Log: (Fix #2416) Close change status windows after 15 seconds of inactivity Modified: trunk/src/common/config.py =================================================================== --- trunk/src/common/config.py 2007-05-17 20:50:11 UTC (rev 8160) +++ trunk/src/common/config.py 2007-05-19 17:52:20 UTC (rev 8161) @@ -227,6 +227,7 @@ 'treat_incoming_messages': [ opt_str, '', _('Can be empty, \'chat\' or \'normal\'. If not empty, treat all incoming messages as if they were of this type')], 'scroll_roster_to_last_message': [opt_bool, True, _('If True, Gajim will scroll and select the contact who sent you the last message, if chat window is not already opened.')], 'use_latex': [opt_bool, False, _('If True, Gajim will convert string between $$ and $$ to an image using dvips and convert before insterting it in chat window.')], + 'change_status_window_timeout': [opt_int, 15, _('Time of inactivity needed before the change status window closes down.')], } __options_per_key = { Modified: trunk/src/dialogs.py =================================================================== --- trunk/src/dialogs.py 2007-05-17 20:50:11 UTC (rev 8160) +++ trunk/src/dialogs.py 2007-05-19 17:52:20 UTC (rev 8161) @@ -315,10 +315,10 @@ self.window.set_transient_for(gajim.interface.roster.window) if show: uf_show = helpers.get_uf_show(show) - title_text = _('%s Status Message') % uf_show + self.title_text = _('%s Status Message') % uf_show else: - title_text = _('Status Message') - self.window.set_title(title_text) + self.title_text = _('Status Message') + self.window.set_title(self.title_text) message_textview = self.xml.get_widget('message_textview') self.message_buffer = message_textview.get_buffer() @@ -340,6 +340,10 @@ self.preset_messages_dict[msg_name] = msg_text sorted_keys_list = helpers.get_sorted_keys(self.preset_messages_dict) + self.countdown_time = gajim.config.get('change_status_window_timeout') + self.countdown_left = self.countdown_time + self.countdown_enabled = True + self.message_liststore = gtk.ListStore(str) # msg_name self.message_combobox = self.xml.get_widget('message_combobox') self.message_combobox.set_model(self.message_liststore) @@ -351,9 +355,24 @@ self.xml.signal_autoconnect(self) self.window.show_all() + def countdown(self): + if self.countdown_enabled: + if self.countdown_left <= 0: + self.window.response(gtk.RESPONSE_OK) + return False + self.window.set_title('%s [%s]' % (self.title_text, + str(self.countdown_left))) + self.countdown_left -= 1 + return True + else: + self.window.set_title(self.title_text) + return False + def run(self): '''Wait for OK or Cancel button to be pressed and return status messsage (None if users pressed Cancel or x button of WM''' + if self.countdown_time > 0: + gobject.timeout_add(1000, self.countdown) rep = self.window.run() if rep == gtk.RESPONSE_OK: beg, end = self.message_buffer.get_bounds() @@ -368,6 +387,7 @@ return message def on_message_combobox_changed(self, widget): + self.countdown_enabled = False model = widget.get_model() active = widget.get_active() if active < 0: @@ -376,6 +396,7 @@ self.message_buffer.set_text(self.preset_messages_dict[name]) def on_change_status_message_dialog_key_press_event(self, widget, event): + self.countdown_enabled = False if event.keyval == gtk.keysyms.Return or \ event.keyval == gtk.keysyms.KP_Enter: # catch CTRL+ENTER if (event.state & gtk.gdk.CONTROL_MASK): @@ -391,6 +412,7 @@ btn.set_sensitive(True) def on_save_as_preset_button_clicked(self, widget): + self.countdown_enabled = False start_iter, finish_iter = self.message_buffer.get_bounds() status_message_to_save_as_preset = self.message_buffer.get_text( start_iter, finish_iter)

1 0

[commit-gajim] r8160 - trunk/src
by jim++＠gajim.org 17 May '07

17 May '07

Author: jim++ Date: 2007-05-17 22:50:11 +0200 (Thu, 17 May 2007) New Revision: 8160 Modified: trunk/src/groupchat_control.py Log: Put last highlighter on top on stack if he is already in it. Thanks Yann Modified: trunk/src/groupchat_control.py =================================================================== --- trunk/src/groupchat_control.py 2007-05-17 19:54:46 UTC (rev 8159) +++ trunk/src/groupchat_control.py 2007-05-17 20:50:11 UTC (rev 8160) @@ -646,10 +646,12 @@ self.parent_win.redraw_tab(self, 'attention') other_tags_for_name.append('bold') other_tags_for_text.append('marked') - if contact not in self.attention_list: - self.attention_list.append(contact) - if len(self.attention_list) > 6: - self.attention_list.pop(0) # remove older + + if contact in self.attention_list: + self.attention_list.remove(contact) + elif len(self.attention_list) > 6: + self.attention_list.pop(0) # remove older + self.attention_list.append(contact) if sound == 'received': helpers.play_sound('muc_message_received')

1 0

[commit-gajim] r8159 - trunk/src/common
by roidelapluie＠gajim.org 17 May '07

17 May '07

Author: roidelapluie Date: 2007-05-17 21:54:46 +0200 (Thu, 17 May 2007) New Revision: 8159 Modified: trunk/src/common/events.py trunk/src/common/helpers.py Log: Fix a small bug with events and groupchats Modified: trunk/src/common/events.py =================================================================== --- trunk/src/common/events.py 2007-05-17 15:54:23 UTC (rev 8158) +++ trunk/src/common/events.py 2007-05-17 19:54:46 UTC (rev 8159) @@ -28,7 +28,7 @@ show_in_systray = True): ''' type_ in chat, normal, file-request, file-error, file-completed, file-request-error, file-send-error, file-stopped, gc_msg, pm, - printed_chat, printed_gc_msg, printed_pm + printed_chat, printed_gc_msg, printed_marked_gc_msg, printed_pm parameters is (per type_): chat, normal: [message, subject, kind, time, encrypted, resource, msg_id] Modified: trunk/src/common/helpers.py =================================================================== --- trunk/src/common/helpers.py 2007-05-17 15:54:23 UTC (rev 8158) +++ trunk/src/common/helpers.py 2007-05-17 19:54:46 UTC (rev 8159) @@ -873,7 +873,7 @@ 'chat']) unread_single_chat = gajim.events.get_nb_events(types = ['normal']) unread_gc = gajim.events.get_nb_events(types = ['printed_gc_msg', - 'gc_msg']) + 'printed_marked_gc_msg', 'gc_msg']) unread_pm = gajim.events.get_nb_events(types = ['printed_pm', 'pm']) accounts = get_accounts_info()

1 0

[commit-gajim] r8158 - trunk/src
by jim++＠gajim.org 17 May '07

17 May '07

Author: jim++ Date: 2007-05-17 17:54:23 +0200 (Thu, 17 May 2007) New Revision: 8158 Modified: trunk/src/groupchat_control.py Log: [dema/Jim++]show last highlighters first on empty line nick completion. Fixes #2975. Modified: trunk/src/groupchat_control.py =================================================================== --- trunk/src/groupchat_control.py 2007-05-17 15:50:55 UTC (rev 8157) +++ trunk/src/groupchat_control.py 2007-05-17 15:54:23 UTC (rev 8158) @@ -195,6 +195,9 @@ # muc attention flag (when we are mentioned in a muc) # if True, the room has mentioned us self.attention_flag = False + + # sorted list of nicks who mentioned us (last at the end) + self.attention_list = [] self.room_creation = int(time.time()) # Use int to reduce mem usage self.nick_hits = [] self.cmd_hits = [] @@ -643,6 +646,11 @@ self.parent_win.redraw_tab(self, 'attention') other_tags_for_name.append('bold') other_tags_for_text.append('marked') + if contact not in self.attention_list: + self.attention_list.append(contact) + if len(self.attention_list) > 6: + self.attention_list.pop(0) # remove older + if sound == 'received': helpers.play_sound('muc_message_received') elif sound == 'highlight': @@ -1606,6 +1614,13 @@ self.nick_hits = [] # clear the hit list list_nick = gajim.contacts.get_nick_list(self.account, self.room_jid) + if begin == '': + # empty message, show lasts nicks that highlighted us first + for nick in self.attention_list: + if nick in list_nick: + list_nick.remove(nick) + list_nick.insert(0, nick) + list_nick.remove(self.nick) # Skip self for nick in list_nick: if nick.lower().startswith(begin.lower()):

1 0

[commit-gajim] r8157 - trunk/src
by roidelapluie＠gajim.org 17 May '07

17 May '07

Author: roidelapluie Date: 2007-05-17 17:50:55 +0200 (Thu, 17 May 2007) New Revision: 8157 Modified: trunk/src/gajim.py Log: Fix a bug with highlighing in groupchats Modified: trunk/src/gajim.py =================================================================== --- trunk/src/gajim.py 2007-05-17 12:55:44 UTC (rev 8156) +++ trunk/src/gajim.py 2007-05-17 15:50:55 UTC (rev 8157) @@ -2113,7 +2113,7 @@ w = None resource = gajim.get_resource_from_jid(fjid) jid = gajim.get_jid_without_resource(fjid) - if type_ in ('printed_gc_msg', 'gc_msg'): + if type_ in ('printed_gc_msg', 'printed_marked_gc_msg', 'gc_msg'): w = self.msg_win_mgr.get_window(jid, account) elif type_ in ('printed_chat', 'chat', ''): # '' is for log in/out notifications

1 0

[commit-gajim] r8156 - in trunk/src: . common
by roidelapluie＠gajim.org 17 May '07

17 May '07

Author: roidelapluie Date: 2007-05-17 14:55:44 +0200 (Thu, 17 May 2007) New Revision: 8156 Modified: trunk/src/chat_control.py trunk/src/common/helpers.py trunk/src/gajim.py trunk/src/groupchat_control.py trunk/src/roster_window.py Log: Fix a bug with receiving Private Messages when roster is minimized, print the number of unread pm in roster, and change icon when a pm is received. Modified: trunk/src/chat_control.py =================================================================== --- trunk/src/chat_control.py 2007-05-17 08:39:21 UTC (rev 8155) +++ trunk/src/chat_control.py 2007-05-17 12:55:44 UTC (rev 8156) @@ -827,9 +827,15 @@ room_jid, nick = gajim.get_room_and_nick_from_fjid(jid) groupchat_control = gajim.interface.msg_win_mgr.get_control( room_jid, self.account) + if not groupchat_control and \ + gajim.interface.minimized_controls.has_key(self.account) and \ + room_jid in gajim.interface.minimized_controls[self.account]: + groupchat_control = \ + gajim.interface.minimized_controls[self.account][room_jid] groupchat_control.draw_contact(nick) mw = gajim.interface.msg_win_mgr.get_window(room_jid, self.account) - mw.redraw_tab(groupchat_control) + if mw: + mw.redraw_tab(groupchat_control) else: gajim.interface.roster.draw_contact(jid, self.account) gajim.interface.roster.show_title() Modified: trunk/src/common/helpers.py =================================================================== --- trunk/src/common/helpers.py 2007-05-17 08:39:21 UTC (rev 8155) +++ trunk/src/common/helpers.py 2007-05-17 12:55:44 UTC (rev 8156) @@ -548,6 +548,10 @@ if account and gajim.events.get_nb_roster_events(account, contact.get_full_jid()): return 'message' + if account and gajim.interface.minimized_controls.has_key(account) and \ + contact.jid in gajim.interface.minimized_controls[account] and gajim.interface.\ + minimized_controls[account][contact.jid].get_nb_unread_pm() > 0: + return 'message' if contact.jid.find('@') <= 0: # if not '@' or '@' starts the jid ==> agent return contact.show if contact.sub in ('both', 'to'): Modified: trunk/src/gajim.py =================================================================== --- trunk/src/gajim.py 2007-05-17 08:39:21 UTC (rev 8155) +++ trunk/src/gajim.py 2007-05-17 12:55:44 UTC (rev 8156) @@ -686,6 +686,10 @@ jid = jid.replace('@', '') groupchat_control = self.msg_win_mgr.get_control(jid, account) + if not groupchat_control and \ + gajim.interface.minimized_controls.has_key(account) and \ + jid in gajim.interface.minimized_controls[account]: + groupchat_control = gajim.interface.minimized_controls[account][jid] pm = False if groupchat_control and groupchat_control.type_id == \ message_control.TYPE_GC: Modified: trunk/src/groupchat_control.py =================================================================== --- trunk/src/groupchat_control.py 2007-05-17 08:39:21 UTC (rev 8155) +++ trunk/src/groupchat_control.py 2007-05-17 12:55:44 UTC (rev 8156) @@ -543,14 +543,16 @@ self.room_jid, icon_name = 'message') image = state_images['message'] model[iter][C_IMG] = image - self.parent_win.show_title() - self.parent_win.redraw_tab(self) + if self.parent_win: + self.parent_win.show_title() + self.parent_win.redraw_tab(self) else: self._start_private_message(nick) # Scroll to line self.list_treeview.expand_row(path[0:1], False) self.list_treeview.scroll_to_cell(path) self.list_treeview.set_cursor(path) + gajim.interface.roster.draw_contact(self.room_jid, self.account) def get_contact_iter(self, nick): model = self.list_treeview.get_model() Modified: trunk/src/roster_window.py =================================================================== --- trunk/src/roster_window.py 2007-05-17 08:39:21 UTC (rev 8155) +++ trunk/src/roster_window.py 2007-05-17 12:55:44 UTC (rev 8156) @@ -581,13 +581,17 @@ name = gobject.markup_escape_text(contact.get_shown_name()) # gets number of unread gc marked messages - nb_unread = len(gajim.events.get_events(account, jid, - ['printed_marked_gc_msg'])) + if gajim.interface.minimized_controls.has_key(account) and \ + jid in gajim.interface.minimized_controls[account]: + nb_unread = len(gajim.events.get_events(account, jid, + ['printed_marked_gc_msg'])) + nb_unread += \ + gajim.interface.minimized_controls[account][jid].get_nb_unread_pm() - if nb_unread == 1: - name = '%s *' % name - elif nb_unread > 1: - name = '%s [%s]' % (name, str(nb_unread)) + if nb_unread == 1: + name = '%s *' % name + elif nb_unread > 1: + name = '%s [%s]' % (name, str(nb_unread)) strike = False if jid in gajim.connections[account].blocked_contacts:

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits May 2007