Commits

commits@gajim.org

17632 discussions

gajim: remove useless function
by Yann Leboulanger 31 Jul '13

31 Jul '13

changeset 4278d1e4f3df in /home/hg/repos/gajim branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=4278d1e4f3df description: remove useless function diffstat: src/chat_control.py | 30 +----------------------------- 1 files changed, 1 insertions(+), 29 deletions(-) diffs (41 lines): diff -r 88b5249b9a9c -r 4278d1e4f3df src/chat_control.py --- a/src/chat_control.py Tue Jul 30 20:09:52 2013 +0200 +++ b/src/chat_control.py Wed Jul 31 10:41:16 2013 +0200 @@ -715,36 +715,8 @@ def show_emoticons_menu(self): if not gajim.config.get('emoticons_theme'): return - - def set_emoticons_menu_position(w, msg_tv=self.msg_textview): - window = msg_tv.get_window(Gtk.TextWindowType.WIDGET) - # get the window position - origin = window.get_origin()[1:] - size = window.get_size() - buf = msg_tv.get_buffer() - # get the cursor position - cursor = msg_tv.get_iter_location(buf.get_iter_at_mark( - buf.get_insert())) - cursor = msg_tv.buffer_to_window_coords(Gtk.TextWindowType.TEXT, - cursor.x, cursor.y) - x = origin[0] + cursor[0] - y = origin[1] + size[1] - menu_height = gajim.interface.emoticons_menu.size_request()[1] - #FIXME: get_line_count is not so good - #get the iter of cursor, then tv.get_line_yrange - # so we know in which y we are typing (not how many lines we have - # then go show just above the current cursor line for up - # or just below the current cursor line for down - #TEST with having 3 lines and writing in the 2nd - if y + menu_height > Gdk.Screen.height(): - # move menu just above cursor - y -= menu_height + (msg_tv.allocation.height / buf.get_line_count()) - #else: # move menu just below cursor - # y -= (msg_tv.allocation.height / buf.get_line_count()) - return (x, y, True) # push_in True gajim.interface.emoticon_menuitem_clicked = self.append_emoticon - gajim.interface.emoticons_menu.popup(None, None, - set_emoticons_menu_position, None, 1, 0) + gajim.interface.emoticons_menu.popup(None, None, None, None, 1, 0) def _on_message_textview_key_press_event(self, widget, event): if event.keyval == Gdk.KEY_space:

1 0

gajim: restore key bindings in textview
by Yann Leboulanger 31 Jul '13

31 Jul '13

