Commits August 2007

commits@gajim.org

7 participants
239 discussions

[commit-gajim] r8685 - in trunk: . src src/common
by steve-e＠gajim.org 31 Aug '07

31 Aug '07

Author: steve-e Date: 2007-09-01 01:19:23 +0200 (Sat, 01 Sep 2007) New Revision: 8685 Modified: trunk/AUTHORS trunk/src/chat_control.py trunk/src/common/config.py trunk/src/common/connection.py trunk/src/common/contacts.py trunk/src/common/events.py trunk/src/common/helpers.py trunk/src/common/optparser.py trunk/src/config.py trunk/src/dialogs.py trunk/src/features_window.py trunk/src/gajim.py trunk/src/gajim_themes_window.py trunk/src/groupchat_control.py trunk/src/gtkgui_helpers.py trunk/src/message_control.py trunk/src/message_window.py trunk/src/notify.py trunk/src/roster_window.py Log: Add my copyright :-) Modified: trunk/AUTHORS =================================================================== --- trunk/AUTHORS 2007-08-31 17:24:35 UTC (rev 8684) +++ trunk/AUTHORS 2007-08-31 23:19:23 UTC (rev 8685) @@ -3,6 +3,7 @@ Yann Le Boulanger (asterix AT lagaule.org) Nikos Kouremenos (kourem AT gmail.com) Travis Shirk (travis AT pobox.com) +Stephan Erb (steve-e AT h3c.de) PAST DEVELOPERS: Modified: trunk/src/chat_control.py =================================================================== --- trunk/src/chat_control.py 2007-08-31 17:24:35 UTC (rev 8684) +++ trunk/src/chat_control.py 2007-08-31 23:19:23 UTC (rev 8685) @@ -3,9 +3,10 @@ ## Copyright (C) 2006 Yann Le Boulanger <asterix(a)lagaule.org> ## Copyright (C) 2006-2007 Nikos Kouremenos <kourem(a)gmail.com> ## Copyright (C) 2006 Travis Shirk <travis(a)pobox.com> -## Copyright (C) 2006 Dimitur Kirov <dkirov(a)gmail.com> +## Dimitur Kirov <dkirov(a)gmail.com> ## Copyright (C) 2007 Lukas Petrovicky <lukas(a)petrovicky.net> -## Copyright (C) 2007 Julien Pivotto <roidelapluie(a)gmail.com> +## Julien Pivotto <roidelapluie(a)gmail.com> +## Stephan Erb <steve-e(a)h3c.de> ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published Modified: trunk/src/common/config.py =================================================================== --- trunk/src/common/config.py 2007-08-31 17:24:35 UTC (rev 8684) +++ trunk/src/common/config.py 2007-08-31 23:19:23 UTC (rev 8685) @@ -4,10 +4,11 @@ ## Copyright (C) 2005-2006 Nikos Kouremenos <kourem(a)gmail.com> ## Copyright (C) 2004-2005 Vincent Hanquez <tab(a)snarc.org> ## Copyright (C) 2005 Dimitur Kirov <dkirov(a)gmail.com> -## Copyright (C) 2005 Travis Shirk <travis(a)pobox.com> -## Copyright (C) 2005 Norman Rasmussen <norman(a)rasmussen.co.za> +## Travis Shirk <travis(a)pobox.com> +## Norman Rasmussen <norman(a)rasmussen.co.za> ## Copyright (C) 2006 Stefan Bethge <stefan(a)lanpartei.de> ## Copyright (C) 2007 Julien Pivotto <roidelapluie(a)gmail.com> +## Stephan Erb <steve-e(a)h3c.de> ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published Modified: trunk/src/common/connection.py =================================================================== --- trunk/src/common/connection.py 2007-08-31 17:24:35 UTC (rev 8684) +++ trunk/src/common/connection.py 2007-08-31 23:19:23 UTC (rev 8685) @@ -4,9 +4,10 @@ ## Copyright (C) 2003-2004 Vincent Hanquez <tab(a)snarc.org> ## Copyright (C) 2003-2006 Yann Le Boulanger <asterix(a)lagaule.org> ## Copyright (C) 2005-2006 Nikos Kouremenos <kourem(a)gmail.com> -## Copyright (C) 2005-2006 Dimitur Kirov <dkirov(a)gmail.com> -## Copyright (C) 2005-2006 Travis Shirk <travis(a)pobox.com> +## Dimitur Kirov <dkirov(a)gmail.com> +## Travis Shirk <travis(a)pobox.com> ## Copyright (C) 2007 Julien Pivotto <roidelapluie(a)gmail.com> +## Stephan Erb <steve-e(a)h3c.de> ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published Modified: trunk/src/common/contacts.py =================================================================== --- trunk/src/common/contacts.py 2007-08-31 17:24:35 UTC (rev 8684) +++ trunk/src/common/contacts.py 2007-08-31 23:19:23 UTC (rev 8685) @@ -1,11 +1,11 @@ ## common/contacts.py ## ## Copyright (C) 2006 Yann Le Boulanger <asterix(a)lagaule.org> -## Copyright (C) 2006 Nikos Kouremenos <kourem(a)gmail.com> +## Nikos Kouremenos <kourem(a)gmail.com> ## Copyright (C) 2007 Lukas Petrovicky <lukas(a)petrovicky.net> -## Copyright (C) 2007 Julien Pivotto <roidelapluie(a)gmail.com> +## Julien Pivotto <roidelapluie(a)gmail.com> +## Stephan Erb <steve-e(a)h3c.de> ## -## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published ## by the Free Software Foundation; version 2 only. Modified: trunk/src/common/events.py =================================================================== --- trunk/src/common/events.py 2007-08-31 17:24:35 UTC (rev 8684) +++ trunk/src/common/events.py 2007-08-31 23:19:23 UTC (rev 8685) @@ -9,6 +9,7 @@ ## Dimitur Kirov <dkirov(a)gmail.com> ## Travis Shirk <travis(a)pobox.com> ## Norman Rasmussen <norman(a)rasmussen.co.za> +## Copyright (C) 2007 Stephan Erb <steve-e(a)h3c.de> ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published Modified: trunk/src/common/helpers.py =================================================================== --- trunk/src/common/helpers.py 2007-08-31 17:24:35 UTC (rev 8684) +++ trunk/src/common/helpers.py 2007-08-31 23:19:23 UTC (rev 8685) @@ -2,11 +2,11 @@ ## ## Copyright (C) 2003-2006 Yann Le Boulanger <asterix(a)lagaule.org> ## Copyright (C) 2005-2006 Nikos Kouremenos <kourem(a)gmail.com> -## Copyright (C) 2005 -## Dimitur Kirov <dkirov(a)gmail.com> +## Copyright (C) 2005 Dimitur Kirov <dkirov(a)gmail.com> ## Travis Shirk <travis(a)pobox.com> ## Copyright (C) 2007 Lukas Petrovicky <lukas(a)petrovicky.net> -## +## Stephan Erb <steve-e(a)h3c.de> +## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published ## by the Free Software Foundation; version 2 only. Modified: trunk/src/common/optparser.py =================================================================== --- trunk/src/common/optparser.py 2007-08-31 17:24:35 UTC (rev 8684) +++ trunk/src/common/optparser.py 2007-08-31 23:19:23 UTC (rev 8685) @@ -1,6 +1,7 @@ ## ## Copyright (C) 2005-2006 Yann Le Boulanger <asterix(a)lagaule.org> ## Copyright (C) 2005-2006 Nikos Kouremenos <kourem(a)gmail.com> +## Copyright (C) 2007 Stephan Erb <steve-e(a)h3c.de> ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published Modified: trunk/src/config.py =================================================================== --- trunk/src/config.py 2007-08-31 17:24:35 UTC (rev 8684) +++ trunk/src/config.py 2007-08-31 23:19:23 UTC (rev 8685) @@ -5,6 +5,7 @@ ## Copyright (C) 2005 Dimitur Kirov <dkirov(a)gmail.com> ## Copyright (C) 2003-2005 Vincent Hanquez <tab(a)snarc.org> ## Copyright (C) 2006 Stefan Bethge <stefan(a)lanpartei.de> +## Copyright (C) 2007 Stephan Erb <steve-e(a)h3c.de> ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published Modified: trunk/src/dialogs.py =================================================================== --- trunk/src/dialogs.py 2007-08-31 17:24:35 UTC (rev 8684) +++ trunk/src/dialogs.py 2007-08-31 23:19:23 UTC (rev 8685) @@ -8,7 +8,8 @@ ## Copyright (C) 2005-2006 Travis Shirk <travis(a)pobox.com> ## Copyright (C) 2005 Norman Rasmussen <norman(a)rasmussen.co.za> ## Copyright (C) 2007 Lukas Petrovicky <lukas(a)petrovicky.net> -## Copyright (C) 2007 Julien Pivotto <roidelapluie(a)gmail.com> +## Julien Pivotto <roidelapluie(a)gmail.com> +## Stephan Erb <steve-e(a)h3c.de> ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published Modified: trunk/src/features_window.py =================================================================== --- trunk/src/features_window.py 2007-08-31 17:24:35 UTC (rev 8684) +++ trunk/src/features_window.py 2007-08-31 23:19:23 UTC (rev 8685) @@ -1,6 +1,7 @@ ## features_window.py ## ## Copyright (C) 2007 Yann Le Boulanger <asterix(a)lagaule.org> +## Stephan Erb <steve-e(a)h3c.de> ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published Modified: trunk/src/gajim.py =================================================================== --- trunk/src/gajim.py 2007-08-31 17:24:35 UTC (rev 8684) +++ trunk/src/gajim.py 2007-08-31 23:19:23 UTC (rev 8685) @@ -4,10 +4,11 @@ ## ## Copyright (C) 2003-2006 Yann Le Boulanger <asterix(a)lagaule.org> ## Copyright (C) 2005-2006 Nikos Kouremenos <kourem(a)gmail.com> -## Copyright (C) 2005-2006 Dimitur Kirov <dkirov(a)gmail.com> +## Dimitur Kirov <dkirov(a)gmail.com> ## Copyright (C) 2005 Travis Shirk <travis(a)pobox.com> ## Copyright (C) 2007 Lukas Petrovicky <lukas(a)petrovicky.net> -## Copyright (C) 2007 Julien Pivotto <roidelapluie(a)gmail.com> +## Julien Pivotto <roidelapluie(a)gmail.com> +## Stephan Erb <steve-e(a)h3c.de> ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published Modified: trunk/src/gajim_themes_window.py =================================================================== --- trunk/src/gajim_themes_window.py 2007-08-31 17:24:35 UTC (rev 8684) +++ trunk/src/gajim_themes_window.py 2007-08-31 23:19:23 UTC (rev 8685) @@ -13,6 +13,7 @@ ## Dimitur Kirov <dkirov(a)gmail.com> ## Travis Shirk <travis(a)pobox.com> ## Norman Rasmussen <norman(a)rasmussen.co.za> +## Copyright (C) 2007 Stephan Erb <steve-e(a)h3c.de> ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published Modified: trunk/src/groupchat_control.py =================================================================== --- trunk/src/groupchat_control.py 2007-08-31 17:24:35 UTC (rev 8684) +++ trunk/src/groupchat_control.py 2007-08-31 23:19:23 UTC (rev 8685) @@ -10,7 +10,8 @@ ## Copyright (C) 2006 Travis Shirk <travis(a)pobox.com> ## Copyright (C) 2005-2007 Nikos Kouremenos <kourem(a)gmail.com> ## Copyright (C) 2007 Julien Pivotto <roidelapluie(a)gmail.com> -## Copyright (C) 2007 Lukas Petrovicky <lukas(a)petrovicky.net> +## Lukas Petrovicky <lukas(a)petrovicky.net> +## Stephan Erb <steve-e(a)h3c.de> ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published Modified: trunk/src/gtkgui_helpers.py =================================================================== --- trunk/src/gtkgui_helpers.py 2007-08-31 17:24:35 UTC (rev 8684) +++ trunk/src/gtkgui_helpers.py 2007-08-31 23:19:23 UTC (rev 8685) @@ -4,8 +4,9 @@ ## Copyright (C) 2004-2005 Vincent Hanquez <tab(a)snarc.org> ## Copyright (C) 2005-2006 Nikos Kouremenos <kourem(a)gmail.com> ## Copyright (C) 2005 Dimitur Kirov <dkirov(a)gmail.com> -## Copyright (C) 2005 Travis Shirk <travis(a)pobox.com> -## Copyright (C) 2005 Norman Rasmussen <norman(a)rasmussen.co.za> +## Travis Shirk <travis(a)pobox.com> +## Norman Rasmussen <norman(a)rasmussen.co.za> +## Copyright (C) 2007 Stephan Erb <steve-e(a)h3c.de> ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published Modified: trunk/src/message_control.py =================================================================== --- trunk/src/message_control.py 2007-08-31 17:24:35 UTC (rev 8684) +++ trunk/src/message_control.py 2007-08-31 23:19:23 UTC (rev 8685) @@ -1,6 +1,7 @@ ## message_control.py ## ## Copyright (C) 2006 Travis Shirk <travis(a)pobox.com> +## Copyright (C) 2007 Stephan Erb <steve-e(a)h3c.de> ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published Modified: trunk/src/message_window.py =================================================================== --- trunk/src/message_window.py 2007-08-31 17:24:35 UTC (rev 8684) +++ trunk/src/message_window.py 2007-08-31 23:19:23 UTC (rev 8685) @@ -9,7 +9,8 @@ ## Travis Shirk <travis(a)pobox.com> ## Norman Rasmussen <norman(a)rasmussen.co.za> ## Copyright (C) 2006 Travis Shirk <travis(a)pobox.com> -## Copyright (C) 2006 Geobert Quach <geobert(a)gmail.com> +## Geobert Quach <geobert(a)gmail.com> +## Copyright (C) 2007 Stephan Erb <steve-e(a)h3c.de> ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published Modified: trunk/src/notify.py =================================================================== --- trunk/src/notify.py 2007-08-31 17:24:35 UTC (rev 8684) +++ trunk/src/notify.py 2007-08-31 23:19:23 UTC (rev 8685) @@ -3,6 +3,7 @@ ## Copyright (C) 2005-2006 Yann Le Boulanger <asterix(a)lagaule.org> ## Copyright (C) 2005-2007 Nikos Kouremenos <kourem(a)gmail.com> ## Copyright (C) 2005-2006 Andrew Sayman <lorien420(a)myrealbox.com> +## Copyright (C) 2007 Stephan Erb <steve-e(a)h3c.de> ## ## Notification daemon connection via D-Bus code: ## Copyright (C) 2005 by Sebastian Estienne Modified: trunk/src/roster_window.py =================================================================== --- trunk/src/roster_window.py 2007-08-31 17:24:35 UTC (rev 8684) +++ trunk/src/roster_window.py 2007-08-31 23:19:23 UTC (rev 8685) @@ -6,6 +6,7 @@ ## Copyright (C) 2005-2006 Dimitur Kirov <dkirov(a)gmail.com> ## Copyright (C) 2007 Lukas Petrovicky <lukas(a)petrovicky.net> ## Copyright (C) 2007 Julien Pivotto <roidelapluie(a)gmail.com> +## Copyright (C) 2007 Stephan Erb <steve-e(a)h3c.de> ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published

