Commits February 2008

commits@gajim.org

5 participants
62 discussions

[commit-gajim] r9307 - in branches/session_centric/src: . common
by bct＠gajim.org 06 Feb '08

06 Feb '08

Author: bct Date: 2008-02-06 02:40:51 +0100 (Wed, 06 Feb 2008) New Revision: 9307 Added: branches/session_centric/src/session.py Modified: branches/session_centric/src/common/connection_handlers.py branches/session_centric/src/common/events.py branches/session_centric/src/gajim.py branches/session_centric/src/roster_window.py Log: move message handling into ChatControlSession Modified: branches/session_centric/src/common/connection_handlers.py =================================================================== --- branches/session_centric/src/common/connection_handlers.py 2008-02-05 22:13:16 UTC (rev 9306) +++ branches/session_centric/src/common/connection_handlers.py 2008-02-06 01:40:51 UTC (rev 9307) @@ -49,7 +49,8 @@ import dbus from music_track_listener import MusicTrackListener -from common.stanza_session import EncryptedStanzaSession +# XXX interface leaking into the back end? +import session STATUS_LIST = ['offline', 'connecting', 'online', 'chat', 'away', 'xa', 'dnd', 'invisible', 'error'] @@ -1713,9 +1714,9 @@ treat_as = gajim.config.get('treat_incoming_messages') if treat_as: mtype = treat_as - self.dispatch('MSG', (frm, msgtxt, tim, encrypted, mtype, - subject, chatstate, msg_id, composing_xep, user_nick, msghtml, - session, form_node)) + + session.received(frm, msgtxt, tim, encrypted, mtype, subject, chatstate, + msg_id, composing_xep, user_nick, msghtml, form_node) # END messageCB def get_session(self, jid, thread_id, type): @@ -1786,7 +1787,7 @@ return None def make_new_session(self, jid, thread_id = None, type = 'chat'): - sess = EncryptedStanzaSession(self, common.xmpp.JID(jid), thread_id, type) + sess = session.ChatControlSession(self, common.xmpp.JID(jid), thread_id, type) if not jid in self.sessions: self.sessions[jid] = {} Modified: branches/session_centric/src/common/events.py =================================================================== --- branches/session_centric/src/common/events.py 2008-02-05 22:13:16 UTC (rev 9306) +++ branches/session_centric/src/common/events.py 2008-02-06 01:40:51 UTC (rev 9307) @@ -168,7 +168,7 @@ '''returns all events from the given account of the form {jid1: [], jid2: []} if jid is given, returns all events from the given jid in a list: [] - optionnaly only from given type''' + optionally only from given type''' if not self._events.has_key(account): return [] if not jid: Modified: branches/session_centric/src/gajim.py =================================================================== --- branches/session_centric/src/gajim.py 2008-02-05 22:13:16 UTC (rev 9306) +++ branches/session_centric/src/gajim.py 2008-02-06 01:40:51 UTC (rev 9307) @@ -727,141 +727,6 @@ self.handle_event_gc_notify(account, (jid, array[1], status_message, array[3], None, None, None, None, None, [], None, None)) - - def handle_event_msg(self, account, array): - # 'MSG' (account, (jid, msg, time, encrypted, msg_type, subject, - # chatstate, msg_id, composing_xep, user_nick, xhtml, session, form_node)) - # user_nick is JEP-0172 - - full_jid_with_resource = array[0] - jid = gajim.get_jid_without_resource(full_jid_with_resource) - resource = gajim.get_resource_from_jid(full_jid_with_resource) - - message = array[1] - encrypted = array[3] - msg_type = array[4] - subject = array[5] - chatstate = array[6] - msg_id = array[7] - composing_xep = array[8] - xhtml = array[10] - session = array[11] - if gajim.config.get('ignore_incoming_xhtml'): - xhtml = None - if gajim.jid_is_transport(jid): - jid = jid.replace('@', '') - - groupchat_control = self.msg_win_mgr.get_control(jid, account) - if not groupchat_control and \ - jid in self.minimized_controls[account]: - groupchat_control = self.minimized_controls[account][jid] - pm = False - if groupchat_control and groupchat_control.type_id == \ - message_control.TYPE_GC: - # It's a Private message - pm = True - msg_type = 'pm' - - chat_control = None - jid_of_control = full_jid_with_resource - highest_contact = gajim.contacts.get_contact_with_highest_priority( - account, jid) - # Look for a chat control that has the given resource, or default to one - # without resource - ctrl = self.msg_win_mgr.get_control(full_jid_with_resource, account) - if ctrl: - chat_control = ctrl - elif not pm and (not highest_contact or not highest_contact.resource): - # unknow contact or offline message - jid_of_control = jid - chat_control = self.msg_win_mgr.get_control(jid, account) - elif highest_contact and resource != highest_contact.resource and \ - highest_contact.show != 'offline': - jid_of_control = full_jid_with_resource - chat_control = None - elif not pm: - jid_of_control = jid - chat_control = self.msg_win_mgr.get_control(jid, account) - - # Handle chat states - contact = gajim.contacts.get_contact(account, jid, resource) - if contact: - 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 - contact.chatstate = chatstate - if contact.our_chatstate == 'ask': # we were jep85 disco? - contact.our_chatstate = 'active' # no more - chat_control.handle_incoming_chatstate() - elif contact.chatstate != 'active': - # got no valid jep85 answer, peer does not support it - contact.chatstate = False - elif chatstate == 'active': - # Brand new message, incoming. - contact.our_chatstate = chatstate - contact.chatstate = chatstate - if msg_id: # Do not overwrite an existing msg_id with None - contact.msg_id = msg_id - - # THIS MUST BE AFTER chatstates handling - # AND BEFORE playsound (else we ear sounding on chatstates!) - if not message: # empty message text - return - - if gajim.config.get('ignore_unknown_contacts') and \ - not gajim.contacts.get_contacts(account, jid) and not pm: - return - if not contact: - # contact is not in the roster, create a fake one to display - # notification - contact = common.contacts.Contact(jid = jid, resource = resource) - advanced_notif_num = notify.get_advanced_notification('message_received', - account, contact) - - # Is it a first or next message received ? - first = False - if msg_type == 'normal': - if not gajim.events.get_events(account, jid, ['normal']): - first = True - elif not chat_control and not gajim.events.get_events(account, - jid_of_control, [msg_type]): # msg_type can be chat or pm - first = True - - if pm: - nickname = resource - groupchat_control.on_private_message(nickname, message, array[2], - xhtml, session, msg_id) - else: - # array: (jid, msg, time, encrypted, msg_type, subject) - if encrypted: - self.roster.on_message(jid, message, array[2], account, array[3], - msg_type, subject, resource, msg_id, array[9], - advanced_notif_num, session=session, form_node=array[12]) - else: - # xhtml in last element - self.roster.on_message(jid, message, array[2], account, array[3], - msg_type, subject, resource, msg_id, array[9], - advanced_notif_num, xhtml=xhtml, session=session, - form_node=array[12]) - nickname = gajim.get_name_from_jid(account, jid) - # Check and do wanted notifications - msg = message - if subject: - msg = _('Subject: %s') % subject + '\n' + msg - focused = False - if chat_control: - parent_win = chat_control.parent_win - if chat_control == parent_win.get_active_control() and \ - parent_win.window.has_focus: - focused = True - notify.notify('new_message', jid_of_control, account, [msg_type, - first, nickname, msg, focused], advanced_notif_num) - - if self.remote_ctrl: - self.remote_ctrl.raise_signal('NewMessage', (account, array)) - def handle_event_msgerror(self, account, array): #'MSGERROR' (account, (jid, error_code, error_msg, msg, time)) full_jid_with_resource = array[0] @@ -2556,7 +2421,6 @@ 'ERROR_ANSWER': self.handle_event_error_answer, 'STATUS': self.handle_event_status, 'NOTIFY': self.handle_event_notify, - 'MSG': self.handle_event_msg, 'MSGERROR': self.handle_event_msgerror, 'MSGSENT': self.handle_event_msgsent, 'MSGNOTSENT': self.handle_event_msgnotsent, Modified: branches/session_centric/src/roster_window.py =================================================================== --- branches/session_centric/src/roster_window.py 2008-02-05 22:13:16 UTC (rev 9306) +++ branches/session_centric/src/roster_window.py 2008-02-06 01:40:51 UTC (rev 9307) @@ -3929,7 +3929,7 @@ # We call this here to avoid race conditions with widget validation chat_control.read_queue() - def new_chat(self, contact, account, resource = None, session = None): + def new_chat(self, session, contact, account, resource = None): # Get target window, create a control, and associate it with the window type_ = message_control.TYPE_CHAT @@ -3945,9 +3945,7 @@ 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() + return chat_control def new_chat_from_jid(self, account, fjid): jid, resource = gajim.get_room_and_nick_from_fjid(fjid) @@ -3963,7 +3961,12 @@ resource = resource) if not gajim.interface.msg_win_mgr.has_window(fjid, account): - self.new_chat(contact, account, resource = resource) + session = account.make_new_session(account, fjid) + self.control = self.new_chat(session, contact, account, resource = resource) + + if len(gajim.events.get_events(account, fjid)): + chat_control.read_queue() + mw = gajim.interface.msg_win_mgr.get_window(fjid, account) mw.set_active_tab(fjid, account) mw.window.present() @@ -3983,114 +3986,6 @@ is_continued=is_continued) mw.new_tab(gc_control) - def on_message(self, jid, msg, tim, account, encrypted=False, msg_type='', - subject=None, resource='', msg_id=None, user_nick='', - advanced_notif_num=None, xhtml=None, session=None, form_node=None): - '''when we receive a message''' - contact = None - # if chat window will be for specific resource - resource_for_chat = resource - fjid = jid - # Try to catch the contact with correct resource - if resource: - fjid = jid + '/' + resource - contact = gajim.contacts.get_contact(account, jid, resource) - highest_contact = gajim.contacts.get_contact_with_highest_priority( - account, jid) - if not contact: - # If there is another resource, it may be a message from an invisible - # resource - lcontact = gajim.contacts.get_contacts(account, jid) - if (len(lcontact) > 1 or (lcontact and lcontact[0].resource and \ - lcontact[0].show != 'offline')) and jid.find('@') > 0: - contact = gajim.contacts.copy_contact(highest_contact) - contact.resource = resource - if resource: - fjid = jid + '/' + resource - contact.priority = 0 - contact.show = 'offline' - contact.status = '' - gajim.contacts.add_contact(account, contact) - - else: - # Default to highest prio - fjid = jid - resource_for_chat = None - contact = highest_contact - if not contact: - # contact is not in roster - contact = self.add_to_not_in_the_roster(account, jid, user_nick) - - path = self.get_path(jid, account) # Try to get line of contact in roster - - # Look for a chat control that has the given resource - ctrl = gajim.interface.msg_win_mgr.get_control(fjid, account) - if not ctrl: - # if not, if message comes from highest prio, get control or open one - # without resource - if highest_contact and contact.resource == highest_contact.resource \ - and not jid == gajim.get_jid_from_account(account): - ctrl = gajim.interface.msg_win_mgr.get_control(jid, account) - fjid = jid - resource_for_chat = None - - # Do we have a queue? - no_queue = len(gajim.events.get_events(account, fjid)) == 0 - - popup = helpers.allow_popup_window(account, advanced_notif_num) - - if msg_type == 'normal' and popup: # it's single message to be autopopuped - dialogs.SingleMessageWindow(account, contact.jid, action='receive', - from_whom=jid, subject=subject, message=msg, resource=resource, - session=session, form_node=form_node) - return - - # We print if window is opened and it's not a single message - if ctrl and msg_type != 'normal': - typ = '' - if msg_type == 'error': - typ = 'status' - if session: - ctrl.set_session(session) - ctrl.print_conversation(msg, typ, tim = tim, encrypted = encrypted, - subject = subject, xhtml = xhtml) - if msg_id: - gajim.logger.set_read_messages([msg_id]) - return - - # We save it in a queue - type_ = 'chat' - event_type = 'message_received' - if msg_type == 'normal': - type_ = 'normal' - event_type = 'single_message_received' - show_in_roster = notify.get_show_in_roster(event_type, account, contact) - show_in_systray = notify.get_show_in_systray(event_type, account, contact) - event = gajim.events.create_event(type_, (msg, subject, msg_type, tim, - encrypted, resource, msg_id, xhtml, session, form_node), - show_in_roster=show_in_roster, show_in_systray=show_in_systray) - gajim.events.add_event(account, fjid, event) - if popup: - if not ctrl: - self.new_chat(contact, account, resource=resource_for_chat) - if path and not self.dragging and gajim.config.get( - 'scroll_roster_to_last_message'): - # we curently see contact in our roster OR he - # is not in the roster at all. - # show and select his line in roster - # do not change selection while DND'ing - self.tree.expand_row(path[0:1], False) - self.tree.expand_row(path[0:2], False) - self.tree.scroll_to_cell(path) - self.tree.set_cursor(path) - else: - if no_queue: # We didn't have a queue: we change icons - self.draw_contact(jid, account) - self.show_title() # we show the * or [n] - # Show contact in roster (if he is invisible for example) and select - # line - self.show_and_select_path(path, jid, account) - def on_preferences_menuitem_activate(self, widget): if gajim.interface.instances.has_key('preferences'): gajim.interface.instances['preferences'].window.present() @@ -4399,7 +4294,7 @@ fjid += '/' + resource win = gajim.interface.msg_win_mgr.get_window(fjid, account) if not win: - self.new_chat(contact, account, resource = resource, session = session) + self.new_chat(session, contact, account, resource = resource) win = gajim.interface.msg_win_mgr.get_window(fjid, account) ctrl = win.get_control(fjid, account) # last message is long time ago Added: branches/session_centric/src/session.py =================================================================== --- branches/session_centric/src/session.py (rev 0) +++ branches/session_centric/src/session.py 2008-02-06 01:40:51 UTC (rev 9307) @@ -0,0 +1,224 @@ +from common import helpers + +from common import gajim +from common import stanza_session +from common import contacts + +import dialogs + +import message_control + +import notify + +class ChatControlSession(stanza_session.EncryptedStanzaSession): + def __init__(self, conn, jid, thread_id, type = 'chat'): + stanza_session.EncryptedStanzaSession.__init__(self, conn, jid, thread_id, type = 'chat') + + self.control = None + + def received(self, full_jid_with_resource, message, tim, encrypted, msg_type, subject, chatstate, msg_id, composing_xep, user_nick, xhtml, form_node): + + jid = gajim.get_jid_without_resource(full_jid_with_resource) + resource = gajim.get_resource_from_jid(full_jid_with_resource) + + if gajim.config.get('ignore_incoming_xhtml'): + xhtml = None + if gajim.jid_is_transport(jid): + jid = jid.replace('@', '') + + groupchat_control = gajim.interface.msg_win_mgr.get_control(jid, self.conn.name) + if not groupchat_control and \ + jid in gajim.interface.minimized_controls[self.conn.name]: + groupchat_control = self.minimized_controls[self.conn.name][jid] + + pm = False + if groupchat_control and groupchat_control.type_id == \ + message_control.TYPE_GC: + # It's a Private message + pm = True + msg_type = 'pm' + + jid_of_control = full_jid_with_resource + + # Handle chat states + contact = gajim.contacts.get_contact(self.conn.name, jid, resource) + if contact: + if contact.composing_xep != 'XEP-0085': # We cache xep85 support + contact.composing_xep = composing_xep + if self.control and self.control.type_id == message_control.TYPE_CHAT: + if chatstate is not None: + # other peer sent us reply, so he supports jep85 or jep22 + contact.chatstate = chatstate + if contact.our_chatstate == 'ask': # we were jep85 disco? + contact.our_chatstate = 'active' # no more + self.control.handle_incoming_chatstate() + elif contact.chatstate != 'active': + # got no valid jep85 answer, peer does not support it + contact.chatstate = False + elif chatstate == 'active': + # Brand new message, incoming. + contact.our_chatstate = chatstate + contact.chatstate = chatstate + if msg_id: # Do not overwrite an existing msg_id with None + contact.msg_id = msg_id + + # THIS MUST BE AFTER chatstates handling + # AND BEFORE playsound (else we ear sounding on chatstates!) + if not message: # empty message text + return + + if gajim.config.get('ignore_unknown_contacts') and \ + not gajim.contacts.get_contacts(self.conn.name, jid) and not pm: + return + + if not contact: + # contact is not in the roster, create a fake one to display + # notification + contact = contacts.Contact(jid = jid, resource = resource) + advanced_notif_num = notify.get_advanced_notification('message_received', + self.conn.name, contact) + + # Is it a first or next message received ? + first = False + if not self.control: + first = True + + if pm: + nickname = resource + groupchat_control.on_private_message(nickname, message, array[2], + xhtml, session, msg_id) + else: + self.roster_message(jid, message, tim, encrypted, msg_type, + subject, resource, msg_id, user_nick, advanced_notif_num, + xhtml=xhtml, form_node=form_node) + + nickname = gajim.get_name_from_jid(self.conn.name, jid) + # Check and do wanted notifications + msg = message + if subject: + msg = _('Subject: %s') % subject + '\n' + msg + focused = False + + if self.control: + parent_win = self.control.parent_win + if self.control == parent_win.get_active_control() and \ + parent_win.window.has_focus: + focused = True + + notify.notify('new_message', jid_of_control, self.conn.name, [msg_type, + first, nickname, msg, focused], advanced_notif_num) + + if gajim.interface.remote_ctrl: + gajim.interface.remote_ctrl.raise_signal('NewMessage', (self.conn.name, [full_jid_with_resource, message, tim, encrypted, msg_type, subject, chatstate, msg_id, composing_xep, user_nick, xhtml, form_node])) + + def roster_message(self, jid, msg, tim, encrypted=False, msg_type='', + subject=None, resource='', msg_id=None, user_nick='', + advanced_notif_num=None, xhtml=None, form_node=None): + contact = None + # if chat window will be for specific resource + resource_for_chat = resource + + fjid = jid + + # Try to catch the contact with correct resource + if resource: + fjid = jid + '/' + resource + contact = gajim.contacts.get_contact(self.conn.name, jid, resource) + + highest_contact = gajim.contacts.get_contact_with_highest_priority( + self.conn.name, jid) + if not contact: + # If there is another resource, it may be a message from an invisible + # resource + lcontact = gajim.contacts.get_contacts(self.conn.name, jid) + if (len(lcontact) > 1 or (lcontact and lcontact[0].resource and \ + lcontact[0].show != 'offline')) and jid.find('@') > 0: + contact = gajim.contacts.copy_contact(highest_contact) + contact.resource = resource + if resource: + fjid = jid + '/' + resource + contact.priority = 0 + contact.show = 'offline' + contact.status = '' + gajim.contacts.add_contact(self.conn.name, contact) + + else: + # Default to highest prio + fjid = jid + resource_for_chat = None + contact = highest_contact + + if not contact: + # contact is not in roster + contact = gajim.interface.roster.add_to_not_in_the_roster(self.conn.name, jid, user_nick) + + path = gajim.interface.roster.get_path(jid, self.conn.name) # Try to get line of contact in roster + + # Do we have a queue? + no_queue = len(gajim.events.get_events(self.conn.name, fjid)) == 0 + + popup = helpers.allow_popup_window(self.conn.name, advanced_notif_num) + + if msg_type == 'normal' and popup: # it's single message to be autopopuped + dialogs.SingleMessageWindow(self.conn.name, contact.jid, action='receive', + from_whom=jid, subject=subject, message=msg, resource=resource, + session=self, form_node=form_node) + return + + # We print if window is opened and it's not a single message + if self.control and msg_type != 'normal': + typ = '' + + if msg_type == 'error': + typ = 'status' + + self.control.print_conversation(msg, typ, tim = tim, + encrypted = encrypted, subject = subject, xhtml = xhtml) + + if msg_id: + gajim.logger.set_read_messages([msg_id]) + + return + + # We save it in a queue + type_ = 'chat' + event_type = 'message_received' + + if msg_type == 'normal': + type_ = 'normal' + event_type = 'single_message_received' + + show_in_roster = notify.get_show_in_roster(event_type, self.conn.name, contact) + show_in_systray = notify.get_show_in_systray(event_type, self.conn.name, contact) + + event = gajim.events.create_event(type_, (msg, subject, msg_type, tim, + encrypted, resource, msg_id, xhtml, self, form_node), + show_in_roster=show_in_roster, show_in_systray=show_in_systray) + + gajim.events.add_event(self.conn.name, fjid, event) + + if popup: + if not self.control: + self.control = self.new_chat(self, contact, self.conn.name, resource=resource_for_chat) + + if len(gajim.events.get_events(self.conn.name, fjid)): + self.control.read_queue() + + if path and not gajim.interface.dragging and gajim.config.get( + 'scroll_roster_to_last_message'): + # we curently see contact in our roster OR he + # is not in the roster at all. + # show and select his line in roster + # do not change selection while DND'ing + self.tree.expand_row(path[0:1], False) + self.tree.expand_row(path[0:2], False) + self.tree.scroll_to_cell(path) + self.tree.set_cursor(path) + else: + if no_queue: # We didn't have a queue: we change icons + gajim.interface.roster.draw_contact(jid, self.conn.name) + + gajim.interface.roster.show_title() # we show the * or [n] + # Show contact in roster (if he is invisible for example) and select + # line + gajim.interface.roster.show_and_select_path(path, jid, self.conn.name)

