Commits February 2010

commits@gajim.org

4 participants
103 discussions

gajim: don't fail to connect when no <stream:features> is sent b...
by Yann Leboulanger 23 Feb '10

23 Feb '10

changeset a4de7f9e6aff in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=a4de7f9e6aff description: don't fail to connect when no <stream:features> is sent by server. Fixes #5610 diffstat: src/common/connection_handlers.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 0d988b14b888 -r a4de7f9e6aff src/common/connection_handlers.py --- a/src/common/connection_handlers.py Sun Feb 14 23:12:45 2010 +0100 +++ b/src/common/connection_handlers.py Tue Feb 16 09:27:19 2010 +0100 @@ -1185,7 +1185,7 @@ # We can now continue connection by requesting the roster version = None - if con.Stream.features.getTag('ver', + if con.Stream.features and con.Stream.features.getTag('ver', namespace=common.xmpp.NS_ROSTER_VER): version = gajim.config.get_per('accounts', self.name, 'roster_version')

1 0

gajim: split XEP-0096 (FT negociation) and XEP-0066 (Socks5 byte...
by Yann Leboulanger 22 Feb '10

22 Feb '10

changeset 3e3399954e07 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=3e3399954e07 description: split XEP-0096 (FT negociation) and XEP-0066 (Socks5 bytestream) into 2 clases diffstat: AUTHORS | 10 +- src/common/connection_handlers.py | 10 +- src/common/protocol/bytestream.py | 369 ++++++++++--------- src/common/zeroconf/connection_handlers_zeroconf.py | 7 +- 4 files changed, 199 insertions(+), 197 deletions(-) diffs (truncated from 487 to 300 lines): diff -r 86c9b704dcee -r 3e3399954e07 AUTHORS --- a/AUTHORS Mon Feb 22 09:57:59 2010 +0100 +++ b/AUTHORS Mon Feb 22 16:29:01 2010 +0100 @@ -1,8 +1,13 @@ CURRENT DEVELOPERS: Alexander Cherniuk (ts33kr AT gmail.com) +Nikos Kouremenos (kourem AT gmail.com) Yann Leboulanger (asterix AT lagaule.org) +Julien Pivotto (roidelapluie AT gmail.com) Jonathan Schleifer (js-gajim AT webkeks.org) +Travis Shirk (travis AT pobox.com) +Brendan Taylor (whateley AT gmail.com) +Jean-Marie Traissard (jim AT lapin.org) PAST DEVELOPERS: @@ -10,8 +15,3 @@ Stephan Erb (steve-e AT h3c.de) Vincent Hanquez (tab AT snarc.org) Dimitur Kirov (dkirov AT gmail.com) -Nikos Kouremenos (kourem AT gmail.com) -Julien Pivotto (roidelapluie AT gmail.com) -Travis Shirk (travis AT pobox.com) -Brendan Taylor (whateley AT gmail.com) -Jean-Marie Traissard (jim AT lapin.org) diff -r 86c9b704dcee -r 3e3399954e07 src/common/connection_handlers.py --- a/src/common/connection_handlers.py Mon Feb 22 09:57:59 2010 +0100 +++ b/src/common/connection_handlers.py Mon Feb 22 16:29:01 2010 +0100 @@ -49,7 +49,7 @@ from common.pubsub import ConnectionPubSub from common.pep import ConnectionPEP from common.protocol.caps import ConnectionCaps -from common.protocol.bytestream import ConnectionBytestream +from common.protocol.bytestream import ConnectionSocks5Bytestream import common.caps_cache as capscache if gajim.HAVE_FARSIGHT: from common.jingle import ConnectionJingle @@ -915,13 +915,13 @@ return sess -class ConnectionHandlers(ConnectionVcard, ConnectionBytestream, - ConnectionDisco, ConnectionCommands, ConnectionPubSub, ConnectionPEP, - ConnectionCaps, ConnectionHandlersBase, ConnectionJingle): +class ConnectionHandlers(ConnectionVcard, ConnectionSocks5Bytestream, +ConnectionDisco, ConnectionCommands, ConnectionPubSub, ConnectionPEP, +ConnectionCaps, ConnectionHandlersBase, ConnectionJingle): def __init__(self): global HAS_IDLE ConnectionVcard.__init__(self) - ConnectionBytestream.__init__(self) + ConnectionSocks5Bytestream.__init__(self) ConnectionCommands.__init__(self) ConnectionPubSub.__init__(self) ConnectionPEP.__init__(self, account=self.name, dispatcher=self, diff -r 86c9b704dcee -r 3e3399954e07 src/common/protocol/bytestream.py --- a/src/common/protocol/bytestream.py Mon Feb 22 09:57:59 2010 +0100 +++ b/src/common/protocol/bytestream.py Mon Feb 22 16:29:01 2010 +0100 @@ -75,6 +75,190 @@ def __init__(self): self.files_props = {} + def _ft_get_our_jid(self): + our_jid = gajim.get_jid_from_account(self.name) + resource = self.server_resource + return our_jid + '/' + resource + + def _ft_get_receiver_jid(self, file_props): + return file_props['receiver'].jid + '/' + file_props['receiver'].resource + + def _ft_get_from(self, iq_obj): + return helpers.get_full_jid_from_iq(iq_obj) + + def _ft_get_streamhost_jid_attr(self, streamhost): + return helpers.parse_jid(streamhost.getAttr('jid')) + + def send_file_request(self, file_props): + """ + Send iq for new FT request + """ + if not self.connection or self.connected < 2: + return + file_props['sender'] = self._ft_get_our_jid() + fjid = self._ft_get_receiver_jid(file_props) + iq = xmpp.Iq(to=fjid, typ='set') + iq.setID(file_props['sid']) + self.files_props[file_props['sid']] = file_props + si = iq.setTag('si', namespace=xmpp.NS_SI) + si.setAttr('profile', xmpp.NS_FILE) + si.setAttr('id', file_props['sid']) + file_tag = si.setTag('file', namespace=xmpp.NS_FILE) + file_tag.setAttr('name', file_props['name']) + file_tag.setAttr('size', file_props['size']) + desc = file_tag.setTag('desc') + if 'desc' in file_props: + desc.setData(file_props['desc']) + file_tag.setTag('range') + feature = si.setTag('feature', namespace=xmpp.NS_FEATURE) + _feature = xmpp.DataForm(typ='form') + feature.addChild(node=_feature) + field = _feature.setField('stream-method') + field.setAttr('type', 'list-single') + field.addOption(xmpp.NS_BYTESTREAM) + self.connection.send(iq) + + def send_file_approval(self, file_props): + """ + Send iq, confirming that we want to download the file + """ + # user response to ConfirmationDialog may come after we've disconneted + if not self.connection or self.connected < 2: + return + iq = xmpp.Iq(to=unicode(file_props['sender']), typ='result') + iq.setAttr('id', file_props['request-id']) + si = iq.setTag('si', namespace=xmpp.NS_SI) + if 'offset' in file_props and file_props['offset']: + file_tag = si.setTag('file', namespace=xmpp.NS_FILE) + range_tag = file_tag.setTag('range') + range_tag.setAttr('offset', file_props['offset']) + feature = si.setTag('feature', namespace=xmpp.NS_FEATURE) + _feature = xmpp.DataForm(typ='submit') + feature.addChild(node=_feature) + field = _feature.setField('stream-method') + field.delAttr('type') + field.setValue(xmpp.NS_BYTESTREAM) + self.connection.send(iq) + + def send_file_rejection(self, file_props, code='403', typ=None): + """ + Inform sender that we refuse to download the file + + typ is used when code = '400', in this case typ can be 'strean' for + invalid stream or 'profile' for invalid profile + """ + # user response to ConfirmationDialog may come after we've disconneted + if not self.connection or self.connected < 2: + return + iq = xmpp.Iq(to=unicode(file_props['sender']), typ='error') + iq.setAttr('id', file_props['request-id']) + if code == '400' and typ in ('stream', 'profile'): + name = 'bad-request' + text = '' + else: + name = 'forbidden' + text = 'Offer Declined' + err = xmpp.ErrorNode(code=code, typ='cancel', name=name, text=text) + if code == '400' and typ in ('stream', 'profile'): + if typ == 'stream': + err.setTag('no-valid-streams', namespace=xmpp.NS_SI) + else: + err.setTag('bad-profile', namespace=xmpp.NS_SI) + iq.addChild(node=err) + self.connection.send(iq) + + def _siResultCB(self, con, iq_obj): + file_props = self.files_props.get(iq_obj.getAttr('id')) + if not file_props: + return + if 'request-id' in file_props: + # we have already sent streamhosts info + return + file_props['receiver'] = self._ft_get_from(iq_obj) + si = iq_obj.getTag('si') + file_tag = si.getTag('file') + range_tag = None + if file_tag: + range_tag = file_tag.getTag('range') + if range_tag: + offset = range_tag.getAttr('offset') + if offset: + file_props['offset'] = int(offset) + length = range_tag.getAttr('length') + if length: + file_props['length'] = int(length) + feature = si.setTag('feature') + if feature.getNamespace() != xmpp.NS_FEATURE: + return + form_tag = feature.getTag('x') + form = xmpp.DataForm(node=form_tag) + field = form.getField('stream-method') + if field.getValue() != xmpp.NS_BYTESTREAM: + return + self._send_socks5_info(file_props) + raise xmpp.NodeProcessed + + def _siSetCB(self, con, iq_obj): + jid = self._ft_get_from(iq_obj) + file_props = {'type': 'r'} + file_props['sender'] = jid + file_props['request-id'] = unicode(iq_obj.getAttr('id')) + si = iq_obj.getTag('si') + profile = si.getAttr('profile') + mime_type = si.getAttr('mime-type') + if profile != xmpp.NS_FILE: + self.send_file_rejection(file_props, code='400', typ='profile') + raise xmpp.NodeProcessed + feature_tag = si.getTag('feature', namespace=xmpp.NS_FEATURE) + if not feature_tag: + return + form_tag = feature_tag.getTag('x', namespace=xmpp.NS_DATA) + if not form_tag: + return + form = dataforms.ExtendForm(node=form_tag) + for f in form.iter_fields(): + if f.var == 'stream-method' and f.type == 'list-single': + values = [o[1] for o in f.options] + if xmpp.NS_BYTESTREAM in values: + break + else: + self.send_file_rejection(file_props, code='400', typ='stream') + raise xmpp.NodeProcessed + file_tag = si.getTag('file') + for attribute in file_tag.getAttrs(): + if attribute in ('name', 'size', 'hash', 'date'): + val = file_tag.getAttr(attribute) + if val is None: + continue + file_props[attribute] = val + file_desc_tag = file_tag.getTag('desc') + if file_desc_tag is not None: + file_props['desc'] = file_desc_tag.getData() + + if mime_type is not None: + file_props['mime-type'] = mime_type + file_props['receiver'] = self._ft_get_our_jid() + file_props['sid'] = unicode(si.getAttr('id')) + file_props['transfered_size'] = [] + gajim.socks5queue.add_file_props(self.name, file_props) + self.dispatch('FILE_REQUEST', (jid, file_props)) + raise xmpp.NodeProcessed + + def _siErrorCB(self, con, iq_obj): + si = iq_obj.getTag('si') + profile = si.getAttr('profile') + if profile != xmpp.NS_FILE: + return + file_props = self.files_props.get(iq_obj.getAttr('id')) + if not file_props: + return + jid = self._ft_get_from(iq_obj) + file_props['error'] = -3 + self.dispatch('FILE_REQUEST_ERROR', (jid, file_props, '')) + raise xmpp.NodeProcessed + +class ConnectionSocks5Bytestream(ConnectionBytestream): + def send_success_connect_reply(self, streamhost): """ Send reply to the initiator of FT that we made a connection @@ -252,92 +436,6 @@ else: return [] - def send_file_rejection(self, file_props, code='403', typ=None): - """ - Inform sender that we refuse to download the file - - typ is used when code = '400', in this case typ can be 'strean' for - invalid stream or 'profile' for invalid profile - """ - # user response to ConfirmationDialog may come after we've disconneted - if not self.connection or self.connected < 2: - return - iq = xmpp.Iq(to=unicode(file_props['sender']), typ='error') - iq.setAttr('id', file_props['request-id']) - if code == '400' and typ in ('stream', 'profile'): - name = 'bad-request' - text = '' - else: - name = 'forbidden' - text = 'Offer Declined' - err = xmpp.ErrorNode(code=code, typ='cancel', name=name, text=text) - if code == '400' and typ in ('stream', 'profile'): - if typ == 'stream': - err.setTag('no-valid-streams', namespace=xmpp.NS_SI) - else: - err.setTag('bad-profile', namespace=xmpp.NS_SI) - iq.addChild(node=err) - self.connection.send(iq) - - def send_file_approval(self, file_props): - """ - Send iq, confirming that we want to download the file - """ - # user response to ConfirmationDialog may come after we've disconneted - if not self.connection or self.connected < 2: - return - iq = xmpp.Iq(to=unicode(file_props['sender']), typ='result') - iq.setAttr('id', file_props['request-id']) - si = iq.setTag('si', namespace=xmpp.NS_SI) - if 'offset' in file_props and file_props['offset']: - file_tag = si.setTag('file', namespace=xmpp.NS_FILE) - range_tag = file_tag.setTag('range') - range_tag.setAttr('offset', file_props['offset']) - feature = si.setTag('feature', namespace=xmpp.NS_FEATURE) - _feature = xmpp.DataForm(typ='submit') - feature.addChild(node=_feature) - field = _feature.setField('stream-method') - field.delAttr('type')

1 0

gajim: don't traceback when using metacontact over several accou...
by Yann Leboulanger 22 Feb '10

22 Feb '10

changeset 86c9b704dcee in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=86c9b704dcee description: don't traceback when using metacontact over several accounts. Fixes #5616 diffstat: AUTHORS | 10 +++++----- src/gui_interface.py | 2 ++ 2 files changed, 7 insertions(+), 5 deletions(-) diffs (38 lines): diff -r 760ea23b02a8 -r 86c9b704dcee AUTHORS --- a/AUTHORS Sun Feb 21 23:35:29 2010 +0100 +++ b/AUTHORS Mon Feb 22 09:57:59 2010 +0100 @@ -1,13 +1,8 @@ CURRENT DEVELOPERS: Alexander Cherniuk (ts33kr AT gmail.com) -Nikos Kouremenos (kourem AT gmail.com) Yann Leboulanger (asterix AT lagaule.org) -Julien Pivotto (roidelapluie AT gmail.com) Jonathan Schleifer (js-gajim AT webkeks.org) -Travis Shirk (travis AT pobox.com) -Brendan Taylor (whateley AT gmail.com) -Jean-Marie Traissard (jim AT lapin.org) PAST DEVELOPERS: @@ -15,3 +10,8 @@ Stephan Erb (steve-e AT h3c.de) Vincent Hanquez (tab AT snarc.org) Dimitur Kirov (dkirov AT gmail.com) +Nikos Kouremenos (kourem AT gmail.com) +Julien Pivotto (roidelapluie AT gmail.com) +Travis Shirk (travis AT pobox.com) +Brendan Taylor (whateley AT gmail.com) +Jean-Marie Traissard (jim AT lapin.org) diff -r 760ea23b02a8 -r 86c9b704dcee src/gui_interface.py --- a/src/gui_interface.py Sun Feb 21 23:35:29 2010 +0100 +++ b/src/gui_interface.py Mon Feb 22 09:57:59 2010 +0100 @@ -480,6 +480,8 @@ jid_ = info['jid'] c_ = gajim.contacts.get_contact_with_highest_priority( acct_, jid_) + if not c_: + continue if c_.show not in ('offline', 'error'): show_notif = False break

1 0

gajim: Split room jid field in join groupchat dialog. Fixes #5528
by Yann Leboulanger 21 Feb '10

21 Feb '10

changeset 760ea23b02a8 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=760ea23b02a8 description: Split room jid field in join groupchat dialog. Fixes #5528 Add browse rooms button in join groupchat dialog. Fixes #3546 diffstat: data/gui/join_groupchat_window.ui | 80 +++++++++++++++++++++++++++++++---- data/gui/service_discovery_window.ui | 3 +- src/dialogs.py | 54 ++++++++++++++++++++++- src/disco.py | 7 ++- 4 files changed, 126 insertions(+), 18 deletions(-) diffs (287 lines): diff -r 61dc88ed5550 -r 760ea23b02a8 data/gui/join_groupchat_window.ui --- a/data/gui/join_groupchat_window.ui Fri Feb 19 13:54:42 2010 +0100 +++ b/data/gui/join_groupchat_window.ui Sun Feb 21 23:35:29 2010 +0100 @@ -15,7 +15,7 @@ <child> <object class="GtkTable" id="table15"> <property name="visible">True</property> - <property name="n_rows">7</property> + <property name="n_rows">8</property> <property name="n_columns">2</property> <property name="column_spacing">12</property> <property name="row_spacing">6</property> @@ -110,8 +110,8 @@ <property name="label" translatable="yes">Password:</property> </object> <packing> - <property name="top_attach">4</property> - <property name="bottom_attach">5</property> + <property name="top_attach">5</property> + <property name="bottom_attach">6</property> <property name="x_options">GTK_FILL</property> <property name="y_options"></property> </packing> @@ -126,14 +126,14 @@ <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> - <property name="top_attach">4</property> - <property name="bottom_attach">5</property> + <property name="top_attach">5</property> + <property name="bottom_attach">6</property> <property name="y_options"></property> </packing> </child> <child> <object class="GtkCheckButton" id="auto_join_checkbutton"> - <property name="label" translatable="yes">Join this room automatically when I connect</property> + <property name="label" translatable="yes">Join this room _automatically when I connect</property> <property name="visible">True</property> <property name="sensitive">False</property> <property name="can_focus">True</property> @@ -143,8 +143,8 @@ </object> <packing> <property name="right_attach">2</property> - <property name="top_attach">6</property> - <property name="bottom_attach">7</property> + <property name="top_attach">7</property> + <property name="bottom_attach">8</property> <property name="x_options">GTK_FILL</property> <property name="y_options"></property> </packing> @@ -174,21 +174,69 @@ </child> <child> <object class="GtkCheckButton" id="bookmark_checkbutton"> - <property name="label" translatable="yes">Bookmark this room</property> + <property name="label" translatable="yes">_Bookmark this room</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> + <property name="use_underline">True</property> <property name="draw_indicator">True</property> <signal name="toggled" handler="on_bookmark_checkbutton_toggled"/> </object> <packing> <property name="right_attach">2</property> - <property name="top_attach">5</property> - <property name="bottom_attach">6</property> + <property name="top_attach">6</property> + <property name="bottom_attach">7</property> <property name="x_options">GTK_FILL</property> <property name="y_options"></property> </packing> </child> + <child> + <object class="GtkLabel" id="label1"> + <property name="visible">True</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">Server:</property> + </object> + <packing> + <property name="top_attach">4</property> + <property name="bottom_attach">5</property> + </packing> + </child> + <child> + <object class="GtkHBox" id="hbox1"> + <property name="visible">True</property> + <property name="spacing">6</property> + <child> + <object class="GtkComboBoxEntry" id="server_comboboxentry"> + <property name="visible">True</property> + <property name="model">liststore1</property> + <property name="text_column">0</property> + </object> + <packing> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkButton" id="browse_rooms_button"> + <property name="label" translatable="yes">Bro_wse Rooms</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="image">image1</property> + <property name="use_underline">True</property> + <signal name="clicked" handler="on_browse_rooms_button_clicked"/> + </object> + <packing> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <property name="top_attach">4</property> + <property name="bottom_attach">5</property> + </packing> + </child> </object> <packing> <property name="position">0</property> @@ -275,4 +323,14 @@ </object> </child> </object> + <object class="GtkListStore" id="liststore1"> + <columns> +  + <column type="gchararray"/> + </columns> + </object> + <object class="GtkImage" id="image1"> + <property name="visible">True</property> + <property name="stock">gtk-find</property> + </object> </interface> diff -r 61dc88ed5550 -r 760ea23b02a8 data/gui/service_discovery_window.ui --- a/data/gui/service_discovery_window.ui Fri Feb 19 13:54:42 2010 +0100 +++ b/data/gui/service_discovery_window.ui Sun Feb 21 23:35:29 2010 +0100 @@ -4,7 +4,7 @@  <object class="GtkListStore" id="liststore1"> <columns> -  +  <column type="gchararray"/> </columns> </object> @@ -71,7 +71,6 @@ <property name="visible">True</property> <property name="model">liststore1</property> <signal name="changed" handler="on_address_comboboxentry_changed"/> - <signal name="key_press_event" handler="on_address_comboboxentry_key_press_event"/> <child> <object class="GtkCellRendererText" id="cellrenderertext1"/> <attributes> diff -r 61dc88ed5550 -r 760ea23b02a8 src/dialogs.py --- a/src/dialogs.py Fri Feb 19 13:54:42 2010 +0100 +++ b/src/dialogs.py Sun Feb 21 23:35:29 2010 +0100 @@ -38,6 +38,7 @@ import conversation_textview import message_control import dataforms_widget +import disco from random import randrange from common import pep @@ -2156,7 +2157,6 @@ self._nickname_entry = self.xml.get_object('nickname_entry') self._password_entry = self.xml.get_object('password_entry') - self._room_jid_entry.set_text(room_jid) self._nickname_entry.set_text(nick) if password: self._password_entry.set_text(password) @@ -2171,6 +2171,13 @@ title = _('Join Group Chat') self.window.set_title(title) + self.server_comboboxentry = self.xml.get_object('server_comboboxentry') + self.server_model = self.server_comboboxentry.get_model() + server_list = [] + # get the muc server of our server + if 'jabber' in gajim.connections[account].muc_jid: + server_list.append(gajim.connections[account].muc_jid['jabber']) + self.recently_combobox = self.xml.get_object('recently_combobox') liststore = gtk.ListStore(str) self.recently_combobox.set_model(liststore) @@ -2180,6 +2187,16 @@ self.recently_groupchat = gajim.config.get('recently_groupchat').split() for g in self.recently_groupchat: self.recently_combobox.append_text(g) + server = gajim.get_server_from_jid(g) + if server not in server_list and not server.startswith('irc'): + server_list.append(server) + + for s in server_list: + self.server_model.append([s]) + self.server_comboboxentry.set_active(0) + + self._set_room_jid(room_jid) + if len(self.recently_groupchat) == 0: self.recently_combobox.set_sensitive(False) elif room_jid == '': @@ -2229,11 +2246,39 @@ self.account = model[iter_][0].decode('utf-8') self.on_required_entry_changed(self._nickname_entry) + def _select_server(self, server): + i = 0 + for s in self.server_model: + if s[0] == server: + self.server_comboboxentry.set_active(i) + break + i += 1 + + def _set_room_jid(self, room_jid): + room, server = gajim.get_name_and_server_from_jid(room_jid) + self._select_server(server) + self._room_jid_entry.set_text(room) + def on_recently_combobox_changed(self, widget): model = widget.get_model() iter_ = widget.get_active_iter() room_jid = model[iter_][0].decode('utf-8') - self._room_jid_entry.set_text(room_jid) + self._set_room_jid(room_jid) + + def on_browse_rooms_button_clicked(self, widget): + server = self.server_model[self.server_comboboxentry.get_active()][0].\ + decode('utf-8') + if server in gajim.interface.instances[self.account]['disco']: + gajim.interface.instances[self.account]['disco'][server].window.\ + present() + else: + try: + # Object will add itself to the window dict + disco.ServiceDiscoveryWindow(self.account, server, + initial_identities=[{'category': 'conference', + 'type': 'text'}]) + except GajimGeneralException: + pass def on_cancel_button_clicked(self, widget): """ @@ -2258,7 +2303,10 @@ 'groupchat.')) return nickname = self._nickname_entry.get_text().decode('utf-8') - room_jid = self._room_jid_entry.get_text().decode('utf-8') + server = self.server_model[self.server_comboboxentry.get_active()][0].\ + decode('utf-8') + room = self._room_jid_entry.get_text().decode('utf-8') + room_jid = room + '@' + server password = self._password_entry.get_text().decode('utf-8') try: nickname = helpers.parse_resource(nickname) diff -r 61dc88ed5550 -r 760ea23b02a8 src/disco.py --- a/src/disco.py Fri Feb 19 13:54:42 2010 +0100 +++ b/src/disco.py Sun Feb 21 23:35:29 2010 +0100 @@ -492,8 +492,8 @@ Class that represents the Services Discovery window """ - def __init__(self, account, jid = '', node = '', - address_entry = False, parent = None): + def __init__(self, account, jid='', node='', address_entry=False, + parent=None, initial_identities=None): self.account = account self.parent = parent if not jid: @@ -519,6 +519,9 @@ self.cache = ServicesCache(account) gajim.connections[account].services_cache = self.cache + if initial_identities: + self.cache.agent_info(account, (jid, node, initial_identities, [], + None)) self.xml = gtkgui_helpers.get_gtk_builder('service_discovery_window.ui') self.window = self.xml.get_object('service_discovery_window') self.services_treeview = self.xml.get_object('services_treeview')

1 0

gajim: [fantasticsid] Fix Fake Dataform multi-jid field names. F...
by Yann Leboulanger 19 Feb '10

19 Feb '10

changeset 61dc88ed5550 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=61dc88ed5550 description: [fantasticsid] Fix Fake Dataform multi-jid field names. Fixes #5614 diffstat: src/dataforms_widget.py | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diffs (16 lines): diff -r c1f9e58da6c8 -r 61dc88ed5550 src/dataforms_widget.py --- a/src/dataforms_widget.py Fri Feb 19 13:43:11 2010 +0100 +++ b/src/dataforms_widget.py Fri Feb 19 13:54:42 2010 +0100 @@ -428,9 +428,9 @@ commonwidget = False xml = gtkgui_helpers.get_gtk_builder('data_form_window.ui', - 'item_list_table') - widget = xml.get_object('item_list_table') - treeview = xml.get_object('item_treeview') + 'multiple_form_hbox') + widget = xml.get_object('multiple_form_hbox') + treeview = xml.get_object('records_treeview') listmodel = gtk.ListStore(str) for value in field.iter_values():

1 0

gajim: fix Ctrl+C handling. Fixes #1503
by Yann Leboulanger 19 Feb '10

19 Feb '10

changeset c1f9e58da6c8 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=c1f9e58da6c8 description: fix Ctrl+C handling. Fixes #1503 diffstat: src/chat_control.py | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diffs (19 lines): diff -r 2b3eb01c58d5 -r c1f9e58da6c8 src/chat_control.py --- a/src/chat_control.py Fri Feb 19 09:48:22 2010 +0100 +++ b/src/chat_control.py Fri Feb 19 13:43:11 2010 +0100 @@ -556,10 +556,11 @@ def _conv_textview_key_press_event(self, widget, event): # translate any layout to latin_layout keymap = gtk.gdk.keymap_get_default() - keycode, group, level = keymap.get_entries_for_keyval(event.keyval)[0] - keycodec, group, level = keymap.get_entries_for_keyval(gtk.keysyms.c)[0] - if (event.state & gtk.gdk.CONTROL_MASK and event.keyval in (keycodec, - gtk.keysyms.Insert)) or (event.state & gtk.gdk.SHIFT_MASK and \ + keycode = keymap.get_entries_for_keyval(event.keyval)[0][0] + keycode_c = keymap.get_entries_for_keyval(gtk.keysyms.c)[0][0] + keycode_ins = keymap.get_entries_for_keyval(gtk.keysyms.Insert)[0][0] + if (event.state & gtk.gdk.CONTROL_MASK and keycode in (keycode_c, + keycode_ins)) or (event.state & gtk.gdk.SHIFT_MASK and \ event.keyval in (gtk.keysyms.Page_Down, gtk.keysyms.Page_Up)): return False self.parent_win.notebook.emit('key_press_event', event)

1 0

gajim: save and restore roster position when we click on systray...
by Yann Leboulanger 19 Feb '10

19 Feb '10

changeset 2b3eb01c58d5 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=2b3eb01c58d5 description: save and restore roster position when we click on systray icon. Fixes #5196 diffstat: src/statusicon.py | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diffs (20 lines): diff -r e8aaffb32a91 -r 2b3eb01c58d5 src/statusicon.py --- a/src/statusicon.py Thu Feb 18 22:05:07 2010 +0100 +++ b/src/statusicon.py Fri Feb 19 09:48:22 2010 +0100 @@ -377,9 +377,15 @@ # we could be in another VD right now. eg vd2 # and we want to show it in vd2 if not gtkgui_helpers.possibly_move_window_in_current_desktop(win): + x, y = win.get_position() + gajim.config.set('roster_x-position', x) + gajim.config.set('roster_y-position', y) win.hide() # else we hide it from VD that was visible in else: - win.show_all() + if not win.get_property('visible'): + win.show_all() + win.move(gajim.config.get('roster_x-position'), + gajim.config.get('roster_y-position')) if not gajim.config.get('roster_window_skip_taskbar'): win.set_property('skip-taskbar-hint', False) win.present_with_time(gtk.get_current_event_time())

1 0

gajim: fix CTRL+C with non-latin keyboard. Fixes #1503
by Yann Leboulanger 18 Feb '10

18 Feb '10

changeset e8aaffb32a91 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=e8aaffb32a91 description: fix CTRL+C with non-latin keyboard. Fixes #1503 diffstat: src/chat_control.py | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diffs (16 lines): diff -r ffd87e8a18e8 -r e8aaffb32a91 src/chat_control.py --- a/src/chat_control.py Wed Feb 17 22:23:13 2010 +0100 +++ b/src/chat_control.py Thu Feb 18 22:05:07 2010 +0100 @@ -554,7 +554,11 @@ self.connect_style_event(widget, opts[0], opts[1]) def _conv_textview_key_press_event(self, widget, event): - if (event.state & gtk.gdk.CONTROL_MASK and event.keyval in (gtk.keysyms.c, + # translate any layout to latin_layout + keymap = gtk.gdk.keymap_get_default() + keycode, group, level = keymap.get_entries_for_keyval(event.keyval)[0] + keycodec, group, level = keymap.get_entries_for_keyval(gtk.keysyms.c)[0] + if (event.state & gtk.gdk.CONTROL_MASK and event.keyval in (keycodec, gtk.keysyms.Insert)) or (event.state & gtk.gdk.SHIFT_MASK and \ event.keyval in (gtk.keysyms.Page_Down, gtk.keysyms.Page_Up)): return False

1 0

gajim: don't show sign in/out notifications if another resource ...
by Yann Leboulanger 17 Feb '10

17 Feb '10

changeset ffd87e8a18e8 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=ffd87e8a18e8 description: don't show sign in/out notifications if another resource or a metacontact brother is already connected. Fixes #5318 diffstat: src/gui_interface.py | 65 ++++++++++++++++++++++++++++++++++++++++++--------- 1 files changed, 53 insertions(+), 12 deletions(-) diffs (130 lines): diff -r b957c41a7a28 -r ffd87e8a18e8 src/gui_interface.py --- a/src/gui_interface.py Wed Feb 17 13:35:18 2010 +0100 +++ b/src/gui_interface.py Wed Feb 17 22:23:13 2010 +0100 @@ -285,7 +285,7 @@ # FIXME: Drop and rewrite... statuss = ['offline', 'error', 'online', 'chat', 'away', 'xa', 'dnd', - 'invisible'] + 'invisible'] # Ignore invalid show if array[1] not in statuss: return @@ -295,6 +295,7 @@ jid = array[0].split('/')[0] keyID = array[5] contact_nickname = array[7] + lcontact = [] # Get the proper keyID keyID = helpers.prepare_and_validate_gpg_keyID(account, jid, keyID) @@ -309,8 +310,7 @@ else: ji = jid - highest = gajim.contacts. \ - get_contact_with_highest_priority(account, jid) + highest = gajim.contacts.get_contact_with_highest_priority(account, jid) was_highest = (highest and highest.resource == resource) conn = gajim.connections[account] @@ -422,7 +422,7 @@ account_ji = account + '/' + ji gajim.block_signed_in_notifications[account_ji] = True gobject.timeout_add_seconds(30, - self.unblock_signed_in_notifications, account_ji) + self.unblock_signed_in_notifications, account_ji) locations = (self.instances, self.instances[account]) for location in locations: if 'add_contact' in location: @@ -438,7 +438,7 @@ # (when contact signs out or has errors) if array[1] in ('offline', 'error'): contact1.our_chatstate = contact1.chatstate = \ - contact1.composing_xep = None + contact1.composing_xep = None # TODO: This causes problems when another # resource signs off! @@ -452,7 +452,7 @@ # there won't be any sessions here if the contact terminated # their sessions before going offline (which we do) for sess in conn.get_sessions(ji): - if (ji+'/'+resource) != str(sess.jid): + if (ji + '/' + resource) != str(sess.jid): continue if sess.control: sess.control.no_autonegotiation = False @@ -461,17 +461,58 @@ conn.delete_session(jid, sess.thread_id) self.roster.chg_contact_status(contact1, array[1], status_message, - account) + account) # Notifications if old_show < 2 and new_show > 1: - notify.notify('contact_connected', jid, account, status_message) + show_notif = True + for c in lcontact: + if c.resource == resource: + # we look for other connected resources + continue + if c.show not in ('offline', 'error'): + show_notif = False + break + if show_notif: + # no other resource is connected, let's look in metacontacts + family = gajim.contacts.get_metacontacts_family(account, ji) + for info in family: + acct_ = info['account'] + jid_ = info['jid'] + c_ = gajim.contacts.get_contact_with_highest_priority( + acct_, jid_) + if c_.show not in ('offline', 'error'): + show_notif = False + break + if show_notif: + notify.notify('contact_connected', jid, account, + status_message) if self.remote_ctrl: self.remote_ctrl.raise_signal('ContactPresence', (account, - array)) + array)) elif old_show > 1 and new_show < 2: - notify.notify('contact_disconnected', jid, account, - status_message) + show_notif = True + for c in lcontact: + if c.resource == resource: + # we look for other connected resources + continue + if c.show not in ('offline', 'error'): + show_notif = False + break + if show_notif: + # no other resource is connected, let's look in metacontacts + family = gajim.contacts.get_metacontacts_family(account, ji) + for info in family: + acct_ = info['account'] + jid_ = info['jid'] + c_ = gajim.contacts.get_contact_with_highest_priority( + acct_, jid_) + if c_.show not in ('offline', 'error'): + show_notif = False + break + if show_notif: + notify.notify('contact_disconnected', jid, account, + status_message) if self.remote_ctrl: self.remote_ctrl.raise_signal('ContactAbsence', (account, array)) @@ -480,7 +521,7 @@ # error (<1)) elif new_show > 1: notify.notify('status_change', jid, account, [new_show, - status_message]) + status_message]) if self.remote_ctrl: self.remote_ctrl.raise_signal('ContactStatus', (account, array))

1 0

gajim: fix insecure_connection text to not talk about password, ...
by Yann Leboulanger 17 Feb '10

17 Feb '10

changeset b957c41a7a28 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=b957c41a7a28 description: fix insecure_connection text to not talk about password, and add new warning to inform user when he is about to send plain password on plain connection. Fixes #5607 diffstat: src/common/config.py | 1 + src/common/connection.py | 20 ++++++++++++++++---- src/common/xmpp/auth_nb.py | 4 ++-- src/gui_interface.py | 46 +++++++++++++++++++++++++++++++++++++++++----- 4 files changed, 60 insertions(+), 11 deletions(-) diffs (160 lines): diff -r 22a03955065b -r b957c41a7a28 src/common/config.py --- a/src/common/config.py Wed Feb 17 11:32:55 2010 +0100 +++ b/src/common/config.py Wed Feb 17 13:35:18 2010 +0100 @@ -315,6 +315,7 @@ 'connection_types': [ opt_str, 'tls ssl plain', _('Ordered list (space separated) of connection type to try. Can contain tls, ssl or plain')], 'warn_when_plaintext_connection': [ opt_bool, True, _('Show a warning dialog before sending password on an plaintext connection.') ], 'warn_when_insecure_ssl_connection': [ opt_bool, True, _('Show a warning dialog before using standard SSL library.') ], + 'warn_when_insecure_password': [ opt_bool, True, _('Show a warning dialog before sending PLAIN password over a plain conenction.') ], 'ssl_fingerprint_sha1': [ opt_str, '', '', True ], 'ignore_ssl_errors': [ opt_str, '', _('Space separated list of ssl errors to ignore.') ], 'use_srv': [ opt_bool, True, '', True ], diff -r 22a03955065b -r b957c41a7a28 src/common/connection.py --- a/src/common/connection.py Wed Feb 17 11:32:55 2010 +0100 +++ b/src/common/connection.py Wed Feb 17 13:35:18 2010 +0100 @@ -2182,17 +2182,29 @@ q.setTagData('password', password) self.connection.send(iq) - def get_password(self, callback): + def get_password(self, callback, type_): + self.pasword_callback = (callback, type_) if self.password: - callback(self.password) + self.set_password(self.password) return - self.pasword_callback = callback self.dispatch('PASSWORD_REQUIRED', None) def set_password(self, password): self.password = password if self.pasword_callback: - self.pasword_callback(password) + callback, type_ = self.pasword_callback + if self._current_type == 'plain' and type_ == 'PLAIN' and \ + gajim.config.get_per('accounts', self.name, + 'warn_when_insecure_password'): + self.dispatch('INSECURE_PASSWORD', None) + return + callback(password) + self.pasword_callback = None + + def accept_insecure_password(self): + if self.pasword_callback: + callback, type_ = self.pasword_callback + callback(self.password) self.pasword_callback = None def unregister_account(self, on_remove_success): diff -r 22a03955065b -r b957c41a7a28 src/common/xmpp/auth_nb.py --- a/src/common/xmpp/auth_nb.py Wed Feb 17 11:32:55 2010 +0100 +++ b/src/common/xmpp/auth_nb.py Wed Feb 17 13:35:18 2010 +0100 @@ -241,7 +241,7 @@ if 'PLAIN' in self.mecs: self.mecs.remove('PLAIN') self.mechanism = 'PLAIN' - self._owner._caller.get_password(self.set_password) + self._owner._caller.get_password(self.set_password, 'PLAIN') self.startsasl = SASL_IN_PROCESS raise NodeProcessed self.startsasl = SASL_FAILURE @@ -335,7 +335,7 @@ self.resp['digest-uri'] = 'xmpp/' + self._owner.Server self.resp['charset'] = 'utf-8' # Password is now required - self._owner._caller.get_password(self.set_password) + self._owner._caller.get_password(self.set_password, self.mechanism) elif 'rspauth' in chal: self._owner.send(str(Node('response', attrs={'xmlns':NS_SASL}))) else: diff -r 22a03955065b -r b957c41a7a28 src/gui_interface.py --- a/src/gui_interface.py Wed Feb 17 11:32:55 2010 +0100 +++ b/src/gui_interface.py Wed Feb 17 13:35:18 2010 +0100 @@ -1898,7 +1898,6 @@ def handle_event_plain_connection(self, account, data): # ('PLAIN_CONNECTION', account, (connection)) - server = gajim.config.get_per('accounts', account, 'hostname') def on_ok(is_checked): if not is_checked[0]: on_cancel() @@ -1915,8 +1914,9 @@ gajim.connections[account].disconnect(on_purpose=True) self.handle_event_status(account, 'offline') pritext = _('Insecure connection') - sectext = _('You are about to send your password on an unencrypted ' - 'connection. Are you sure you want to do that?') + sectext = _('You are about to connect to the server with an insecure ' + 'connection. This means all your conversations will be ' + 'exchanged unencrypted. Are you sure you want to do that?') checktext1 = _('Yes, I really want to connect insecurely') checktext2 = _('Do _not ask me again') if 'plain_connection' in self.instances[account]['online_dialog']: @@ -1929,7 +1929,6 @@ def handle_event_insecure_ssl_connection(self, account, data): # ('INSECURE_SSL_CONNECTION', account, (connection, connection_type)) - server = gajim.config.get_per('accounts', account, 'hostname') def on_ok(is_checked): if not is_checked[0]: on_cancel() @@ -1937,7 +1936,7 @@ del self.instances[account]['online_dialog']['insecure_ssl'] if is_checked[1]: gajim.config.set_per('accounts', account, - 'warn_when_insecure_ssl_connection', False) + 'warn_when_insecure_ssl_connection', False) if gajim.connections[account].connected == 0: # We have been disconnecting (too long time since window is # opened) @@ -1964,6 +1963,42 @@ checktext2, on_response_ok=on_ok, on_response_cancel=on_cancel, is_modal=False) + def handle_event_insecure_password(self, account, data): + # ('INSECURE_PASSWORD', account, ()) + def on_ok(is_checked): + if not is_checked[0]: + on_cancel() + return + del self.instances[account]['online_dialog']['insecure_password'] + if is_checked[1]: + gajim.config.set_per('accounts', account, + 'warn_when_insecure_password', False) + if gajim.connections[account].connected == 0: + # We have been disconnecting (too long time since window is + # opened) + # re-connect with auto-accept + gajim.connections[account].connection_auto_accepted = True + show, msg = gajim.connections[account].continue_connect_info[:2] + self.roster.send_status(account, show, msg) + return + gajim.connections[account].accept_insecure_password() + def on_cancel(): + del self.instances[account]['online_dialog']['insecure_password'] + gajim.connections[account].disconnect(on_purpose=True) + self.handle_event_status(account, 'offline') + pritext = _('Insecure connection') + sectext = _('You are about to send your password unencrypted on an ' + 'insecure connection. Are you sure you want to do that?') + checktext1 = _('Yes, I really want to connect insecurely') + checktext2 = _('Do _not ask me again') + if 'insecure_password' in self.instances[account]['online_dialog']: + self.instances[account]['online_dialog']['insecure_password'].\ + destroy() + self.instances[account]['online_dialog']['insecure_password'] = \ + dialogs.ConfirmationDialogDoubleCheck(pritext, sectext, checktext1, + checktext2, on_response_ok=on_ok, on_response_cancel=on_cancel, + is_modal=False) + def handle_event_pubsub_node_removed(self, account, data): # ('PUBSUB_NODE_REMOVED', account, (jid, node)) if 'pep_services' in self.instances[account]: @@ -2085,6 +2120,7 @@ 'PLAIN_CONNECTION': [self.handle_event_plain_connection], 'INSECURE_SSL_CONNECTION': \ [self.handle_event_insecure_ssl_connection], + 'INSECURE_PASSWORD': [self.handle_event_insecure_password], 'PUBSUB_NODE_REMOVED': [self.handle_event_pubsub_node_removed], 'PUBSUB_NODE_NOT_REMOVED': \ [self.handle_event_pubsub_node_not_removed],

1 0

← Newer
1
2
3
4
5
6
7
...
11
Older →

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits February 2010