1 0

[commit-gajim] r8684 - branches/gajim_0.11.1/src
by asterix＠gajim.org 31 Aug '07

31 Aug '07

Author: asterix Date: 2007-08-31 19:24:35 +0200 (Fri, 31 Aug 2007) New Revision: 8684 Modified: branches/gajim_0.11.1/src/gajim.py Log: [misc] Update own vcard when requested. Fix #3237 Modified: branches/gajim_0.11.1/src/gajim.py =================================================================== --- branches/gajim_0.11.1/src/gajim.py 2007-08-31 17:22:58 UTC (rev 8683) +++ branches/gajim_0.11.1/src/gajim.py 2007-08-31 17:24:35 UTC (rev 8684) @@ -920,6 +920,9 @@ win.set_values(array) if account in self.show_vcard_when_connect: self.show_vcard_when_connect.remove(account) + jid = array['jid'] + if self.instances[account]['infos'].has_key(jid): + self.instances[account]['infos'][jid].set_values(array) def handle_event_vcard(self, account, vcard): # ('VCARD', account, data)

1 0

[commit-gajim] r8683 - in branches/gajim_0.11.1/src: . common common/zeroconf
by asterix＠gajim.org 31 Aug '07

31 Aug '07

Author: asterix Date: 2007-08-31 19:22:58 +0200 (Fri, 31 Aug 2007) New Revision: 8683 Modified: branches/gajim_0.11.1/src/chat_control.py branches/gajim_0.11.1/src/common/connection.py branches/gajim_0.11.1/src/common/contacts.py branches/gajim_0.11.1/src/common/zeroconf/connection_handlers_zeroconf.py branches/gajim_0.11.1/src/common/zeroconf/connection_zeroconf.py branches/gajim_0.11.1/src/gajim.py branches/gajim_0.11.1/src/message_control.py Log: [misc] repare sending composing chatstates using xep instead of xep. Fix #3241. Modified: branches/gajim_0.11.1/src/chat_control.py =================================================================== --- branches/gajim_0.11.1/src/chat_control.py 2007-08-31 17:20:02 UTC (rev 8682) +++ branches/gajim_0.11.1/src/chat_control.py 2007-08-31 17:22:58 UTC (rev 8683) @@ -510,7 +510,7 @@ return False def send_message(self, message, keyID = '', type = 'chat', chatstate = None, - msg_id = None, composing_jep = None, resource = None): + msg_id = None, composing_xep = None, resource = None): '''Send the given message to the active tab. Doesn't return None if error ''' if not message or message == '\n': @@ -520,7 +520,7 @@ if not self._process_command(message): ret = MessageControl.send_message(self, message, keyID, type = type, chatstate = chatstate, msg_id = msg_id, - composing_jep = composing_jep, resource = resource, + composing_xep = composing_xep, resource = resource, user_nick = self.user_nick) if ret: return ret @@ -1083,12 +1083,12 @@ if cs and st in ('composing_only', 'all'): if contact.show == 'offline': chatstate = '' - elif contact.composing_jep == 'JEP-0085': + elif contact.composing_xep == 'XEP-0085': if st == 'all' or cs == 'composing': chatstate = helpers.get_uf_chatstate(cs) else: chatstate = '' - elif contact.composing_jep == 'JEP-0022': + elif contact.composing_xep == 'XEP-0022': if cs in ('composing', 'paused'): # only print composing, paused chatstate = helpers.get_uf_chatstate(cs) @@ -1160,29 +1160,25 @@ chatstates_on = gajim.config.get('outgoing_chat_state_notifications') != \ 'disabled' - composing_jep = contact.composing_jep + composing_xep = contact.composing_xep chatstate_to_send = None if chatstates_on and contact is not None: - if composing_jep is None: + if composing_xep is None: # no info about peer # send active to discover chat state capabilities # this is here (and not in send_chatstate) # because we want it sent with REAL message # (not standlone) eg. one that has body - - #FIXME: - # Enable 3 next lines after 0.11 release. - # Having this disabled violate xep85 5.1.2 but then we don't break - # notifications between 0.10.1 and 0.11 See #2637 - # if contact.our_chatstate: - # # We already ask for xep 85, don't ask it twice - # composing_jep = 'asked_once' + if contact.our_chatstate: + # We already asked for xep 85, don't ask it twice + composing_xep = 'asked_once' + chatstate_to_send = 'active' contact.our_chatstate = 'ask' # pseudo state # if peer supports jep85 and we are not 'ask', send 'active' # NOTE: first active and 'ask' is set in gajim.py - elif composing_jep is not False: + elif composing_xep is not False: #send active chatstate on every message (as JEP says) chatstate_to_send = 'active' contact.our_chatstate = 'active' @@ -1192,7 +1188,7 @@ self._schedule_activity_timers() if not ChatControlBase.send_message(self, message, keyID, type = 'chat', - chatstate = chatstate_to_send, composing_jep = composing_jep): + chatstate = chatstate_to_send, composing_xep = composing_xep): self.print_conversation(message, self.contact.jid, encrypted = encrypted) @@ -1485,7 +1481,7 @@ if contact.show == 'offline': return - if contact.composing_jep is False: # jid cannot do jep85 nor jep22 + if contact.composing_xep is False: # jid cannot do xep85 nor xep22 return # if the new state we wanna send (state) equals @@ -1493,7 +1489,7 @@ if contact.our_chatstate == state: return - if contact.composing_jep is None: + if contact.composing_xep is None: # we don't know anything about jid, so return # NOTE: # send 'active', set current state to 'ask' and return is done @@ -1507,7 +1503,7 @@ # in JEP22, when we already sent stop composing # notification on paused, don't resend it - if contact.composing_jep == 'JEP-0022' and \ + if contact.composing_xep == 'XEP-0022' and \ contact.our_chatstate in ('paused', 'active', 'inactive') and \ state is not 'composing': # not composing == in (active, inactive, gone) contact.our_chatstate = 'active' @@ -1529,7 +1525,7 @@ self.reset_kbd_mouse_timeout_vars() MessageControl.send_message(self, None, chatstate = state, - msg_id = contact.msg_id, composing_jep = contact.composing_jep) + msg_id = contact.msg_id, composing_xep = contact.composing_xep) contact.our_chatstate = state if contact.our_chatstate == 'active': self.reset_kbd_mouse_timeout_vars() Modified: branches/gajim_0.11.1/src/common/connection.py =================================================================== --- branches/gajim_0.11.1/src/common/connection.py 2007-08-31 17:20:02 UTC (rev 8682) +++ branches/gajim_0.11.1/src/common/connection.py 2007-08-31 17:22:58 UTC (rev 8683) @@ -699,7 +699,7 @@ self.connection.send(msg_iq) def send_message(self, jid, msg, keyID, type = 'chat', subject='', - chatstate = None, msg_id = None, composing_jep = None, resource = None, + chatstate = None, msg_id = None, composing_xep = None, resource = None, user_nick = None, xhtml = None): if not self.connection: return 1 @@ -753,12 +753,12 @@ # please note that the only valid tag inside a message containing a <body> # tag is the active event if chatstate is not None: - if (composing_jep == 'JEP-0085' or not composing_jep) and \ - composing_jep != 'asked_once': - # JEP-0085 + if (composing_xep == 'XEP-0085' or not composing_xep) and \ + composing_xep != 'asked_once': + # XEP-0085 msg_iq.setTag(chatstate, namespace = common.xmpp.NS_CHATSTATES) - if composing_jep in ('JEP-0022', 'asked_once') or not composing_jep: - # JEP-0022 + if composing_xep in ('XEP-0022', 'asked_once') or not composing_xep: + # XEP-0022 chatstate_node = msg_iq.setTag('x', namespace = common.xmpp.NS_EVENT) if not msgtxt: # when no <body>, add <id> Modified: branches/gajim_0.11.1/src/common/contacts.py =================================================================== --- branches/gajim_0.11.1/src/common/contacts.py 2007-08-31 17:20:02 UTC (rev 8682) +++ branches/gajim_0.11.1/src/common/contacts.py 2007-08-31 17:22:58 UTC (rev 8683) @@ -20,7 +20,7 @@ '''Information concerning each contact''' def __init__(self, jid='', name='', groups=[], show='', status='', sub='', ask='', resource='', priority=0, keyID='', our_chatstate=None, - chatstate=None, last_status_time=None, msg_id = None, composing_jep = None): + chatstate=None, last_status_time=None, msg_id = None, composing_xep = None): self.jid = jid self.name = name self.contact_name = '' # nick choosen by contact @@ -43,9 +43,9 @@ self.our_chatstate = our_chatstate self.msg_id = msg_id # tell which JEP we're using for composing state - # None = have to ask, JEP-0022 = use this jep, - # JEP-0085 = use this jep, False = no composing support - self.composing_jep = composing_jep + # None = have to ask, XEP-0022 = use this jep, + # XEP-0085 = use this jep, False = no composing support + self.composing_xep = composing_xep # this is contact's chatstate self.chatstate = chatstate self.last_status_time = last_status_time @@ -144,10 +144,10 @@ def create_contact(self, jid='', name='', groups=[], show='', status='', sub='', ask='', resource='', priority=0, keyID='', our_chatstate=None, - chatstate=None, last_status_time=None, composing_jep=None): + chatstate=None, last_status_time=None, composing_xep=None): return Contact(jid, name, groups, show, status, sub, ask, resource, priority, keyID, our_chatstate, chatstate, last_status_time, - composing_jep) + composing_xep) def copy_contact(self, contact): return self.create_contact(jid = contact.jid, name = contact.name, Modified: branches/gajim_0.11.1/src/common/zeroconf/connection_handlers_zeroconf.py =================================================================== --- branches/gajim_0.11.1/src/common/zeroconf/connection_handlers_zeroconf.py 2007-08-31 17:20:02 UTC (rev 8682) +++ branches/gajim_0.11.1/src/common/zeroconf/connection_handlers_zeroconf.py 2007-08-31 17:22:58 UTC (rev 8683) @@ -651,23 +651,23 @@ invite = None delayed = msg.getTag('x', namespace = common.xmpp.NS_DELAY) != None msg_id = None - composing_jep = None + composing_xep = None xtags = msg.getTags('x') # chatstates - look for chatstate tags in a message if not delayed if not delayed: - composing_jep = False + composing_xep = False children = msg.getChildren() for child in children: if child.getNamespace() == 'http://jabber.org/protocol/chatstates': chatstate = child.getName() - composing_jep = 'JEP-0085' + composing_xep = 'XEP-0085' break # No JEP-0085 support, fallback to JEP-0022 if not chatstate: chatstate_child = msg.getTag('x', namespace = common.xmpp.NS_EVENT) if chatstate_child: chatstate = 'active' - composing_jep = 'JEP-0022' + composing_xep = 'XEP-0022' if not msgtxt and chatstate_child.getTag('composing'): chatstate = 'composing' # JEP-0172 User Nickname @@ -703,14 +703,14 @@ msg_id = gajim.logger.write('chat_msg_recv', frm, msgtxt, tim = tim, subject = subject) self.dispatch('MSG', (frm, msgtxt, tim, encrypted, mtype, subject, - chatstate, msg_id, composing_jep, user_nick, msghtml)) + chatstate, msg_id, composing_xep, user_nick, msghtml)) elif mtype == 'normal': # it's single message if self.name not in no_log_for and jid not in no_log_for and msgtxt: gajim.logger.write('single_msg_recv', frm, msgtxt, tim = tim, subject = subject) if invite: self.dispatch('MSG', (frm, msgtxt, tim, encrypted, 'normal', - subject, chatstate, msg_id, composing_jep, user_nick)) + subject, chatstate, msg_id, composing_xep, user_nick)) # END messageCB def parse_data_form(self, node): Modified: branches/gajim_0.11.1/src/common/zeroconf/connection_zeroconf.py =================================================================== --- branches/gajim_0.11.1/src/common/zeroconf/connection_zeroconf.py 2007-08-31 17:20:02 UTC (rev 8682) +++ branches/gajim_0.11.1/src/common/zeroconf/connection_zeroconf.py 2007-08-31 17:22:58 UTC (rev 8683) @@ -345,7 +345,7 @@ return STATUS_LIST[self.connected] def send_message(self, jid, msg, keyID, type = 'chat', subject='', - chatstate = None, msg_id = None, composing_jep = None, resource = None, + chatstate = None, msg_id = None, composing_xep = None, resource = None, user_nick = None): fjid = jid @@ -393,10 +393,10 @@ # please note that the only valid tag inside a message containing a <body> # tag is the active event if chatstate is not None: - if composing_jep == 'JEP-0085' or not composing_jep: + if composing_xep == 'XEP-0085' or not composing_xep: # JEP-0085 msg_iq.setTag(chatstate, namespace = common.xmpp.NS_CHATSTATES) - if composing_jep == 'JEP-0022' or not composing_jep: + if composing_xep == 'XEP-0022' or not composing_xep: # JEP-0022 chatstate_node = msg_iq.setTag('x', namespace = common.xmpp.NS_EVENT) if not msgtxt: # when no <body>, add <id> Modified: branches/gajim_0.11.1/src/gajim.py =================================================================== --- branches/gajim_0.11.1/src/gajim.py 2007-08-31 17:20:02 UTC (rev 8682) +++ branches/gajim_0.11.1/src/gajim.py 2007-08-31 17:22:58 UTC (rev 8683) @@ -584,7 +584,7 @@ # (when contact signs out or has errors) if array[1] in ('offline', 'error'): contact1.our_chatstate = contact1.chatstate = \ - contact1.composing_jep = None + contact1.composing_xep = None gajim.connections[account].remove_transfers_for_contact(contact1) self.roster.chg_contact_status(contact1, array[1], status_message, account) @@ -613,7 +613,7 @@ def handle_event_msg(self, account, array): # 'MSG' (account, (jid, msg, time, encrypted, msg_type, subject, - # chatstate, msg_id, composing_jep, user_nick, xhtml)) + # chatstate, msg_id, composing_xep, user_nick, xhtml)) # user_nick is JEP-0172 full_jid_with_resource = array[0] @@ -626,7 +626,7 @@ subject = array[5] chatstate = array[6] msg_id = array[7] - composing_jep = array[8] + composing_xep = array[8] xhtml = array[10] if gajim.config.get('ignore_incoming_xhtml'): xhtml = None @@ -667,8 +667,8 @@ if contact and isinstance(contact, list): contact = contact[0] if contact: - if contact.composing_jep != 'JEP-0085': # We cache xep85 support - contact.composing_jep = composing_jep + if contact.composing_xep != 'XEP-0085': # We cache xep85 support + contact.composing_xep = composing_xep if chat_control and chat_control.type_id == message_control.TYPE_CHAT: if chatstate is not None: # other peer sent us reply, so he supports jep85 or jep22 Modified: branches/gajim_0.11.1/src/message_control.py =================================================================== --- branches/gajim_0.11.1/src/message_control.py 2007-08-31 17:20:02 UTC (rev 8682) +++ branches/gajim_0.11.1/src/message_control.py 2007-08-31 17:22:58 UTC (rev 8683) @@ -111,7 +111,7 @@ return len(gajim.events.get_events(self.account, self.contact.jid)) def send_message(self, message, keyID = '', type = 'chat', - chatstate = None, msg_id = None, composing_jep = None, resource = None, + chatstate = None, msg_id = None, composing_xep = None, resource = None, user_nick = None): '''Send the given message to the active tab. Doesn't return None if error ''' @@ -119,5 +119,5 @@ # Send and update history return gajim.connections[self.account].send_message(jid, message, keyID, type = type, chatstate = chatstate, msg_id = msg_id, - composing_jep = composing_jep, resource = self.resource, + composing_xep = composing_xep, resource = self.resource, user_nick = user_nick)