1 0

[commit-gajim] r9306 - trunk/src
by asterix＠gajim.org 05 Feb '08

05 Feb '08

Author: asterix Date: 2008-02-05 23:13:16 +0100 (Tue, 05 Feb 2008) New Revision: 9306 Modified: trunk/src/gajim-remote.py Log: Prevent traceback when gajim-remote is used while gajim is not running. Add a check_gajim_running command to gajim-remote Modified: trunk/src/gajim-remote.py =================================================================== --- trunk/src/gajim-remote.py 2008-02-05 21:24:48 UTC (rev 9305) +++ trunk/src/gajim-remote.py 2008-02-05 22:13:16 UTC (rev 9306) @@ -59,7 +59,7 @@ class GajimRemote: def __init__(self): - self.argv_len = len(sys.argv) + self.argv_len = len(sys.argv) # define commands dict. Prototype : # { # 'command': [comment, [list of arguments] ] @@ -73,14 +73,14 @@ _('Shows a help on specific command'), [ #User gets help for the command, specified by this parameter - (_('command'), + (_('command'), _('show help on command'), False) ] - ], + ], 'toggle_roster_appearance' : [ _('Shows or hides the roster window'), [] - ], + ], 'show_next_pending_event': [ _('Pops up a window with the next pending event'), [] @@ -93,27 +93,27 @@ False) ] - ], + ], 'list_accounts': [ _('Prints a list of registered accounts'), [] - ], + ], 'change_status': [ _('Changes the status of account or accounts'), [ #offline, online, chat, away, xa, dnd, invisible should not be translated - (_('status'), _('one of: offline, online, chat, away, xa, dnd, invisible '), True), - (_('message'), _('status message'), False), + (_('status'), _('one of: offline, online, chat, away, xa, dnd, invisible '), True), + (_('message'), _('status message'), False), (_('account'), _('change status of account "account". ' 'If not specified, try to change status of all accounts that have ' '"sync with global status" option set'), False) ] ], - 'open_chat': [ - _('Shows the chat dialog so that you can send messages to a contact'), + 'open_chat': [ + _('Shows the chat dialog so that you can send messages to a contact'), [ ('jid', _('JID of the contact that you want to chat with'), - True), + True), (_('account'), _('if specified, contact is taken from the ' 'contact list of this account'), False) ] @@ -121,7 +121,7 @@ 'send_chat_message':[ _('Sends new chat message to a contact in the roster. Both OpenPGP key ' 'and account are optional. If you want to set only \'account\', ' - 'without \'OpenPGP key\', just set \'OpenPGP key\' to \'\'.'), + 'without \'OpenPGP key\', just set \'OpenPGP key\' to \'\'.'), [ ('jid', _('JID of the contact that will receive the message'), True), (_('message'), _('message contents'), True), @@ -134,7 +134,7 @@ 'send_single_message':[ _('Sends new single message to a contact in the roster. Both OpenPGP key ' 'and account are optional. If you want to set only \'account\', ' - 'without \'OpenPGP key\', just set \'OpenPGP key\' to \'\'.'), + 'without \'OpenPGP key\', just set \'OpenPGP key\' to \'\'.'), [ ('jid', _('JID of the contact that will receive the message'), True), (_('subject'), _('message subject'), True), @@ -144,9 +144,9 @@ (_('account'), _('if specified, the message will be sent ' 'using this account'), False), ] - ], + ], 'send_groupchat_message':[ - _('Sends new message to a groupchat you\'ve joined.'), + _('Sends new message to a groupchat you\'ve joined.'), [ ('room_jid', _('JID of the room that will receive the message'), True), (_('message'), _('message contents'), True), @@ -155,13 +155,13 @@ ] ], 'contact_info': [ - _('Gets detailed info on a contact'), + _('Gets detailed info on a contact'), [ ('jid', _('JID of the contact'), True) ] ], 'account_info': [ - _('Gets detailed info on a account'), + _('Gets detailed info on a account'), [ ('account', _('Name of the account'), True) ] @@ -188,8 +188,8 @@ ], 'prefs_del': [ _('Deletes a preference item'), - [ - (_('key'), _('name of the preference to be deleted'), True) + [ + (_('key'), _('name of the preference to be deleted'), True) ] ], 'prefs_store': [ @@ -199,7 +199,7 @@ ], 'remove_contact': [ _('Removes contact from roster'), - [ + [ ('jid', _('JID of the contact'), True), (_('account'), _('if specified, contact is taken from the ' 'contact list of this account'), False) @@ -208,7 +208,7 @@ ], 'add_contact': [ _('Adds contact to roster'), - [ + [ (_('jid'), _('JID of the contact'), True), (_('account'), _('Adds new contact to this account'), False) ] @@ -226,7 +226,7 @@ [ (_('account'), _(''), False) ] - ], + ], 'get_unread_msgs_number': [ _('Returns number of unread messages'), @@ -239,7 +239,7 @@ ] ], 'send_xml': [ - _('Sends custom XML'), + _('Sends custom XML'), [ ('xml', _('XML to send'), True), ('account', _('Account in which the xml will be sent; ' @@ -263,8 +263,13 @@ (_('account'), _(''), False) ] ], + 'check_gajim_running':[ + _('Check if Gajim is running'), + [] + ], } + self.sbus = None if self.argv_len < 2 or \ sys.argv[1] not in self.commands.keys(): # no args or bad args send_error(self.compose_help()) @@ -277,6 +282,9 @@ sys.exit(0) if self.command == 'handle_uri': self.handle_uri() + if self.command == 'check_gajim_running': + print self.check_gajim_running() + sys.exit(0) self.init_connection() self.check_arguments() @@ -323,7 +331,7 @@ pref_keys.sort() for pref_key in pref_keys: result = '%s = %s' % (pref_key, res[pref_key]) - if isinstance(result, unicode): + if isinstance(result, unicode): print result.encode(PREFERRED_ENCODING) else: print result @@ -332,6 +340,22 @@ elif res: print unicode(res).encode(PREFERRED_ENCODING) + def check_gajim_running(self): + if not self.sbus: + try: + self.sbus = dbus.SessionBus() + except: + raise exceptions.SessionBusNotPresent + + test = False + if hasattr(self.sbus, 'name_has_owner'): + if self.sbus.name_has_owner(SERVICE): + test = True + elif dbus.dbus_bindings.bus_name_has_owner(self.sbus.get_connection(), + SERVICE): + test = True + return test + def init_connection(self): ''' create the onnection to the session dbus, or exit if it is not possible ''' @@ -340,6 +364,8 @@ except: raise exceptions.SessionBusNotPresent + if not self.check_gajim_running(): + send_error(_('It seems Gajim is not running. So you can\'t use gajim-remote.')) obj = self.sbus.get_object(SERVICE, OBJ_PATH) interface = dbus.Interface(obj, INTERFACE) @@ -368,7 +394,7 @@ if command in self.commands: command_props = self.commands[command] arguments_str = self.make_arguments_row(command_props[1]) - str = _('Usage: %s %s %s \n\t %s') % (BASENAME, command, + str = _('Usage: %s %s %s \n\t %s') % (BASENAME, command, arguments_str, command_props[0]) if len(command_props[1]) > 0: str += '\n\n' + _('Arguments:') + '\n' @@ -383,7 +409,7 @@ commands = self.commands.keys() commands.sort() for command in commands: - str += ' ' + command + str += ' ' + command for argument in self.commands[command][1]: str += ' ' if argument[2]: @@ -457,7 +483,7 @@ if len(args) > argv_len: if args[argv_len][2]: send_error(_('Argument "%s" is not specified. \n' - 'Type "%s help %s" for more info') % + 'Type "%s help %s" for more info') % (args[argv_len][0], BASENAME, self.command)) self.arguments = [] i = 0 @@ -485,7 +511,7 @@ if action == 'join': self.command = sys.argv[1] = 'join_room' return - + sys.exit(0) def call_remote_method(self):

