Commits November 2013

commits@gajim.org

2 participants
61 discussions

gajim: support direct invitation (XEP-0249). Fixes #7581
by Gajim 28 Nov '13

28 Nov '13

changeset f6a92d1d42e7 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=f6a92d1d42e7 description: support direct invitation (XEP-0249). Fixes #7581 diffstat: src/common/connection.py | 17 +++++++- src/common/connection_handlers_events.py | 62 ++++++++++++++++++++++--------- src/common/contacts.py | 1 + src/common/gajim.py | 2 +- src/roster_window.py | 2 +- 5 files changed, 61 insertions(+), 23 deletions(-) diffs (160 lines): diff -r eb121dd59e11 -r f6a92d1d42e7 src/common/connection.py --- a/src/common/connection.py Wed Nov 27 18:20:49 2013 +0100 +++ b/src/common/connection.py Thu Nov 28 21:24:17 2013 +0100 @@ -1383,8 +1383,7 @@ errnum = con.Connection.ssl_errnum except AttributeError: errnum = [] # we don't have an errnum - i = 0 - for er in errnum: + for i, er in enumerate(errnum): if er > 0 and str(er) not in gajim.config.get_per('accounts', self.name, 'ignore_ssl_errors').split(): text = _('The authenticity of the %s certificate could be ' @@ -1399,7 +1398,6 @@ fingerprint=con.Connection.ssl_fingerprint_sha1[i], certificate=con.Connection.ssl_certificate[i])) return True - i += 1 if con.Connection.ssl_fingerprint_sha1: saved_fingerprint = gajim.config.get_per('accounts', self.name, 'ssl_fingerprint_sha1') @@ -2846,6 +2844,19 @@ """ Send invitation """ + contact = gajim.contacts.get_contact_from_full_jid(self.name, to) + if contact and contact.supports(nbxmpp.NS_CONFERENCE): + # send direct invite + message=nbxmpp.Message(to=to) + attrs = {'jid': room} + if reason: + attrs['reason'] = reason + if continue_tag: + attrs['continue'] = 'true' + c = message.addChild(name='x', attrs=attrs, + namespace=nbxmpp.NS_CONFERENCE) + self.connection.send(message) + return message=nbxmpp.Message(to=room) c = message.addChild(name='x', namespace=nbxmpp.NS_MUC_USER) c = c.addChild(name='invite', attrs={'to': to}) diff -r eb121dd59e11 -r f6a92d1d42e7 src/common/connection_handlers_events.py --- a/src/common/connection_handlers_events.py Wed Nov 27 18:20:49 2013 +0100 +++ b/src/common/connection_handlers_events.py Thu Nov 28 21:24:17 2013 +0100 @@ -1078,10 +1078,15 @@ self.invite_tag = None self.decline_tag = None if not self.enc_tag: + # Direct invitation? self.invite_tag = self.stanza.getTag('x', - namespace=nbxmpp.NS_MUC_USER) - if self.invite_tag and not self.invite_tag.getTag('invite'): - self.invite_tag = None + namespace=nbxmpp.NS_CONFERENCE) + # Mediated invitation? + if not self.invite_tag: + self.invite_tag = self.stanza.getTag('x', + namespace=nbxmpp.NS_MUC_USER) + if self.invite_tag and not self.invite_tag.getTag('invite'): + self.invite_tag = None self.decline_tag = self.stanza.getTag('x', namespace=nbxmpp.NS_MUC_USER) @@ -1195,25 +1200,46 @@ base_network_events = [] def generate(self): - self.room_jid = self.msg_obj.fjid + invite_tag = self.msg_obj.invite_tag + if invite_tag.getNamespace() == nbxmpp.NS_CONFERENCE: + # direct invitation + try: + self.room_jid = helpers.parse_jid(invite_tag.getAttr('jid')) + except helpers.InvalidFormat: + log.warn('Invalid JID: %s, ignoring it' % invite_tag.getAttr( + 'jid')) + return + self.jid_from = self.msg_obj.fjid + self.reason = invite_tag.getAttr('reason') + self.password = invite_tag.getAttr('password') + self.is_continued = False + if invite_tag.getAttr('continue') == 'true': + self.is_continued = True + else: + self.room_jid = self.msg_obj.fjid + item = invite_tag.getTag('invite') + try: + self.jid_from = helpers.parse_jid(item.getAttr('from')) + except helpers.InvalidFormat: + log.warn('Invalid JID: %s, ignoring it' % item.getAttr('from')) + return - item = self.msg_obj.invite_tag.getTag('invite') - try: - self.jid_from = helpers.parse_jid(item.getAttr('from')) - except helpers.InvalidFormat: - log.warn('Invalid JID: %s, ignoring it' % item.getAttr('from')) + self.reason = item.getTagData('reason') + self.password = invite_tag.getTagData('password') + + self.is_continued = False + if item.getTag('continue'): + self.is_continued = True + + if self.room_jid in gajim.gc_connected[self.conn.name] and \ + gajim.gc_connected[self.conn.name][self.room_jid]: + # We are already in groupchat. Ignore invitation return jid = gajim.get_jid_without_resource(self.jid_from) if gajim.config.get_per('accounts', self.conn.name, - 'ignore_unknown_contacts') and not gajim.contacts.get_contacts( - self.conn.name, jid): - return - self.reason = item.getTagData('reason') - self.password = self.msg_obj.invite_tag.getTagData('password') - - self.is_continued = False - if item.getTag('continue'): - self.is_continued = True + 'ignore_unknown_contacts') and not gajim.contacts.get_contacts( + self.conn.name, jid): + return return True diff -r eb121dd59e11 -r f6a92d1d42e7 src/common/contacts.py --- a/src/common/contacts.py Wed Nov 27 18:20:49 2013 +0100 +++ b/src/common/contacts.py Thu Nov 28 21:24:17 2013 +0100 @@ -484,6 +484,7 @@ for c in self._contacts[jid]: if c.resource == resource: return c + return self._contacts[jid][0] def iter_contacts(self): for jid in self._contacts.keys(): diff -r eb121dd59e11 -r f6a92d1d42e7 src/common/gajim.py --- a/src/common/gajim.py Wed Nov 27 18:20:49 2013 +0100 +++ b/src/common/gajim.py Thu Nov 28 21:24:17 2013 +0100 @@ -212,7 +212,7 @@ nbxmpp.NS_SSN, nbxmpp.NS_MOOD, nbxmpp.NS_ACTIVITY, nbxmpp.NS_NICK, nbxmpp.NS_ROSTERX, nbxmpp.NS_SECLABEL, nbxmpp.NS_HASHES, nbxmpp.NS_HASHES_MD5, nbxmpp.NS_HASHES_SHA1, nbxmpp.NS_HASHES_SHA256, - nbxmpp.NS_HASHES_SHA512, nbxmpp.NS_CORRECT] + nbxmpp.NS_HASHES_SHA512, nbxmpp.NS_CORRECT, nbxmpp.NS_CONFERENCE] # Optional features gajim supports per account gajim_optional_features = {} diff -r eb121dd59e11 -r f6a92d1d42e7 src/roster_window.py --- a/src/roster_window.py Wed Nov 27 18:20:49 2013 +0100 +++ b/src/roster_window.py Thu Nov 28 21:24:17 2013 +0100 @@ -3317,7 +3317,7 @@ break def on_invite_to_room(self, widget, list_, room_jid, room_account, - resource=None): + resource=None): """ Resource parameter MUST NOT be used if more than one contact in list """