changeset badca2c87d88 in /home/hg/repos/gajim branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=badca2c87d88 description: restore key bindings in textview diffstat: src/chat_control.py | 40 ++++++++++++++++++++++++++++++++-------- 1 files changed, 32 insertions(+), 8 deletions(-) diffs (83 lines): diff -r 4278d1e4f3df -r badca2c87d88 src/chat_control.py --- a/src/chat_control.py Wed Jul 31 10:41:16 2013 +0200 +++ b/src/chat_control.py Wed Jul 31 15:05:45 2013 +0200 @@ -754,7 +754,24 @@ return True ################################################################################ # temporary solution instead Gtk.binding_entry_add_signal - if event.keyval == Gdk.KEY_Return or \ + message_buffer = self.msg_textview.get_buffer() + event_state = event.get_state() + if event.keyval == Gdk.KEY_Up: + if event_state & Gdk.ModifierType.CONTROL_MASK: + if event_state & Gdk.ModifierType.SHIFT_MASK: # Ctrl+Shift+UP + self.scroll_messages('up', message_buffer, 'received') + else: # Ctrl+UP + self.scroll_messages('up', message_buffer, 'sent') + return True + elif event.keyval == Gdk.KEY_Down: + if event_state & Gdk.ModifierType.CONTROL_MASK: + if event_state & Gdk.ModifierType.SHIFT_MASK: # Ctrl+Shift+Down + self.scroll_messages('down', message_buffer, 'received') + else: # Ctrl+Down + self.scroll_messages('down', message_buffer, 'sent') + return True + + elif event.keyval == Gdk.KEY_Return or \ event.keyval == Gdk.KEY_KP_Enter: # ENTER message_textview = widget message_buffer = message_textview.get_buffer() @@ -763,7 +780,7 @@ xhtml = self.msg_textview.get_xhtml() if gajim.config.get('send_on_ctrl_enter'): - if event.get_state() & Gdk.ModifierType.CONTROL_MASK: # CTRL + ENTER + if event_state & Gdk.ModifierType.CONTROL_MASK: # CTRL + ENTER send_message = True else: end_iter = message_buffer.get_end_iter() @@ -771,7 +788,7 @@ send_message = False else: # send on Enter, do newline on Ctrl Enter - if event.get_state() & Gdk.ModifierType.CONTROL_MASK: # Ctrl + ENTER + if event_state & Gdk.ModifierType.CONTROL_MASK: # Ctrl + ENTER end_iter = message_buffer.get_end_iter() message_buffer.insert_at_cursor('\n') send_message = False @@ -787,6 +804,10 @@ if send_message: self.send_message(message, xhtml=xhtml) # send the message return True + elif event.keyval == Gdk.KEY_z: # CTRL+z + if event_state & Gdk.ModifierType.CONTROL_MASK: + self.msg_textview.undo() + return True ################################################################################ return False @@ -1414,16 +1435,19 @@ if pos == size and size > 0 and direction == 'up' and \ msg_type == 'sent' and not self.correcting: self.correcting = True - self.old_message_tv_color = self.msg_textview.get_style().base[ - Gtk.StateType.NORMAL] - self.msg_textview.modify_base(Gtk.StateType.NORMAL, Gdk.color_parse( - 'PaleGoldenrod')) + context = self.msg_textview.get_style_context() + state = Gtk.StateFlags.NORMAL + self.old_message_tv_color = context.get_background_color(state) + color = Gdk.RGBA() + Gdk.RGBA.parse(color, 'PaleGoldenrod') + self.msg_textview.override_background_color(Gtk.StateType.NORMAL, + color) message = history[pos - 1] msg_buf.set_text(message) return if self.correcting: # We were previously correcting - self.msg_textview.modify_base(Gtk.StateType.NORMAL, + self.msg_textview.override_background_color(Gtk.StateType.NORMAL, self.old_message_tv_color) self.correcting = False pos += -1 if direction == 'up' else +1

1 0

python-nbxmpp: fix encoding Protocol object before sending them
by Yann Leboulanger 31 Jul '13

31 Jul '13

changeset 3405e0919e42 in /home/hg/repos/python-nbxmpp details:http://hg.gajim.org/python-nbxmpp?cmd=changeset;node=3405e0919e42 description: fix encoding Protocol object before sending them diffstat: nbxmpp/transports_nb.py | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diffs (17 lines): diff -r 3503b0321a4f -r 3405e0919e42 nbxmpp/transports_nb.py --- a/nbxmpp/transports_nb.py Tue Jul 30 22:23:36 2013 +0200 +++ b/nbxmpp/transports_nb.py Wed Jul 31 10:07:57 2013 +0200 @@ -497,10 +497,10 @@ """ NonBlockingTransport.send(self, raw_data, now) - if isinstance(raw_data, str): + if isinstance(raw_data, bytes): + r = raw_data + else: r = self.encode_stanza(raw_data) - else: - r = raw_data if now: self.sendqueue.insert(0, r)

1 0

gajim: don't allow to browse non-MUC server in join groupchat di...
by Yann Leboulanger 30 Jul '13

30 Jul '13