1 0

[commit-gajim] r9305 - trunk/src
by asterix＠gajim.org 05 Feb '08

05 Feb '08

Author: asterix Date: 2008-02-05 22:24:48 +0100 (Tue, 05 Feb 2008) New Revision: 9305 Modified: trunk/src/groupchat_control.py trunk/src/roster_window.py Log: fix the draw avatar calls Modified: trunk/src/groupchat_control.py =================================================================== --- trunk/src/groupchat_control.py 2008-02-05 17:48:25 UTC (rev 9304) +++ trunk/src/groupchat_control.py 2008-02-05 21:24:48 UTC (rev 9305) @@ -939,7 +939,7 @@ model[iter][C_TEXT] = name def draw_avatar(self, nick): - if gajim.config.get('show_avatars_in_roster'): + if not gajim.config.get('show_avatars_in_roster'): return model = self.list_treeview.get_model() iter = self.get_contact_iter(nick) Modified: trunk/src/roster_window.py =================================================================== --- trunk/src/roster_window.py 2008-02-05 17:48:25 UTC (rev 9304) +++ trunk/src/roster_window.py 2008-02-05 21:24:48 UTC (rev 9305) @@ -760,7 +760,7 @@ def draw_avatar(self, jid, account): '''draw the avatar''' - if gajim.config.get('show_avatars_in_roster'): + if not gajim.config.get('show_avatars_in_roster'): return model = self.tree.get_model() iters = self.get_contact_iter(jid, account)