1 0

gajim: missing return
by Gajim 27 Nov '13

27 Nov '13

changeset eb121dd59e11 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=eb121dd59e11 description: missing return diffstat: src/roster_window.py | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (11 lines): diff -r d95009635654 -r eb121dd59e11 src/roster_window.py --- a/src/roster_window.py Sat Nov 23 11:20:29 2013 +0400 +++ b/src/roster_window.py Wed Nov 27 18:20:49 2013 +0100 @@ -2000,6 +2000,7 @@ elif event.type_ == 'file-hash-error': ft.show_hash_error(jid, data, account) gajim.events.remove_events(account, jid, event) + return True elif event.type_ == 'file-completed': ft.show_completed(jid, data) gajim.events.remove_events(account, jid, event)

1 0

gajim-plugins: Colored traceback.prevent tb
by Gajim Plugins 24 Nov '13

24 Nov '13

changeset 6c24c2596aba in /home/hg/repos/gajim-plugins author: Denis Fomin <fominde(a)gmail.com> branches: details:gajim-plugins?cmd=changeset;node=6c24c2596aba description: Colored traceback.prevent tb diffstat: colored_traceback/colored_traceback.py | 4 +++- 1 файлов изменено, 3 вставок(+), 1 удалений(-) различия (21 строк): diff -r b3fec59f5cb6 -r 6c24c2596aba colored_traceback/colored_traceback.py --- a/colored_traceback/colored_traceback.py Fri Nov 22 22:34:32 2013 +0400 +++ b/colored_traceback/colored_traceback.py Sun Nov 24 16:49:06 2013 +0400 @@ -30,6 +30,7 @@ self.available_text = _('Pygments are not available. ' 'Install python-pygments.') self.activatable = False + self._excepthook_save = None @log_calls('ColoredTracebackPlugin') def activate(self): @@ -41,7 +42,8 @@ @log_calls('ColoredTracebackPlugin') def deactivate(self): - sys.excepthook = self._excepthook_save + if self._excepthook_save: + sys.excepthook = self._excepthook_save def _info(self, type_, value, tb): if not self._exception_in_progress.acquire(False):