1 0

[commit-gajim] r8682 - branches/gajim_0.11.1/data/glade
by asterix＠gajim.org 31 Aug '07

31 Aug '07

Author: asterix Date: 2007-08-31 19:20:02 +0200 (Fri, 31 Aug 2007) New Revision: 8682 Modified: branches/gajim_0.11.1/data/glade/xml_console_window.glade Log: Auto resize xml input textview. Fixes #2831 Modified: branches/gajim_0.11.1/data/glade/xml_console_window.glade =================================================================== --- branches/gajim_0.11.1/data/glade/xml_console_window.glade 2007-08-31 17:17:22 UTC (rev 8681) +++ branches/gajim_0.11.1/data/glade/xml_console_window.glade 2007-08-31 17:20:02 UTC (rev 8682) @@ -181,8 +181,8 @@ <widget class="GtkScrolledWindow" id="scrolledwindow42"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property> - <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property> + <property name="hscrollbar_policy">GTK_POLICY_NEVER</property> + <property name="vscrollbar_policy">GTK_POLICY_NEVER</property> <property name="shadow_type">GTK_SHADOW_IN</property> <property name="window_placement">GTK_CORNER_TOP_LEFT</property>

1 0

[commit-gajim] r8681 - branches/gajim_0.11.1/src/common
by asterix＠gajim.org 31 Aug '07