1 0

[commit-gajim] r9304 - trunk/src
by jim++＠gajim.org 05 Feb '08

05 Feb '08

Author: jim++ Date: 2008-02-05 18:48:25 +0100 (Tue, 05 Feb 2008) New Revision: 9304 Modified: trunk/src/groupchat_control.py trunk/src/roster_window.py Log: Cleaner way to check for 'show_avatars_in_roster' Modified: trunk/src/groupchat_control.py =================================================================== --- trunk/src/groupchat_control.py 2008-02-05 17:02:05 UTC (rev 9303) +++ trunk/src/groupchat_control.py 2008-02-05 17:48:25 UTC (rev 9304) @@ -939,6 +939,8 @@ model[iter][C_TEXT] = name def draw_avatar(self, nick): + if gajim.config.get('show_avatars_in_roster'): + return model = self.list_treeview.get_model() iter = self.get_contact_iter(nick) if not iter: @@ -1195,8 +1197,7 @@ affiliation = affiliation, jid = j, resource = resource) gajim.contacts.add_gc_contact(self.account, gc_contact) self.draw_contact(nick) - if gajim.config.get('show_avatars_in_roster'): - self.draw_avatar(nick) + self.draw_avatar(nick) # Do not ask avatar to irc rooms as irc transports reply with messages server = gajim.get_server_from_jid(self.room_jid) if gajim.config.get('ask_avatars_on_startup') and \ Modified: trunk/src/roster_window.py =================================================================== --- trunk/src/roster_window.py 2008-02-05 17:02:05 UTC (rev 9303) +++ trunk/src/roster_window.py 2008-02-05 17:48:25 UTC (rev 9304) @@ -334,8 +334,7 @@ model.append(i, (None, name, 'contact', jid, account, None, None)) self.draw_contact(jid, account) - if gajim.config.get('show_avatars_in_roster'): - self.draw_avatar(jid, account) + self.draw_avatar(jid, account) self.draw_account(account) # Redraw parent to change icon self.draw_contact(big_brother_jid, big_brother_account) @@ -395,8 +394,7 @@ if gajim.groups[account][group]['expand']: self.tree.expand_row(model.get_path(iterG), False) self.draw_contact(jid, account) - if gajim.config.get('show_avatars_in_roster'): - self.draw_avatar(jid, account) + self.draw_avatar(jid, account) self.draw_account(account) # put the children under this iter for data in shown_family: @@ -482,8 +480,7 @@ jid = gajim.get_jid_from_account(account) if self.get_self_contact_iter(account): self.draw_contact(jid, account) - if gajim.config.get('show_avatars_in_roster'): - self.draw_avatar(jid, account) + self.draw_avatar(jid, account) return contact = gajim.contacts.get_first_contact_from_jid(account, jid) @@ -499,8 +496,7 @@ model.append(iterAcct, (None, gajim.nicks[account], 'self_contact', jid, account, None, None)) self.draw_contact(jid, account) - if gajim.config.get('show_avatars_in_roster'): - self.draw_avatar(jid, account) + self.draw_avatar(jid, account) def add_transport_to_roster(self, account, transport): c = gajim.contacts.create_contact(jid = transport, name = transport, @@ -764,6 +760,8 @@ def draw_avatar(self, jid, account): '''draw the avatar''' + if gajim.config.get('show_avatars_in_roster'): + return model = self.tree.get_model() iters = self.get_contact_iter(jid, account) if gajim.config.get('show_avatars_in_roster'): @@ -1934,8 +1932,7 @@ def update_avatar_in_gui(self, jid, account): # Update roster - if gajim.config.get('show_avatars_in_roster'): - self.draw_avatar(jid, account) + self.draw_avatar(jid, account) # Update chat window if gajim.interface.msg_win_mgr.has_window(jid, account): win = gajim.interface.msg_win_mgr.get_window(jid, account)