changeset 88b5249b9a9c in /home/hg/repos/gajim branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=88b5249b9a9c description: don't allow to browse non-MUC server in join groupchat dialog. diffstat: src/common/connection_handlers.py | 24 ++++++++++++-- src/common/connection_handlers_events.py | 9 +++++ src/dialogs.py | 50 ++++++++++++++++++++++++++++++- 3 files changed, 76 insertions(+), 7 deletions(-) diffs (203 lines): diff -r d6ce5aef6431 -r 88b5249b9a9c src/common/connection_handlers.py --- a/src/common/connection_handlers.py Mon Jul 29 22:05:39 2013 +0200 +++ b/src/common/connection_handlers.py Tue Jul 30 20:09:52 2013 +0200 @@ -103,7 +103,8 @@ jid is mandatory; name, node, action is optional. """ - self._discover(nbxmpp.NS_DISCO_ITEMS, jid, node, id_prefix) + id_ = self._discover(nbxmpp.NS_DISCO_ITEMS, jid, node, id_prefix) + self.disco_items_ids.append(id_) def discoverInfo(self, jid, node=None, id_prefix=None): """ @@ -111,7 +112,8 @@ For identity: category, type is mandatory, name is optional. For feature: var is mandatory. """ - self._discover(nbxmpp.NS_DISCO_INFO, jid, node, id_prefix) + id_ = self._discover(nbxmpp.NS_DISCO_INFO, jid, node, id_prefix) + self.disco_info_ids.append(id_) def request_register_agent_info(self, agent): if not self.connection or self.connected < 2: @@ -165,12 +167,14 @@ if not self.connection or self.connected < 2: return iq = nbxmpp.Iq(typ='get', to=jid, queryNS=ns) + id_ = self.connection.getAnID() if id_prefix: - id_ = self.connection.getAnID() - iq.setID('%s%s' % (id_prefix, id_)) + id_ = id_prefix + id_ + iq.setID(id_) if node: iq.setQuerynode(node) self.connection.send(iq) + return id_ def _ReceivedRegInfo(self, con, resp, agent): nbxmpp.features_nb._ReceivedRegInfo(con, resp, agent) @@ -1437,6 +1441,10 @@ self.version_ids = [] # IDs of urn:xmpp:time requests self.entity_time_ids = [] + # IDs of disco#items requests + self.disco_items_ids = [] + # IDs of disco#info requests + self.disco_info_ids = [] # ID of urn:xmpp:ping requests self.awaiting_xmpp_ping_id = None self.continue_connect_info = None @@ -1588,6 +1596,14 @@ gajim.nec.push_incoming_event(TimeResultReceivedEvent(None, conn=self, stanza=obj.stanza)) return True + if obj.id_ in self.disco_items_ids: + gajim.nec.push_incoming_event(AgentItemsErrorReceivedEvent(None, + conn=self, stanza=obj.stanza)) + return True + if obj.id_ in self.disco_info_ids: + gajim.nec.push_incoming_event(AgentInfoErrorReceivedEvent(None, + conn=self, stanza=obj.stanza)) + return True def _nec_private_storate_bookmarks_received(self, obj): if obj.conn.name != self.name: diff -r d6ce5aef6431 -r 88b5249b9a9c src/common/connection_handlers_events.py --- a/src/common/connection_handlers_events.py Mon Jul 29 22:05:39 2013 +0200 +++ b/src/common/connection_handlers_events.py Tue Jul 30 20:09:52 2013 +0200 @@ -1927,6 +1927,8 @@ self.get_jid_resource() hostname = gajim.config.get_per('accounts', self.conn.name, 'hostname') self.get_id() + if self.id_ in self.conn.disco_items_ids: + self.conn.disco_items_ids.remove(self.id_) if self.fjid == hostname and self.id_[:6] == 'Gajim_': for item in self.items: self.conn.discoverInfo(item['jid'], id_prefix='Gajim_') @@ -1939,6 +1941,9 @@ def generate(self): self.get_jid_resource() + self.get_id() + if self.id_ in self.conn.disco_items_ids: + self.conn.disco_items_ids.remove(self.id_) return True class AgentInfoReceivedEvent(nec.NetworkIncomingEvent, HelperEvent): @@ -1947,6 +1952,8 @@ def generate(self): self.get_id() + if self.id_ in self.conn.disco_info_ids: + self.conn.disco_info_ids.remove(self.id_) if self.id_ is None: log.warning('Invalid IQ received without an ID. Ignoring it: %s' % \ self.stanza) @@ -1991,6 +1998,8 @@ def generate(self): self.get_jid_resource() self.get_id() + if self.id_ in self.conn.disco_info_ids: + self.conn.disco_info_ids.remove(self.id_) return True class FileRequestReceivedEvent(nec.NetworkIncomingEvent, HelperEvent): diff -r d6ce5aef6431 -r 88b5249b9a9c src/dialogs.py --- a/src/dialogs.py Mon Jul 29 22:05:39 2013 +0200 +++ b/src/dialogs.py Tue Jul 30 20:09:52 2013 +0200 @@ -36,6 +36,7 @@ from gi.repository import GLib import cairo import os +import nbxmpp import gtkgui_helpers import vcard @@ -2431,6 +2432,11 @@ hbox1 = self.xml.get_object('hbox1') hbox1.pack_start(self.server_comboboxentry, False, False, 0) + entry = self.server_comboboxentry.child + entry.connect('changed', self.on_server_entry_changed) + self.browse_button = self.xml.get_object('browse_rooms_button') + self.browse_button.set_sensitive(False) + self.recently_combobox = self.xml.get_object('recently_combobox') liststore = Gtk.ListStore(str, str) self.recently_combobox.set_model(liststore) @@ -2480,12 +2486,22 @@ if account and not gajim.connections[account].private_storage_supported: self.xml.get_object('bookmark_checkbutton').set_sensitive(False) + self.requested_jid = None + gajim.ged.register_event_handler('agent-info-received', ged.GUI1, + self._nec_agent_info_received) + gajim.ged.register_event_handler('agent-info-error-received', ged.GUI1, + self._nec_agent_info_error_received) + self.window.show_all() def on_join_groupchat_window_destroy(self, widget): """ Close window """ + gajim.ged.remove_event_handler('agent-info-received', ged.GUI1, + self._nec_agent_info_received) + gajim.ged.register_event_handler('agent-info-error-received', ged.GUI1, + self._nec_agent_info_error_received) if self.account and 'join_gc' in gajim.interface.instances[self.account]: # remove us from open windows del gajim.interface.instances[self.account]['join_gc'] @@ -2535,19 +2551,47 @@ def on_browse_rooms_button_clicked(self, widget): server = self.server_comboboxentry.get_child().get_text() - if server in gajim.interface.instances[self.account]['disco']: - gajim.interface.instances[self.account]['disco'][server].window.\ + self.requested_jid = server + gajim.connections[self.account].discoverInfo(server) + + def _nec_agent_info_error_received(self, obj): + if obj.conn.name != self.account: + return + if obj.jid != self.requested_jid: + return + self.requested_jid = None + ErrorDialog(_('Wrong server'), _('%s is not a groupchat server') % \ + obj.jid) + + def _nec_agent_info_received(self, obj): + if obj.conn.name != self.account: + return + if obj.jid != self.requested_jid: + return + self.requested_jid = None + if nbxmpp.NS_MUC not in obj.features: + ErrorDialog(_('Wrong server'), _('%s is not a groupchat server') % \ + obj.jid) + return + if obj.jid in gajim.interface.instances[self.account]['disco']: + gajim.interface.instances[self.account]['disco'][obj.jid].window.\ present() else: try: # Object will add itself to the window dict import disco - disco.ServiceDiscoveryWindow(self.account, server, + disco.ServiceDiscoveryWindow(self.account, obj.jid, initial_identities=[{'category': 'conference', 'type': 'text'}]) except GajimGeneralException: pass + def on_server_entry_changed(self, widget): + if not widget.get_text(): + self.browse_button.set_sensitive(False) + else: + self.browse_button.set_sensitive(True) + def on_cancel_button_clicked(self, widget): """ When Cancel button is clicked