1 0

gajim: Change cursor on location icon. Fixes #7570
by Gajim 23 Nov '13

23 Nov '13

changeset d95009635654 in /home/hg/repos/gajim author: Denis Fomin <fominde(a)gmail.com> branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=d95009635654 description: Change cursor on location icon. Fixes #7570 diffstat: src/chat_control.py | 17 +++++++++++++++++ 1 файлов изменено, 17 вставок(+), 0 удалений(-) различия (34 строк): diff -r 2a0673b623a6 -r d95009635654 src/chat_control.py --- a/src/chat_control.py Mon Nov 18 22:51:56 2013 +0400 +++ b/src/chat_control.py Sat Nov 23 11:20:29 2013 +0400 @@ -1593,6 +1593,12 @@ id_ = widget.connect('button-release-event', self.on_location_eventbox_button_release_event) self.handlers[id_] = widget + id_ = widget.connect('enter-notify-event', + self.on_location_eventbox_enter_notify_event) + self.handlers[id_] = widget + id_ = widget.connect('leave-notify-event', + self.on_location_eventbox_leave_notify_event) + self.handlers[id_] = widget for key in ('1', '2', '3', '4', '5', '6', '7', '8', '9', '*', '0', '#'): widget = self.xml.get_object(key + '_button') @@ -2026,6 +2032,17 @@ 'lon': location['lon']} helpers.launch_browser_mailer('url', uri) + def on_location_eventbox_leave_notify_event(self, widget, event): + """ + Just moved the mouse so show the cursor + """ + cursor = gtk.gdk.Cursor(gtk.gdk.LEFT_PTR) + self.parent_win.window.window.set_cursor(cursor) + + def on_location_eventbox_enter_notify_event(self, widget, event): + cursor = gtk.gdk.Cursor(gtk.gdk.HAND2) + self.parent_win.window.window.set_cursor(cursor) + def _on_window_motion_notify(self, widget, event): """ It gets called no matter if it is the active window or not

1 0

gajim-plugins: Clients icons. fix caps_disco_received
by Gajim Plugins 22 Nov '13

22 Nov '13