1 0

[commit-gajim] r9303 - trunk/src
by jim++＠gajim.org 05 Feb '08

05 Feb '08

Author: jim++ Date: 2008-02-05 18:02:05 +0100 (Tue, 05 Feb 2008) New Revision: 9303 Modified: trunk/src/groupchat_control.py trunk/src/roster_window.py Log: Never load avatars for roster and gc-roster if we don't want them. See #3718. See also [9287]. Modified: trunk/src/groupchat_control.py =================================================================== --- trunk/src/groupchat_control.py 2008-02-05 16:46:05 UTC (rev 9302) +++ trunk/src/groupchat_control.py 2008-02-05 17:02:05 UTC (rev 9303) @@ -943,15 +943,12 @@ iter = self.get_contact_iter(nick) if not iter: return - 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: + 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') model[iter][C_AVATAR] = scaled_pixbuf def chg_contact_status(self, nick, show, status, role, affiliation, jid, @@ -1198,7 +1195,8 @@ 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('show_avatars_in_roster'): + self.draw_avatar(nick) # Do not ask avatar to irc rooms as irc transports reply with messages server = gajim.get_server_from_jid(self.room_jid) if gajim.config.get('ask_avatars_on_startup') and \ Modified: trunk/src/roster_window.py =================================================================== --- trunk/src/roster_window.py 2008-02-05 16:46:05 UTC (rev 9302) +++ trunk/src/roster_window.py 2008-02-05 17:02:05 UTC (rev 9303) @@ -482,7 +482,8 @@ jid = gajim.get_jid_from_account(account) if self.get_self_contact_iter(account): self.draw_contact(jid, account) - self.draw_avatar(jid, account) + if gajim.config.get('show_avatars_in_roster'): + self.draw_avatar(jid, account) return contact = gajim.contacts.get_first_contact_from_jid(account, jid) @@ -498,7 +499,8 @@ model.append(iterAcct, (None, gajim.nicks[account], 'self_contact', jid, account, None, None)) self.draw_contact(jid, account) - self.draw_avatar(jid, account) + if gajim.config.get('show_avatars_in_roster'): + self.draw_avatar(jid, account) def add_transport_to_roster(self, account, transport): c = gajim.contacts.create_contact(jid = transport, name = transport, @@ -1932,7 +1934,8 @@ def update_avatar_in_gui(self, jid, account): # Update roster - self.draw_avatar(jid, account) + if gajim.config.get('show_avatars_in_roster'): + self.draw_avatar(jid, account) # Update chat window if gajim.interface.msg_win_mgr.has_window(jid, account): win = gajim.interface.msg_win_mgr.get_window(jid, account)

1 0

[commit-gajim] r9302 - trunk/src
by nk＠gajim.org 05 Feb '08

05 Feb '08

Author: nk Date: 2008-02-05 17:46:05 +0100 (Tue, 05 Feb 2008) New Revision: 9302 Modified: trunk/src/message_window.py Log: Merwok complained about left and right arrow on tab in chats couldn't allow him to do traversing. This patch is a almost there fix. What is missing after the new tab is focused, it steals focus [couldn't find how to fix that atm], hopefully Yann remembers nicfit's code better.. Modified: trunk/src/message_window.py =================================================================== --- trunk/src/message_window.py 2008-02-05 14:50:21 UTC (rev 9301) +++ trunk/src/message_window.py 2008-02-05 16:46:05 UTC (rev 9302) @@ -4,12 +4,12 @@ ## Vincent Hanquez <tab(a)snarc.org> ## Copyright (C) 2005 Yann Leboulanger <asterix(a)lagaule.org> ## Vincent Hanquez <tab(a)snarc.org> -## Nikos Kouremenos <kourem(a)gmail.com> ## Dimitur Kirov <dkirov(a)gmail.com> ## Norman Rasmussen <norman(a)rasmussen.co.za> ## Copyright (C) 2005-2007 Travis Shirk <travis(a)pobox.com> ## Copyright (C) 2006 Geobert Quach <geobert(a)gmail.com> ## Copyright (C) 2007 Stephan Erb <steve-e(a)h3c.de> +## Copyright (C) 2005-2008 Nikos Kouremenos <kourem(a)gmail.com> ## ## This file is part of Gajim. ## @@ -629,6 +629,9 @@ if (event.state & gtk.gdk.CONTROL_MASK and event.keyval in (gtk.keysyms.Page_Down, gtk.keysyms.Page_Up)): return False + # when tab itselft is selected, make sure <- and -> are allowed for navigating between tabs + if event.keyval in (gtk.keysyms.Left, gtk.keysyms.Right): + return False if isinstance(control, ChatControlBase): # we forwarded it to message textview control.msg_textview.emit('key_press_event', event)