31 Aug '07

Author: asterix Date: 2007-08-31 19:17:22 +0200 (Fri, 31 Aug 2007) New Revision: 8681 Modified: branches/gajim_0.11.1/src/common/helpers.py Log: Fix autocomplation for jids where username is set as nickname. Fixes #2608. Modified: branches/gajim_0.11.1/src/common/helpers.py =================================================================== --- branches/gajim_0.11.1/src/common/helpers.py 2007-08-31 17:15:25 UTC (rev 8680) +++ branches/gajim_0.11.1/src/common/helpers.py 2007-08-31 17:17:22 UTC (rev 8681) @@ -206,6 +206,8 @@ contacts_dict['%s (%s)' % (name, contact1.jid)] = contact1 contacts_dict['%s (%s)' % (name, jid)] = contact else: + if contact.name == gajim.get_nick_from_jid(jid): + del contacts_dict[jid] contacts_dict[name] = contact return contacts_dict

1 0

[commit-gajim] r8680 - branches/gajim_0.11.1/src
by asterix＠gajim.org 31 Aug '07

31 Aug '07

Author: asterix Date: 2007-08-31 19:15:25 +0200 (Fri, 31 Aug 2007) New Revision: 8680 Modified: branches/gajim_0.11.1/src/groupchat_control.py Log: request vcard ti server when avatar changed in gc except in IRC channel Modified: branches/gajim_0.11.1/src/groupchat_control.py =================================================================== --- branches/gajim_0.11.1/src/groupchat_control.py 2007-08-31 17:06:21 UTC (rev 8679) +++ branches/gajim_0.11.1/src/groupchat_control.py 2007-08-31 17:15:25 UTC (rev 8680) @@ -908,6 +908,40 @@ 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]: + server = gajim.get_server_from_jid(self.room_jid) + if not server.startswith('irc'): + 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 + server = gajim.get_server_from_jid(self.room_jid) + if not server.startswith('irc'): + con.request_vcard(real_jid, fake_jid) + else: + # save sha in mem NOW + con.vcard_shas[fake_jid] = avatar_sha + actual_role = self.get_role(nick) if role != actual_role: self.remove_contact(nick)