changeset b3fec59f5cb6 in /home/hg/repos/gajim-plugins author: Denis Fomin <fominde(a)gmail.com> branches: details:gajim-plugins?cmd=changeset;node=b3fec59f5cb6 description: Clients icons. fix caps_disco_received diffstat: clients_icons/clients_icons.py | 2 ++ clients_icons/manifest.ini | 2 +- 2 файлов изменено, 3 вставок(+), 1 удалений(-) различия (24 строк): diff -r 7046aa6a449e -r b3fec59f5cb6 clients_icons/clients_icons.py --- a/clients_icons/clients_icons.py Wed Nov 20 23:57:59 2013 +0400 +++ b/clients_icons/clients_icons.py Fri Nov 22 22:34:32 2013 +0400 @@ -513,6 +513,8 @@ roster.setup_and_draw_roster() def caps_disco_received(self, iq_obj): + if not self.config['show_in_roster']: + return roster = gajim.interface.roster contact = gajim.contacts.get_contact_from_full_jid(iq_obj.conn.name, iq_obj.jid) diff -r 7046aa6a449e -r b3fec59f5cb6 clients_icons/manifest.ini --- a/clients_icons/manifest.ini Wed Nov 20 23:57:59 2013 +0400 +++ b/clients_icons/manifest.ini Fri Nov 22 22:34:32 2013 +0400 @@ -1,7 +1,7 @@ [info] name: Clients icons short_name: clients_icons -version: 5.0 +version: 5.1 description: Shows the client icons in the roster and in groupchats. authors: Denis Fomin <fominde(a)gmail.com> Artem Klyop <art.klyop(a)gmail.com>

1 0

gajim-plugins: Clients icons. remove unused var
by Gajim Plugins 20 Nov '13

20 Nov '13

changeset 7046aa6a449e in /home/hg/repos/gajim-plugins author: Denis Fomin <fominde(a)gmail.com> branches: details:gajim-plugins?cmd=changeset;node=7046aa6a449e description: Clients icons. remove unused var diffstat: clients_icons/clients_icons.py | 4 ---- 1 файлов изменено, 0 вставок(+), 4 удалений(-) различия (21 строк): diff -r 7512f7ddedd0 -r 7046aa6a449e clients_icons/clients_icons.py --- a/clients_icons/clients_icons.py Wed Nov 20 23:56:17 2013 +0400 +++ b/clients_icons/clients_icons.py Wed Nov 20 23:57:59 2013 +0400 @@ -434,8 +434,6 @@ if not self.config['show_in_groupchats']: continue caps = gc_contact.client_caps._node - identities = gc_contact.client_caps._lookup_in_cache( - gajim.caps_cache.capscache).identities self.set_icon(chat_control.model, iter_, self.muc_renderer_num, caps, gc_contact) chat_control.draw_all_roles() @@ -526,8 +524,6 @@ gc_control = gajim.interface.msg_win_mgr.get_gc_control( iq_obj.jid, iq_obj.conn.name) iter_ = gc_control.get_contact_iter(nick) - identities = contact.client_caps._lookup_in_cache( - gajim.caps_cache.capscache).identities self.set_icon(gc_control.model, iter_, self.muc_renderer_num, None, contact) return

1 0

gajim-plugins: Backed out changeset: 3d9cf0f26427
by Gajim Plugins 20 Nov '13

20 Nov '13