1 0

[commit-gajim] r9301 - in trunk/src: . common
by asterix＠gajim.org 05 Feb '08

05 Feb '08

Author: asterix Date: 2008-02-05 15:50:21 +0100 (Tue, 05 Feb 2008) New Revision: 9301 Modified: trunk/src/common/connection.py trunk/src/common/connection_handlers.py trunk/src/gajim.py Log: detect jabber:iq:last and jabber:iq:version errors by IDs. fixes #3711 Modified: trunk/src/common/connection.py =================================================================== --- trunk/src/common/connection.py 2008-02-05 09:34:56 UTC (rev 9300) +++ trunk/src/common/connection.py 2008-02-05 14:50:21 UTC (rev 9301) @@ -1257,6 +1257,7 @@ iq.setID(id) if groupchat_jid: self.groupchat_jids[id] = groupchat_jid + self.last_ids.append(id) self.connection.send(iq) def request_os_info(self, jid, resource, groupchat_jid=None): @@ -1277,6 +1278,7 @@ iq.setID(id) if groupchat_jid: self.groupchat_jids[id] = groupchat_jid + self.version_ids.append(id) self.connection.send(iq) def get_settings(self): Modified: trunk/src/common/connection_handlers.py =================================================================== --- trunk/src/common/connection_handlers.py 2008-02-05 09:34:56 UTC (rev 9300) +++ trunk/src/common/connection_handlers.py 2008-02-05 14:50:21 UTC (rev 9301) @@ -1239,6 +1239,10 @@ # keep the latest subscribed event for each jid to prevent loop when we # acknoledge presences self.subscribed_events = {} + # IDs of jabber:iq:last requests + self.last_ids = [] + # IDs of jabber:iq:version requests + self.version_ids = [] # keep track of sessions this connection has with other JIDs self.sessions = {} @@ -1297,15 +1301,19 @@ def _ErrorCB(self, con, iq_obj): gajim.log.debug('ErrorCB') - if iq_obj.getQueryNS() == common.xmpp.NS_VERSION: - who = helpers.get_full_jid_from_iq(iq_obj) - jid_stripped, resource = gajim.get_room_and_nick_from_fjid(who) + jid_from = helpers.get_full_jid_from_iq(iq_obj) + jid_stripped, resource = gajim.get_room_and_nick_from_fjid(jid_from) + id = unicode(iq_obj.getID()) + if id in self.version_ids: self.dispatch('OS_INFO', (jid_stripped, resource, '', '')) + self.version_ids.remove(id) return + if id in self.last_ids: + self.dispatch('LAST_STATUS_TIME', (jid_stripped, resource, -1, '')) + self.last_ids.remove(id) + return errmsg = iq_obj.getErrorMsg() errcode = iq_obj.getErrorCode() - jid_from = helpers.get_full_jid_from_iq(iq_obj) - id = unicode(iq_obj.getID()) self.dispatch('ERROR_ANSWER', (id, jid_from, errmsg, errcode)) def _PrivateCB(self, con, iq_obj): @@ -1420,6 +1428,8 @@ del self.groupchat_jids[id] else: who = helpers.get_full_jid_from_iq(iq_obj) + if id in self.last_ids: + self.last_ids.remove(id) jid_stripped, resource = gajim.get_room_and_nick_from_fjid(who) self.dispatch('LAST_STATUS_TIME', (jid_stripped, resource, seconds, status)) @@ -1441,6 +1451,8 @@ else: who = helpers.get_full_jid_from_iq(iq_obj) jid_stripped, resource = gajim.get_room_and_nick_from_fjid(who) + if id in self.version_ids: + self.version_ids.remove(id) self.dispatch('OS_INFO', (jid_stripped, resource, client_info, os_info)) def _TimeCB(self, con, iq_obj): Modified: trunk/src/gajim.py =================================================================== --- trunk/src/gajim.py 2008-02-05 09:34:56 UTC (rev 9300) +++ trunk/src/gajim.py 2008-02-05 14:50:21 UTC (rev 9301) @@ -1124,6 +1124,10 @@ def handle_event_last_status_time(self, account, array): # ('LAST_STATUS_TIME', account, (jid, resource, seconds, status)) + tim = array[2] + if tim < 0: + # Ann error occured + return win = None if self.instances[account]['infos'].has_key(array[0]): win = self.instances[account]['infos'][array[0]] @@ -1132,7 +1136,7 @@ if win: c = gajim.contacts.get_contact(account, array[0], array[1]) if c: # c can be none if it's a gc contact - c.last_status_time = time.localtime(time.time() - array[2]) + c.last_status_time = time.localtime(time.time() - tim) if array[3]: c.status = array[3] win.set_last_status_time()