1 0

gajim: move formattings button tooltip to the code to make it mo...
by Yann Leboulanger 30 Jul '13

30 Jul '13

changeset b8fbfada90f8 in /home/hg/repos/gajim branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=b8fbfada90f8 description: move formattings button tooltip to the code to make it more precise. Fixes #7389 diffstat: data/gui/chat_control.ui | 1 - src/chat_control.py | 8 ++++++++ 2 files changed, 8 insertions(+), 1 deletions(-) diffs (31 lines): diff -r 39e2e2a91b48 -r b8fbfada90f8 data/gui/chat_control.ui --- a/data/gui/chat_control.ui Tue Jul 30 23:00:27 2013 +0400 +++ b/data/gui/chat_control.ui Mon Jul 29 10:54:48 2013 +0200 @@ -360,7 +360,6 @@ <property name="receives_default">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="has_tooltip">True</property> - <property name="tooltip_text" translatable="yes">Show a list of formattings</property> <property name="use_action_appearance">False</property> <property name="relief">none</property> <property name="focus_on_click">False</property> diff -r 39e2e2a91b48 -r b8fbfada90f8 src/chat_control.py --- a/src/chat_control.py Tue Jul 30 23:00:27 2013 +0400 +++ b/src/chat_control.py Mon Jul 29 10:54:48 2013 +0200 @@ -1794,8 +1794,16 @@ # Formatting if self.contact.supports(NS_XHTML_IM) and not self.gpg_is_active: self._formattings_button.set_sensitive(True) + self._formattings_button.set_tooltip(_( + 'Show a list of formattings')) else: self._formattings_button.set_sensitive(False) + if self.contact.supports(NS_XHTML_IM): + self._formattings_button.set_tooltip(_('Formattings are not ' + 'available when GPG is active')) + else: + self._formattings_button.set_tooltip(_('This contact does not ' + 'support HTML')) # Add to roster if not isinstance(self.contact, GC_Contact) \