changeset 7512f7ddedd0 in /home/hg/repos/gajim-plugins author: Denis Fomin <fominde(a)gmail.com> branches: details:gajim-plugins?cmd=changeset;node=7512f7ddedd0 description: Backed out changeset: 3d9cf0f26427 diffstat: chatstate/chatstate.py | 123 +---------------------------------------- clients_icons/clients_icons.py | 4 + 2 файлов изменено, 5 вставок(+), 122 удалений(-) различия (163 строк): diff -r 3d9cf0f26427 -r 7512f7ddedd0 chatstate/chatstate.py --- a/chatstate/chatstate.py Wed Nov 20 23:19:21 2013 +0400 +++ b/chatstate/chatstate.py Wed Nov 20 23:56:17 2013 +0400 @@ -10,9 +10,6 @@ from common import helpers import gtkgui_helpers import unicodedata -from nbxmpp.protocol import NS_CHATSTATES -import nbxmpp -from common.connection_handlers_events import MessageOutgoingEvent def paragraph_direction_mark(text): """ @@ -36,127 +33,9 @@ def init(self): self.config_dialog = None # ChatstatePluginConfigDialog(self) self.events_handlers = {'chatstate-received': - (ged.GUI2, self.chatstate_received), - 'message-received': - (ged.GUI2, self.message_received),} - self.gui_extension_points = {'chat_control_base_set_control_active': - (self.set_control_active, None),} + (ged.GUI2, self.chatstate_received), } self.active = None - def set_control_active(self, control, state): - if control.type_id != 'gc': - return - # print state, dir(control), control.room_jid, control.nick, control.contact.jid - # send chatstate inactive to the one we're leaving - # and active to the one we visit - if state: - message_buffer = control.msg_textview.get_buffer() - if message_buffer.get_char_count(): - self.send_chatstate('paused', control.contact, control) - else: - self.send_chatstate('active', control.contact, control) - #self.reset_kbd_mouse_timeout_vars() - #gobject.source_remove(self.possible_paused_timeout_id) - #gobject.source_remove(self.possible_inactive_timeout_id) - #self._schedule_activity_timers() - else: - self.send_chatstate('inactive', control.contact, control) - def send_chatstate(self, state, contact=None, control=None): - chatstate_setting = gajim.config.get('outgoing_chat_state_notifications') - if chatstate_setting == 'disabled': - return - elif chatstate_setting == 'composing_only' and state != 'active' and\ - state != 'composing': - return - - if contact is None: - contact = self.parent_win.get_active_contact() - if contact is None: - # contact was from pm in MUC, and left the room so contact is None - # so we cannot send chatstate anymore - return - - # Don't send chatstates to offline contacts - if contact.show == 'offline': - return - print state - #if not contact.supports(NS_CHATSTATES): - #printNS_CHATSTATES - #returnNS_CHATSTATES - - # if the new state we wanna send (state) equals - # the current state (contact.our_chatstate) then return - if contact.our_chatstate == state: - return - - # if wel're inactive prevent composing (XEP violation) - if contact.our_chatstate == 'inactive' and state == 'composing': - # go active before - msg_iq = nbxmpp.Message(control.room_jid, None, typ='groupchat') - msg_iq.setTag('active', namespace=NS_CHATSTATES) - control.connection.connection.send(msg_iq) - contact.our_chatstate = 'active' - #self.reset_kbd_mouse_timeout_vars() - msg_iq = nbxmpp.Message(control.room_jid, None, typ='groupchat') - msg_iq.setTag(state, namespace=NS_CHATSTATES) - control.connection.connection.send(msg_iq) - contact.our_chatstate = state - #if state == 'active': - #self.reset_kbd_mouse_timeout_vars() - - def _on_notebook_switch_page(self, notebook, page, page_num): - old_no = notebook.get_current_page() - if old_no >= 0: - old_ctrl = self._widget_to_control(notebook.get_nth_page(old_no)) - old_ctrl.set_control_active(False) - - new_ctrl = self._widget_to_control(notebook.get_nth_page(page_num)) - new_ctrl.set_control_active(True) - self.show_title(control = new_ctrl) - - control = self.get_active_control() - if isinstance(control, ChatControlBase): - control.msg_textview.grab_focus() - - def message_received(self, obj): - if not self.active or not obj.gc_control or obj.mtype != 'groupchat': - return - - obj.get_chatstate() - chatstate = obj.chatstate - nick = obj.resource - gc_control = obj.gc_control - if chatstate not in self.chatstates.keys(): - return - - iter_ = gc_control.get_contact_iter(nick) - if not iter_: - return - gc_contact = gajim.contacts.get_gc_contact(obj.conn.name, obj.jid, - nick) - - name = gobject.markup_escape_text(gc_contact.name) - if chatstate != 'gone': - color = self.chatstates[chatstate] - name = '%s' % (color, name) - - # Strike name if blocked - fjid = obj.fjid - if helpers.jid_is_blocked(obj.conn.name, fjid): - name = '%s' % name - status = gc_contact.status - # add status msg, if not empty, under contact name in the treeview - if status and gajim.config.get('show_status_msgs_in_roster'): - status = status.strip() - if status != '': - status = helpers.reduce_chars_newlines(status, max_lines=1) - # escape markup entities and make them small italic and fg color - name += ('\n' - '%s') % (self.status_color, gobject.markup_escape_text( - status)) - - gc_control.model[iter_][3] = name - def chatstate_received(self, obj): if not self.active: return diff -r 3d9cf0f26427 -r 7512f7ddedd0 clients_icons/clients_icons.py --- a/clients_icons/clients_icons.py Wed Nov 20 23:19:21 2013 +0400 +++ b/clients_icons/clients_icons.py Wed Nov 20 23:56:17 2013 +0400 @@ -434,6 +434,8 @@ if not self.config['show_in_groupchats']: continue caps = gc_contact.client_caps._node + identities = gc_contact.client_caps._lookup_in_cache( + gajim.caps_cache.capscache).identities self.set_icon(chat_control.model, iter_, self.muc_renderer_num, caps, gc_contact) chat_control.draw_all_roles() @@ -524,6 +526,8 @@ gc_control = gajim.interface.msg_win_mgr.get_gc_control( iq_obj.jid, iq_obj.conn.name) iter_ = gc_control.get_contact_iter(nick) + identities = contact.client_caps._lookup_in_cache( + gajim.caps_cache.capscache).identities self.set_icon(gc_control.model, iter_, self.muc_renderer_num, None, contact) return

1 0

gajim-plugins: Clients icons. remove unused var
by Gajim Plugins 20 Nov '13

20 Nov '13

changeset 3d9cf0f26427 in /home/hg/repos/gajim-plugins author: Denis Fomin <fominde(a)gmail.com> branches: details:gajim-plugins?cmd=changeset;node=3d9cf0f26427 description: Clients icons. remove unused var diffstat: chatstate/chatstate.py | 123 ++++++++++++++++++++++++++++++++++++++++- clients_icons/clients_icons.py | 4 - 2 файлов изменено, 122 вставок(+), 5 удалений(-) различия (163 строк): diff -r 93b29a457cf4 -r 3d9cf0f26427 chatstate/chatstate.py --- a/chatstate/chatstate.py Tue Nov 19 19:03:44 2013 +0400 +++ b/chatstate/chatstate.py Wed Nov 20 23:19:21 2013 +0400 @@ -10,6 +10,9 @@ from common import helpers import gtkgui_helpers import unicodedata +from nbxmpp.protocol import NS_CHATSTATES +import nbxmpp +from common.connection_handlers_events import MessageOutgoingEvent def paragraph_direction_mark(text): """ @@ -33,9 +36,127 @@ def init(self): self.config_dialog = None # ChatstatePluginConfigDialog(self) self.events_handlers = {'chatstate-received': - (ged.GUI2, self.chatstate_received), } + (ged.GUI2, self.chatstate_received), + 'message-received': + (ged.GUI2, self.message_received),} + self.gui_extension_points = {'chat_control_base_set_control_active': + (self.set_control_active, None),} self.active = None + def set_control_active(self, control, state): + if control.type_id != 'gc': + return + # print state, dir(control), control.room_jid, control.nick, control.contact.jid + # send chatstate inactive to the one we're leaving + # and active to the one we visit + if state: + message_buffer = control.msg_textview.get_buffer() + if message_buffer.get_char_count(): + self.send_chatstate('paused', control.contact, control) + else: + self.send_chatstate('active', control.contact, control) + #self.reset_kbd_mouse_timeout_vars() + #gobject.source_remove(self.possible_paused_timeout_id) + #gobject.source_remove(self.possible_inactive_timeout_id) + #self._schedule_activity_timers() + else: + self.send_chatstate('inactive', control.contact, control) + def send_chatstate(self, state, contact=None, control=None): + chatstate_setting = gajim.config.get('outgoing_chat_state_notifications') + if chatstate_setting == 'disabled': + return + elif chatstate_setting == 'composing_only' and state != 'active' and\ + state != 'composing': + return + + if contact is None: + contact = self.parent_win.get_active_contact() + if contact is None: + # contact was from pm in MUC, and left the room so contact is None + # so we cannot send chatstate anymore + return + + # Don't send chatstates to offline contacts + if contact.show == 'offline': + return + print state + #if not contact.supports(NS_CHATSTATES): + #printNS_CHATSTATES + #returnNS_CHATSTATES + + # if the new state we wanna send (state) equals + # the current state (contact.our_chatstate) then return + if contact.our_chatstate == state: + return + + # if wel're inactive prevent composing (XEP violation) + if contact.our_chatstate == 'inactive' and state == 'composing': + # go active before + msg_iq = nbxmpp.Message(control.room_jid, None, typ='groupchat') + msg_iq.setTag('active', namespace=NS_CHATSTATES) + control.connection.connection.send(msg_iq) + contact.our_chatstate = 'active' + #self.reset_kbd_mouse_timeout_vars() + msg_iq = nbxmpp.Message(control.room_jid, None, typ='groupchat') + msg_iq.setTag(state, namespace=NS_CHATSTATES) + control.connection.connection.send(msg_iq) + contact.our_chatstate = state + #if state == 'active': + #self.reset_kbd_mouse_timeout_vars() + + def _on_notebook_switch_page(self, notebook, page, page_num): + old_no = notebook.get_current_page() + if old_no >= 0: + old_ctrl = self._widget_to_control(notebook.get_nth_page(old_no)) + old_ctrl.set_control_active(False) + + new_ctrl = self._widget_to_control(notebook.get_nth_page(page_num)) + new_ctrl.set_control_active(True) + self.show_title(control = new_ctrl) + + control = self.get_active_control() + if isinstance(control, ChatControlBase): + control.msg_textview.grab_focus() + + def message_received(self, obj): + if not self.active or not obj.gc_control or obj.mtype != 'groupchat': + return + + obj.get_chatstate() + chatstate = obj.chatstate + nick = obj.resource + gc_control = obj.gc_control + if chatstate not in self.chatstates.keys(): + return + + iter_ = gc_control.get_contact_iter(nick) + if not iter_: + return + gc_contact = gajim.contacts.get_gc_contact(obj.conn.name, obj.jid, + nick) + + name = gobject.markup_escape_text(gc_contact.name) + if chatstate != 'gone': + color = self.chatstates[chatstate] + name = '%s' % (color, name) + + # Strike name if blocked + fjid = obj.fjid + if helpers.jid_is_blocked(obj.conn.name, fjid): + name = '%s' % name + status = gc_contact.status + # add status msg, if not empty, under contact name in the treeview + if status and gajim.config.get('show_status_msgs_in_roster'): + status = status.strip() + if status != '': + status = helpers.reduce_chars_newlines(status, max_lines=1) + # escape markup entities and make them small italic and fg color + name += ('\n' + '%s') % (self.status_color, gobject.markup_escape_text( + status)) + + gc_control.model[iter_][3] = name + def chatstate_received(self, obj): if not self.active: return diff -r 93b29a457cf4 -r 3d9cf0f26427 clients_icons/clients_icons.py --- a/clients_icons/clients_icons.py Tue Nov 19 19:03:44 2013 +0400 +++ b/clients_icons/clients_icons.py Wed Nov 20 23:19:21 2013 +0400 @@ -434,8 +434,6 @@ if not self.config['show_in_groupchats']: continue caps = gc_contact.client_caps._node - identities = gc_contact.client_caps._lookup_in_cache( - gajim.caps_cache.capscache).identities self.set_icon(chat_control.model, iter_, self.muc_renderer_num, caps, gc_contact) chat_control.draw_all_roles() @@ -526,8 +524,6 @@ gc_control = gajim.interface.msg_win_mgr.get_gc_control( iq_obj.jid, iq_obj.conn.name) iter_ = gc_control.get_contact_iter(nick) - identities = contact.client_caps._lookup_in_cache( - gajim.caps_cache.capscache).identities self.set_icon(gc_control.model, iter_, self.muc_renderer_num, None, contact) return