1 0

[commit-gajim] r9300 - trunk/src
by asterix＠gajim.org 05 Feb '08

05 Feb '08

Author: asterix Date: 2008-02-05 10:34:56 +0100 (Tue, 05 Feb 2008) New Revision: 9300 Modified: trunk/src/features_window.py Log: fix traceback when opening features window. fixes #3714 Modified: trunk/src/features_window.py =================================================================== --- trunk/src/features_window.py 2008-02-05 03:09:31 UTC (rev 9299) +++ trunk/src/features_window.py 2008-02-05 09:34:56 UTC (rev 9300) @@ -142,7 +142,10 @@ selection = widget.get_selection() if not selection: return - path = selection.get_selected_rows()[1][0] + rows = selection.get_selected_rows()[1] + if not rows: + return + path = rows[0] available = self.model[path][1] feature = self.model[path][0].decode('utf-8') text = self.features[feature][1] + '\n'

1 0

[commit-gajim] r9298 - trunk/src/common
by asterix＠gajim.org 04 Feb '08

04 Feb '08

Author: asterix Date: 2008-02-04 23:17:35 +0100 (Mon, 04 Feb 2008) New Revision: 9298 Modified: trunk/src/common/connection.py Log: fix creation of new accounts Modified: trunk/src/common/connection.py =================================================================== --- trunk/src/common/connection.py 2008-02-04 22:15:00 UTC (rev 9297) +++ trunk/src/common/connection.py 2008-02-04 22:17:35 UTC (rev 9298) @@ -551,8 +551,12 @@ def connect_to_next_host(self, retry = False): if len(self._hosts): - self._connection_types = gajim.config.get_per('accounts', self.name, - 'connection_types').split() + # No config option exist when creating a new account + if self.name in gajim.config.get_per('accounts'): + self._connection_types = gajim.config.get_per('accounts', self.name, + 'connection_types').split() + else: + self._connection_types = ['tls', 'ssl', 'plain'] host = self.select_next_host(self._hosts) self._current_host = host self._hosts.remove(host)

1 0

[commit-gajim] r9297 - trunk/src/common
by asterix＠gajim.org 04 Feb '08

04 Feb '08

Author: asterix Date: 2008-02-04 23:15:00 +0100 (Mon, 04 Feb 2008) New Revision: 9297 Modified: trunk/src/common/connection.py Log: fix args retured by on_connect_failure Modified: trunk/src/common/connection.py =================================================================== --- trunk/src/common/connection.py 2008-02-04 22:04:33 UTC (rev 9296) +++ trunk/src/common/connection.py 2008-02-04 22:15:00 UTC (rev 9297) @@ -508,7 +508,7 @@ self.dispatch('CONNECTION_LOST', (_('Connection to proxy failed'), reason)) - def connect_to_next_type(self): + def connect_to_next_type(self, retry=False): if len(self._connection_types): self._current_type = self._connection_types.pop(0) if self.last_connection: @@ -547,7 +547,7 @@ con.connect((self._current_host['host'], port), proxy=self._proxy, secure = secur) else: - self.connect_to_next_host() + self.connect_to_next_host(retry) def connect_to_next_host(self, retry = False): if len(self._hosts):

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits February 2008