1 0

gajim: use correct function to set tooltip
by Yann Leboulanger 30 Jul '13

30 Jul '13

changeset 25782830bcc5 in /home/hg/repos/gajim branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=25782830bcc5 description: use correct function to set tooltip diffstat: src/chat_control.py | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diffs (25 lines): diff -r b8fbfada90f8 -r 25782830bcc5 src/chat_control.py --- a/src/chat_control.py Mon Jul 29 10:54:48 2013 +0200 +++ b/src/chat_control.py Mon Jul 29 21:11:40 2013 +0200 @@ -1794,16 +1794,16 @@ # Formatting if self.contact.supports(NS_XHTML_IM) and not self.gpg_is_active: self._formattings_button.set_sensitive(True) - self._formattings_button.set_tooltip(_( + self._formattings_button.set_tooltip_text(_( 'Show a list of formattings')) else: self._formattings_button.set_sensitive(False) if self.contact.supports(NS_XHTML_IM): - self._formattings_button.set_tooltip(_('Formattings are not ' - 'available when GPG is active')) + self._formattings_button.set_tooltip_text(_('Formattings are ' + 'not available when GPG is active')) else: - self._formattings_button.set_tooltip(_('This contact does not ' - 'support HTML')) + self._formattings_button.set_tooltip_text(_('This contact does ' + 'not support HTML')) # Add to roster if not isinstance(self.contact, GC_Contact) \

1 0

gajim: don't cycle through blobk nicknames when autocompletting ...
by Yann Leboulanger 30 Jul '13

30 Jul '13

changeset d6ce5aef6431 in /home/hg/repos/gajim branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=d6ce5aef6431 description: don't cycle through blobk nicknames when autocompletting nicks. Fixes #7398 diffstat: src/groupchat_control.py | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diffs (14 lines): diff -r 25782830bcc5 -r d6ce5aef6431 src/groupchat_control.py --- a/src/groupchat_control.py Mon Jul 29 21:11:40 2013 +0200 +++ b/src/groupchat_control.py Mon Jul 29 22:05:39 2013 +0200 @@ -2306,7 +2306,9 @@ list_nick.remove(self.nick) # Skip self for nick in list_nick: - if nick.lower().startswith(begin.lower()): + fjid = self.room_jid + '/' + nick + if nick.lower().startswith(begin.lower()) and not \ + helpers.jid_is_blocked(self.account, fjid): # the word is the begining of a nick self.nick_hits.append(nick) if len(self.nick_hits):

1 0

python-nbxmpp: fix connecting via socks5 proxy
by Yann Leboulanger 30 Jul '13

30 Jul '13