1 0

gajim-plugins: Clients icons. remove unused print
by Gajim Plugins 19 Nov '13

19 Nov '13

changeset 93b29a457cf4 in /home/hg/repos/gajim-plugins author: Denis Fomin <fominde(a)gmail.com> branches: details:gajim-plugins?cmd=changeset;node=93b29a457cf4 description: Clients icons. remove unused print diffstat: clients_icons/clients_icons.py | 2 -- 1 файлов изменено, 0 вставок(+), 2 удалений(-) различия (12 строк): diff -r 80a8c45b873f -r 93b29a457cf4 clients_icons/clients_icons.py --- a/clients_icons/clients_icons.py Tue Nov 19 19:00:39 2013 +0400 +++ b/clients_icons/clients_icons.py Tue Nov 19 19:03:44 2013 +0400 @@ -279,8 +279,6 @@ caps_image , client_name = self.get_icon(caps, acontact) identities = acontact.client_caps._lookup_in_cache( gajim.caps_cache.capscache).identities - print acontact.name, dir(acontact.client_caps._lookup_in_cache( - gajim.caps_cache.capscache)) if identities and client_name == _('Unknown'): client_name = identities[0].get('name', _('Unknown')) caps_image.set_alignment(0, 0)

1 0

gajim-plugins: Clients icons. fix icons in muc(caps_cache)
by Gajim Plugins 19 Nov '13