1 0

[commit-gajim] r8679 - branches/gajim_0.11.1/src/common
by asterix＠gajim.org 31 Aug '07

31 Aug '07

Author: asterix Date: 2007-08-31 19:06:21 +0200 (Fri, 31 Aug 2007) New Revision: 8679 Modified: branches/gajim_0.11.1/src/common/dataforms.py Log: [misc] init Node in MultipleDataForm? only once. Fixes #3228 Modified: branches/gajim_0.11.1/src/common/dataforms.py =================================================================== --- branches/gajim_0.11.1/src/common/dataforms.py 2007-08-31 17:04:59 UTC (rev 8678) +++ branches/gajim_0.11.1/src/common/dataforms.py 2007-08-31 17:06:21 UTC (rev 8679) @@ -390,8 +390,6 @@ DataForm.__init__(self, type=type, title=title, instructions=instructions, extend=extend) # all records, recorded into DataRecords if extend is None: - # we have to build this object from scratch - xmpp.Node.__init__(self) if items is not None: self.items = items else:

1 0

[commit-gajim] r8678 - branches/gajim_0.11.1/src/common
by asterix＠gajim.org 31 Aug '07

31 Aug '07

Author: asterix Date: 2007-08-31 19:04:59 +0200 (Fri, 31 Aug 2007) New Revision: 8678 Modified: branches/gajim_0.11.1/src/common/dataforms.py Log: Dataforms: fix a fix Modified: branches/gajim_0.11.1/src/common/dataforms.py =================================================================== --- branches/gajim_0.11.1/src/common/dataforms.py 2007-08-31 17:04:20 UTC (rev 8677) +++ branches/gajim_0.11.1/src/common/dataforms.py 2007-08-31 17:04:59 UTC (rev 8678) @@ -13,7 +13,7 @@ class ExtendedNode(xmpp.Node, object): @classmethod def __new__(cls, *a, **b): - if 'extend' not in b.keys() or not b[keys]: + if 'extend' not in b.keys() or not b['extend']: return object.__new__(cls) extend = b['extend']