changeset 3503b0321a4f in /home/hg/repos/python-nbxmpp details:http://hg.gajim.org/python-nbxmpp?cmd=changeset;node=3503b0321a4f description: fix connecting via socks5 proxy diffstat: nbxmpp/proxy_connectors.py | 36 ++++++++++++++++++------------------ nbxmpp/transports_nb.py | 5 ++++- 2 files changed, 22 insertions(+), 19 deletions(-) diffs (109 lines): diff -r 381e96f81981 -r 3503b0321a4f nbxmpp/proxy_connectors.py --- a/nbxmpp/proxy_connectors.py Sun Jul 28 22:35:47 2013 +0200 +++ b/nbxmpp/proxy_connectors.py Tue Jul 30 22:23:36 2013 +0200 @@ -128,9 +128,9 @@ def start_connecting(self): log.info('Proxy server contacted, performing authentification') if self.proxy_user and self.proxy_pass: - to_send = '\x05\x02\x00\x02' + to_send = b'\x05\x02\x00\x02' else: - to_send = '\x05\x01\x00' + to_send = b'\x05\x01\x00' self.onreceive(self._on_greeting_sent) self.send(to_send) @@ -148,15 +148,15 @@ return self._on_proxy_auth('\x01\x00') elif reply[1] == '\x02': to_send = '\x01' + chr(len(self.proxy_user)) + self.proxy_user +\ - chr(len(self.proxy_pass)) + self.proxy_pass + chr(len(self.proxy_pass)) + self.proxy_pass self.onreceive(self._on_proxy_auth) self.send(to_send) else: if reply[1] == '\xff': log.error('Authentification to proxy impossible: no acceptable ' - 'auth method') + 'auth method') self.on_failure('Authentification to proxy impossible: no ' - 'acceptable authentification method') + 'acceptable authentification method') return log.error('Invalid proxy reply') self.on_failure('Invalid proxy reply') @@ -179,18 +179,18 @@ return log.info('Authentification successfull. Jabber server contacted.') # Request connection - req = "\x05\x01\x00" + req = b'\x05\x01\x00' # If the given destination address is an IP address, we'll # use the IPv4 address request even if remote resolving was specified. try: self.ipaddr = socket.inet_aton(self.xmpp_server[0]) - req = req + "\x01" + self.ipaddr + req = req + b'\x01' + self.ipaddr except socket.error: # Well it's not an IP number, so it's probably a DNS name. # if self.__proxy[3]==True: # Resolve remotely self.ipaddr = None - req = req + "\x03" + chr(len(self.xmpp_server[0])) + self.xmpp_server[0] + req = req + b'\x03' + (chr(len(self.xmpp_server[0])) + self.xmpp_server[0]).encode('utf-8') # else: # # Resolve locally # self.ipaddr = socket.inet_aton(socket.gethostbyname(self.xmpp_server[0])) @@ -210,17 +210,17 @@ log.error('Invalid proxy reply') self.on_failure('Invalid proxy reply') return - if reply[1] != "\x00": + if reply[1] != '\x00': # Connection failed if ord(reply[1])<9: errors = ['general SOCKS server failure', - 'connection not allowed by ruleset', - 'Network unreachable', - 'Host unreachable', - 'Connection refused', - 'TTL expired', - 'Command not supported', - 'Address type not supported' + 'connection not allowed by ruleset', + 'Network unreachable', + 'Host unreachable', + 'Connection refused', + 'TTL expired', + 'Command not supported', + 'Address type not supported' ] txt = errors[ord(reply[1])-1] else: @@ -229,9 +229,9 @@ self.on_failure(txt) return # Get the bound address/port - elif reply[3] == "\x01": + elif reply[3] == '\x01': begin, end = 3, 7 - elif reply[3] == "\x03": + elif reply[3] == '\x03': begin, end = 4, 4 + reply[4] else: log.error('Invalid proxy reply') diff -r 381e96f81981 -r 3503b0321a4f nbxmpp/transports_nb.py --- a/nbxmpp/transports_nb.py Sun Jul 28 22:35:47 2013 +0200 +++ b/nbxmpp/transports_nb.py Tue Jul 30 22:23:36 2013 +0200 @@ -497,7 +497,10 @@ """ NonBlockingTransport.send(self, raw_data, now) - r = self.encode_stanza(raw_data) + if isinstance(raw_data, str): + r = self.encode_stanza(raw_data) + else: + r = raw_data if now: self.sendqueue.insert(0, r)

1 0

gajim: GObject -> GLib
by Denis Fomin 30 Jul '13

30 Jul '13