19 Nov '13

changeset 80a8c45b873f in /home/hg/repos/gajim-plugins author: Denis Fomin <fominde(a)gmail.com> branches: details:gajim-plugins?cmd=changeset;node=80a8c45b873f description: Clients icons. fix icons in muc(caps_cache) diffstat: clients_icons/clients_icons.py | 10 ++++++++-- 1 файлов изменено, 8 вставок(+), 2 удалений(-) различия (28 строк): diff -r 4973f19e636a -r 80a8c45b873f clients_icons/clients_icons.py --- a/clients_icons/clients_icons.py Tue Nov 19 16:42:58 2013 +0400 +++ b/clients_icons/clients_icons.py Tue Nov 19 19:00:39 2013 +0400 @@ -436,8 +436,10 @@ if not self.config['show_in_groupchats']: continue caps = gc_contact.client_caps._node + identities = gc_contact.client_caps._lookup_in_cache( + gajim.caps_cache.capscache).identities self.set_icon(chat_control.model, iter_, self.muc_renderer_num, - caps, contact) + caps, gc_contact) chat_control.draw_all_roles() # Recalculate column width for ellipsizin chat_control.list_treeview.columns_autosize() @@ -525,7 +527,11 @@ if contact: gc_control = gajim.interface.msg_win_mgr.get_gc_control( iq_obj.jid, iq_obj.conn.name) - #gc_control.draw_contact(nick) + iter_ = gc_control.get_contact_iter(nick) + identities = contact.client_caps._lookup_in_cache( + gajim.caps_cache.capscache).identities + self.set_icon(gc_control.model, iter_, self.muc_renderer_num, + None, contact) return if not contact: return

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits November 2013