1 0

[commit-gajim] r8677 - branches/gajim_0.11.1/src/common
by asterix＠gajim.org 31 Aug '07

31 Aug '07

Author: asterix Date: 2007-08-31 19:04:20 +0200 (Fri, 31 Aug 2007) New Revision: 8677 Modified: branches/gajim_0.11.1/src/common/dataforms.py Log: Dataforms: DataRecord(extend=None) != DataRecord() Modified: branches/gajim_0.11.1/src/common/dataforms.py =================================================================== --- branches/gajim_0.11.1/src/common/dataforms.py 2007-08-31 16:45:44 UTC (rev 8676) +++ branches/gajim_0.11.1/src/common/dataforms.py 2007-08-31 17:04:20 UTC (rev 8677) @@ -13,7 +13,7 @@ class ExtendedNode(xmpp.Node, object): @classmethod def __new__(cls, *a, **b): - if 'extend' not in b.keys(): + if 'extend' not in b.keys() or not b[keys]: return object.__new__(cls) extend = b['extend']

1 0

[commit-gajim] r8676 - branches/gajim_0.11.1/src/common
by asterix＠gajim.org 31 Aug '07

31 Aug '07

Author: asterix Date: 2007-08-31 18:45:44 +0200 (Fri, 31 Aug 2007) New Revision: 8676 Modified: branches/gajim_0.11.1/src/common/connection.py Log: Fix Account Creat Wizzard, let it not use a removed function. Modified: branches/gajim_0.11.1/src/common/connection.py =================================================================== --- branches/gajim_0.11.1/src/common/connection.py 2007-08-31 16:40:11 UTC (rev 8675) +++ branches/gajim_0.11.1/src/common/connection.py 2007-08-31 16:45:44 UTC (rev 8676) @@ -193,7 +193,7 @@ _('Transport %s answered wrongly to register request: %s')\ % (data[0], data[3]))) return - req = data[1].asDict() + req = data[1] req['username'] = self.new_account_info['name'] req['password'] = self.new_account_info['password'] def _on_register_result(result): @@ -221,10 +221,7 @@ (data[0], data[3]))) return is_form = data[2] - if is_form: - conf = data[1] - else: - conf = data[1].asDict() + conf = data[1] self.dispatch('REGISTER_AGENT_INFO', (data[0], conf, is_form)) elif realm == common.xmpp.NS_PRIVACY: if event == common.xmpp.features_nb.PRIVACY_LISTS_RECEIVED:

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits August 2007