changeset 39e2e2a91b48 in /home/hg/repos/gajim branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=39e2e2a91b48 description: GObject -> GLib diffstat: src/plugins/gui.py | 7 +++---- 1 файлов изменено, 3 вставок(+), 4 удалений(-) различия (31 строк): diff -r 3aed37852ec6 -r 39e2e2a91b48 src/plugins/gui.py --- a/src/plugins/gui.py Tue Jul 30 20:05:28 2013 +0400 +++ b/src/plugins/gui.py Tue Jul 30 23:00:27 2013 +0400 @@ -29,7 +29,7 @@ from gi.repository import Pango from gi.repository import Gtk from gi.repository import GdkPixbuf -from gi.repository import GObject +from gi.repository import GLib import os import gtkgui_helpers @@ -68,8 +68,7 @@ for widget_name in widgets_to_extract: setattr(self, widget_name, self.xml.get_object(widget_name)) - self.installed_plugins_model = Gtk.ListStore(GObject.TYPE_PYOBJECT, - GObject.TYPE_STRING, GObject.TYPE_BOOLEAN, GObject.TYPE_BOOLEAN, + self.installed_plugins_model = Gtk.ListStore(object, str, bool, bool, GdkPixbuf.Pixbuf) self.installed_plugins_treeview.set_model(self.installed_plugins_model) self.installed_plugins_treeview.set_rules_hint(True) @@ -117,7 +116,7 @@ def on_plugins_notebook_switch_page(self, widget, page, page_num): - GObject.idle_add(self.xml.get_object('close_button').grab_focus) + GLib.idle_add(self.xml.get_object('close_button').grab_focus) @log_calls('PluginsWindow') def installed_plugins_treeview_selection_changed(self, treeview_selection):

1 0

gajim: don't allow to browse non-MUC server in join groupchat di...
by Yann Leboulanger 30 Jul '13

30 Jul '13

changeset 77abba75deb0 in /home/hg/repos/gajim branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=77abba75deb0 description: don't allow to browse non-MUC server in join groupchat dialog. diffstat: src/common/connection_handlers.py | 24 ++++++++++++-- src/common/connection_handlers_events.py | 9 +++++ src/dialogs.py | 50 ++++++++++++++++++++++++++++++- 3 files changed, 76 insertions(+), 7 deletions(-) diffs (203 lines): diff -r 14310e6d053d -r 77abba75deb0 src/common/connection_handlers.py --- a/src/common/connection_handlers.py Mon Jul 29 22:05:39 2013 +0200 +++ b/src/common/connection_handlers.py Tue Jul 30 20:09:52 2013 +0200 @@ -104,7 +104,8 @@ jid is mandatory; name, node, action is optional. """ - self._discover(nbxmpp.NS_DISCO_ITEMS, jid, node, id_prefix) + id_ = self._discover(nbxmpp.NS_DISCO_ITEMS, jid, node, id_prefix) + self.disco_items_ids.append(id_) def discoverInfo(self, jid, node=None, id_prefix=None): """ @@ -112,7 +113,8 @@ For identity: category, type is mandatory, name is optional. For feature: var is mandatory. """ - self._discover(nbxmpp.NS_DISCO_INFO, jid, node, id_prefix) + id_ = self._discover(nbxmpp.NS_DISCO_INFO, jid, node, id_prefix) + self.disco_info_ids.append(id_) def request_register_agent_info(self, agent): if not self.connection or self.connected < 2: @@ -166,12 +168,14 @@ if not self.connection or self.connected < 2: return iq = nbxmpp.Iq(typ='get', to=jid, queryNS=ns) + id_ = self.connection.getAnID() if id_prefix: - id_ = self.connection.getAnID() - iq.setID('%s%s' % (id_prefix, id_)) + id_ = id_prefix + id_ + iq.setID(id_) if node: iq.setQuerynode(node) self.connection.send(iq) + return id_ def _ReceivedRegInfo(self, con, resp, agent): nbxmpp.features_nb._ReceivedRegInfo(con, resp, agent) @@ -1439,6 +1443,10 @@ self.version_ids = [] # IDs of urn:xmpp:time requests self.entity_time_ids = [] + # IDs of disco#items requests + self.disco_items_ids = [] + # IDs of disco#info requests + self.disco_info_ids = [] # ID of urn:xmpp:ping requests self.awaiting_xmpp_ping_id = None self.continue_connect_info = None @@ -1590,6 +1598,14 @@ gajim.nec.push_incoming_event(TimeResultReceivedEvent(None, conn=self, stanza=obj.stanza)) return True + if obj.id_ in self.disco_items_ids: + gajim.nec.push_incoming_event(AgentItemsErrorReceivedEvent(None, + conn=self, stanza=obj.stanza)) + return True + if obj.id_ in self.disco_info_ids: + gajim.nec.push_incoming_event(AgentInfoErrorReceivedEvent(None, + conn=self, stanza=obj.stanza)) + return True def _nec_private_storate_bookmarks_received(self, obj): if obj.conn.name != self.name: diff -r 14310e6d053d -r 77abba75deb0 src/common/connection_handlers_events.py --- a/src/common/connection_handlers_events.py Mon Jul 29 22:05:39 2013 +0200 +++ b/src/common/connection_handlers_events.py Tue Jul 30 20:09:52 2013 +0200 @@ -1929,6 +1929,8 @@ self.get_jid_resource() hostname = gajim.config.get_per('accounts', self.conn.name, 'hostname') self.get_id() + if self.id_ in self.conn.disco_items_ids: + self.conn.disco_items_ids.remove(self.id_) if self.fjid == hostname and self.id_[:6] == 'Gajim_': for item in self.items: self.conn.discoverInfo(item['jid'], id_prefix='Gajim_') @@ -1941,6 +1943,9 @@ def generate(self): self.get_jid_resource() + self.get_id() + if self.id_ in self.conn.disco_items_ids: + self.conn.disco_items_ids.remove(self.id_) return True class AgentInfoReceivedEvent(nec.NetworkIncomingEvent, HelperEvent): @@ -1949,6 +1954,8 @@ def generate(self): self.get_id() + if self.id_ in self.conn.disco_info_ids: + self.conn.disco_info_ids.remove(self.id_) if self.id_ is None: log.warn('Invalid IQ received without an ID. Ignoring it: %s' % \ self.stanza) @@ -1993,6 +2000,8 @@ def generate(self): self.get_jid_resource() self.get_id() + if self.id_ in self.conn.disco_info_ids: + self.conn.disco_info_ids.remove(self.id_) return True class FileRequestReceivedEvent(nec.NetworkIncomingEvent, HelperEvent): diff -r 14310e6d053d -r 77abba75deb0 src/dialogs.py --- a/src/dialogs.py Mon Jul 29 22:05:39 2013 +0200 +++ b/src/dialogs.py Tue Jul 30 20:09:52 2013 +0200 @@ -32,6 +32,7 @@ import gtk import gobject import os +import nbxmpp import gtkgui_helpers import vcard @@ -2407,6 +2408,11 @@ if 'jabber' in gajim.connections[account].muc_jid: server_list.append(gajim.connections[account].muc_jid['jabber']) + entry = self.server_comboboxentry.child + entry.connect('changed', self.on_server_entry_changed) + self.browse_button = self.xml.get_object('browse_rooms_button') + self.browse_button.set_sensitive(False) + self.recently_combobox = self.xml.get_object('recently_combobox') liststore = gtk.ListStore(str, str) self.recently_combobox.set_model(liststore) @@ -2451,12 +2457,22 @@ if account and not gajim.connections[account].private_storage_supported: self.xml.get_object('bookmark_checkbutton').set_sensitive(False) + self.requested_jid = None + gajim.ged.register_event_handler('agent-info-received', ged.GUI1, + self._nec_agent_info_received) + gajim.ged.register_event_handler('agent-info-error-received', ged.GUI1, + self._nec_agent_info_error_received) + self.window.show_all() def on_join_groupchat_window_destroy(self, widget): """ Close window """ + gajim.ged.remove_event_handler('agent-info-received', ged.GUI1, + self._nec_agent_info_received) + gajim.ged.register_event_handler('agent-info-error-received', ged.GUI1, + self._nec_agent_info_error_received) if self.account and 'join_gc' in gajim.interface.instances[self.account]: # remove us from open windows del gajim.interface.instances[self.account]['join_gc'] @@ -2505,19 +2521,47 @@ def on_browse_rooms_button_clicked(self, widget): server = self.server_comboboxentry.child.get_text().decode('utf-8') - if server in gajim.interface.instances[self.account]['disco']: - gajim.interface.instances[self.account]['disco'][server].window.\ + self.requested_jid = server + gajim.connections[self.account].discoverInfo(server) + + def _nec_agent_info_error_received(self, obj): + if obj.conn.name != self.account: + return + if obj.jid != self.requested_jid: + return + self.requested_jid = None + ErrorDialog(_('Wrong server'), _('%s is not a groupchat server') % \ + obj.jid) + + def _nec_agent_info_received(self, obj): + if obj.conn.name != self.account: + return + if obj.jid != self.requested_jid: + return + self.requested_jid = None + if nbxmpp.NS_MUC not in obj.features: + ErrorDialog(_('Wrong server'), _('%s is not a groupchat server') % \ + obj.jid) + return + if obj.jid in gajim.interface.instances[self.account]['disco']: + gajim.interface.instances[self.account]['disco'][obj.jid].window.\ present() else: try: # Object will add itself to the window dict import disco - disco.ServiceDiscoveryWindow(self.account, server, + disco.ServiceDiscoveryWindow(self.account, obj.jid, initial_identities=[{'category': 'conference', 'type': 'text'}]) except GajimGeneralException: pass + def on_server_entry_changed(self, widget): + if not widget.get_text(): + self.browse_button.set_sensitive(False) + else: + self.browse_button.set_sensitive(True) + def on_cancel_button_clicked(self, widget): """ When Cancel button is clicked

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