Commits December 2012

commits@gajim.org

3 participants
51 discussions

gajim: correctly handle SSL errors. Fixes #7252
by Yann Leboulanger 25 Dec '12

25 Dec '12

changeset d343c934b40a in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=d343c934b40a description: correctly handle SSL errors. Fixes #7252 diffstat: src/common/connection.py | 48 +++++++++++++++++++++++++++--------------------- 1 files changed, 27 insertions(+), 21 deletions(-) diffs (74 lines): diff -r 193bd037c983 -r d343c934b40a src/common/connection.py --- a/src/common/connection.py Sun Dec 23 16:23:43 2012 +0100 +++ b/src/common/connection.py Sun Dec 23 17:48:11 2012 +0100 @@ -1308,34 +1308,40 @@ try: errnum = con.Connection.ssl_errnum except AttributeError: - errnum = -1 # we don't have an errnum - if errnum > 0 and str(errnum) not in gajim.config.get_per('accounts', - self.name, 'ignore_ssl_errors').split(): - text = _('The authenticity of the %s certificate could be invalid.' - ) % hostname - if errnum in ssl_error: - text += _('\nSSL Error: %s') % ssl_error[errnum] - else: - text += _('\nUnknown SSL error: %d') % errnum - gajim.nec.push_incoming_event(SSLErrorEvent(None, conn=self, - error_text=text, error_num=errnum, - cert=con.Connection.ssl_cert_pem, - fingerprint=con.Connection.ssl_fingerprint_sha1, - certificate=con.Connection.ssl_certificate)) - return True + errnum = [] # we don't have an errnum + i = 0 + for er in 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 ' + 'invalid.') % hostname + if er in ssl_error: + text += _('\nSSL Error: %s') % ssl_error[er] + else: + text += _('\nUnknown SSL error: %d') % er + gajim.nec.push_incoming_event(SSLErrorEvent(None, conn=self, + error_text=text, error_num=er, + cert=con.Connection.ssl_cert_pem[i], + fingerprint=con.Connection.ssl_fingerprint_sha1[i], + certificate=con.Connection.ssl_certificate[i])) + return True + i += 1 if hasattr(con.Connection, 'ssl_fingerprint_sha1'): saved_fingerprint = gajim.config.get_per('accounts', self.name, 'ssl_fingerprint_sha1') if saved_fingerprint: # Check sha1 fingerprint - if con.Connection.ssl_fingerprint_sha1 != saved_fingerprint: + if con.Connection.ssl_fingerprint_sha1[-1] != saved_fingerprint: gajim.nec.push_incoming_event(FingerprintErrorEvent(None, - conn=self, certificate=con.Connection.ssl_certificate, - new_fingerprint=con.Connection.ssl_fingerprint_sha1)) + conn=self, + certificate=con.Connection.ssl_certificate, + new_fingerprint=con.Connection.ssl_fingerprint_sha1[ + -1])) return True else: gajim.config.set_per('accounts', self.name, - 'ssl_fingerprint_sha1', con.Connection.ssl_fingerprint_sha1) + 'ssl_fingerprint_sha1', + con.Connection.ssl_fingerprint_sha1[-1]) if not check_X509.check_certificate(con.Connection.ssl_certificate, hostname) and '100' not in gajim.config.get_per('accounts', self.name, 'ignore_ssl_errors').split(): @@ -1344,8 +1350,8 @@ hostname gajim.nec.push_incoming_event(SSLErrorEvent(None, conn=self, error_text=txt, error_num=100, - cert=con.Connection.ssl_cert_pem, - fingerprint=con.Connection.ssl_fingerprint_sha1, + cert=con.Connection.ssl_cert_pem[-1], + fingerprint=con.Connection.ssl_fingerprint_sha1[-1], certificate=con.Connection.ssl_certificate)) return True

1 0

gajim: fix config names. Fixes #7276
by Yann Leboulanger 25 Dec '12

25 Dec '12

changeset e5fc5cf2b012 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=e5fc5cf2b012 description: fix config names. Fixes #7276 diffstat: src/common/connection.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diffs (21 lines): diff -r 8e70f3b50b78 -r e5fc5cf2b012 src/common/connection.py --- a/src/common/connection.py Tue Dec 25 18:18:39 2012 +0100 +++ b/src/common/connection.py Tue Dec 25 18:56:05 2012 +0100 @@ -2384,7 +2384,7 @@ if not change_nick: t = p.setTag(nbxmpp.NS_MUC + ' x') tags = {} - timeout = gajim.config.get_per('room', room_jid, + timeout = gajim.config.get_per('rooms', room_jid, 'muc_restore_timeout') if timeout is None or timeout == -2: timeout = gajim.config.get('muc_restore_timeout') @@ -2398,7 +2398,7 @@ last_date = time.strftime('%Y-%m-%dT%H:%M:%SZ', time.gmtime( last_date)) tags['since'] = last_date - nb = gajim.config.get_per('room', room_jid, 'muc_restore_lines') + nb = gajim.config.get_per('rooms', room_jid, 'muc_restore_lines') if nb is None or nb == -2: nb = gajim.config.get('muc_restore_lines') if nb >= 0:

1 0

gajim: correctly get SSL certificate from nbxmpp. Fixes #7283
by Yann Leboulanger 25 Dec '12

25 Dec '12

changeset 8e70f3b50b78 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=8e70f3b50b78 description: correctly get SSL certificate from nbxmpp. Fixes #7283 diffstat: src/common/connection.py | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diffs (32 lines): diff -r 1965d691ba63 -r 8e70f3b50b78 src/common/connection.py --- a/src/common/connection.py Sun Dec 23 17:48:11 2012 +0100 +++ b/src/common/connection.py Tue Dec 25 18:18:39 2012 +0100 @@ -1334,7 +1334,7 @@ if con.Connection.ssl_fingerprint_sha1[-1] != saved_fingerprint: gajim.nec.push_incoming_event(FingerprintErrorEvent(None, conn=self, - certificate=con.Connection.ssl_certificate, + certificate=con.Connection.ssl_certificate[-1], new_fingerprint=con.Connection.ssl_fingerprint_sha1[ -1])) return True @@ -1342,8 +1342,8 @@ gajim.config.set_per('accounts', self.name, 'ssl_fingerprint_sha1', con.Connection.ssl_fingerprint_sha1[-1]) - if not check_X509.check_certificate(con.Connection.ssl_certificate, - hostname) and '100' not in gajim.config.get_per('accounts', + if not check_X509.check_certificate(con.Connection.ssl_certificate[ + -1], hostname) and '100' not in gajim.config.get_per('accounts', self.name, 'ignore_ssl_errors').split(): txt = _('The authenticity of the %s certificate could be ' 'invalid.\nThe certificate does not cover this domain.') % \ @@ -1352,7 +1352,7 @@ error_text=txt, error_num=100, cert=con.Connection.ssl_cert_pem[-1], fingerprint=con.Connection.ssl_fingerprint_sha1[-1], - certificate=con.Connection.ssl_certificate)) + certificate=con.Connection.ssl_certificate[-1])) return True self._register_handlers(con, con_type)

1 0

python-nbxmpp: update xep-300 to the lastest version
by Jefry Lagrange 24 Dec '12

24 Dec '12

changeset 5812cedb80f0 in /home/hg/repos/python-nbxmpp details:http://hg.gajim.org/python-nbxmpp?cmd=changeset;node=5812cedb80f0 description: update xep-300 to the lastest version diffstat: nbxmpp/protocol.py | 43 +++++++++++++++++++------------------------ 1 files changed, 19 insertions(+), 24 deletions(-) diffs (100 lines): diff -r 7a4fd6fbf98c -r 5812cedb80f0 nbxmpp/protocol.py --- a/nbxmpp/protocol.py Sun Dec 23 17:47:21 2012 +0100 +++ b/nbxmpp/protocol.py Mon Dec 24 14:55:21 2012 -0400 @@ -162,12 +162,12 @@ NS_PUBKEY_REVOKE = 'urn:xmpp:revoke:2' NS_PUBKEY_ATTEST = 'urn:xmpp:attest:2' NS_STREAM_MGMT = 'urn:xmpp:sm:2' # XEP-198 -NS_HASHES = 'urn:xmpp:hashes:0' # XEP-300 +NS_HASHES = 'urn:xmpp:hashes:1' # XEP-300 NS_HASHES_MD5 = 'urn:xmpp:hash-function-textual-names:md5' NS_HASHES_SHA1 = 'urn:xmpp:hash-function-textual-names:sha-1' NS_HASHES_SHA256 = 'urn:xmpp:hash-function-textual-names:sha-256' NS_HASHES_SHA512 = 'urn:xmpp:hash-function-textual-names:sha-512' - + xmpp_stream_error_conditions = ''' bad-format -- -- -- The entity has sent XML that cannot be processed. bad-namespace-prefix -- -- -- The entity has sent a namespace prefix that is unsupported, or has sent no namespace prefix on an element that requires such a prefix. @@ -1037,12 +1037,12 @@ attrs={'id': self.getID()}) iq.setQuery(self.getQuery().getName()).setNamespace(self.getQueryNS()) return iq - -class Hashes(Node): + +class Hashes(Node): """ Hash elements for various XEPs as defined in XEP-300 """ - + """ RECOMENDED HASH USE: Algorithm Support @@ -1053,14 +1053,14 @@ SHA-256 MUST SHA-512 SHOULD """ - + supported = ('md5', 'sha-1', 'sha-256', 'sha-512') - + def __init__(self, nsp=NS_HASHES): - Node.__init__(self, None, {}, [], None, None,False, None) + Node.__init__(self, None, {}, [], None, None, False, None) self.setNamespace(nsp) - self.setName('hashes') - + self.setName('hash') + def calculateHash(self, algo, file_string): """ Calculate the hash and add it. It is preferable doing it here @@ -1078,12 +1078,12 @@ hl = hashlib.sha256() elif algo == 'sha-512': hl = hashlib.sha512() - + if hl: hl.update(file_string) hash_ = hl.hexdigest() else: # if it is a file - + if algo == 'md5': hl = hashlib.md5() elif algo == 'sha-1': @@ -1092,23 +1092,18 @@ hl = hashlib.sha256() elif algo == 'sha-512': hl = hashlib.sha512() - + if hl: for line in file_string: hl.update(line) hash_ = hl.hexdigest() - - return hash_ - + + return hash_ + def addHash(self, hash_, algo): - """ - More than one hash can be added. Although it is permitted, it should - not be done for big files because it could slow down Gajim. - """ - attrs = {} - attrs['algo'] = algo - self.addChild('hash', attrs, [hash_]) - + self.setAttr('algo', algo) + self.setData(hash_) + class Acks(Node): """ Acknowledgement elements for Stream Management

1 0

gajim: correctly handle SSL errors. Fixes #7252
by Yann Leboulanger 23 Dec '12

23 Dec '12

changeset 1965d691ba63 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=1965d691ba63 description: correctly handle SSL errors. Fixes #7252 diffstat: src/common/connection.py | 48 +++++++++++++++++++++++++++--------------------- 1 files changed, 27 insertions(+), 21 deletions(-) diffs (74 lines): diff -r 21ba342ff001 -r 1965d691ba63 src/common/connection.py --- a/src/common/connection.py Sun Dec 16 23:53:32 2012 +0100 +++ b/src/common/connection.py Sun Dec 23 17:48:11 2012 +0100 @@ -1308,34 +1308,40 @@ try: errnum = con.Connection.ssl_errnum except AttributeError: - errnum = -1 # we don't have an errnum - if errnum > 0 and str(errnum) not in gajim.config.get_per('accounts', - self.name, 'ignore_ssl_errors').split(): - text = _('The authenticity of the %s certificate could be invalid.' - ) % hostname - if errnum in ssl_error: - text += _('\nSSL Error: %s') % ssl_error[errnum] - else: - text += _('\nUnknown SSL error: %d') % errnum - gajim.nec.push_incoming_event(SSLErrorEvent(None, conn=self, - error_text=text, error_num=errnum, - cert=con.Connection.ssl_cert_pem, - fingerprint=con.Connection.ssl_fingerprint_sha1, - certificate=con.Connection.ssl_certificate)) - return True + errnum = [] # we don't have an errnum + i = 0 + for er in 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 ' + 'invalid.') % hostname + if er in ssl_error: + text += _('\nSSL Error: %s') % ssl_error[er] + else: + text += _('\nUnknown SSL error: %d') % er + gajim.nec.push_incoming_event(SSLErrorEvent(None, conn=self, + error_text=text, error_num=er, + cert=con.Connection.ssl_cert_pem[i], + fingerprint=con.Connection.ssl_fingerprint_sha1[i], + certificate=con.Connection.ssl_certificate[i])) + return True + i += 1 if hasattr(con.Connection, 'ssl_fingerprint_sha1'): saved_fingerprint = gajim.config.get_per('accounts', self.name, 'ssl_fingerprint_sha1') if saved_fingerprint: # Check sha1 fingerprint - if con.Connection.ssl_fingerprint_sha1 != saved_fingerprint: + if con.Connection.ssl_fingerprint_sha1[-1] != saved_fingerprint: gajim.nec.push_incoming_event(FingerprintErrorEvent(None, - conn=self, certificate=con.Connection.ssl_certificate, - new_fingerprint=con.Connection.ssl_fingerprint_sha1)) + conn=self, + certificate=con.Connection.ssl_certificate, + new_fingerprint=con.Connection.ssl_fingerprint_sha1[ + -1])) return True else: gajim.config.set_per('accounts', self.name, - 'ssl_fingerprint_sha1', con.Connection.ssl_fingerprint_sha1) + 'ssl_fingerprint_sha1', + con.Connection.ssl_fingerprint_sha1[-1]) if not check_X509.check_certificate(con.Connection.ssl_certificate, hostname) and '100' not in gajim.config.get_per('accounts', self.name, 'ignore_ssl_errors').split(): @@ -1344,8 +1350,8 @@ hostname gajim.nec.push_incoming_event(SSLErrorEvent(None, conn=self, error_text=txt, error_num=100, - cert=con.Connection.ssl_cert_pem, - fingerprint=con.Connection.ssl_fingerprint_sha1, + cert=con.Connection.ssl_cert_pem[-1], + fingerprint=con.Connection.ssl_fingerprint_sha1[-1], certificate=con.Connection.ssl_certificate)) return True

1 0

python-nbxmpp: store all SSL errors
by Yann Leboulanger 23 Dec '12

23 Dec '12

changeset 7a4fd6fbf98c in /home/hg/repos/python-nbxmpp details:http://hg.gajim.org/python-nbxmpp?cmd=changeset;node=7a4fd6fbf98c description: store all SSL errors diffstat: nbxmpp/tls_nb.py | 12 ++++++------ nbxmpp/transports_nb.py | 6 ++++++ 2 files changed, 12 insertions(+), 6 deletions(-) diffs (45 lines): diff -r dacd58839ca8 -r 7a4fd6fbf98c nbxmpp/tls_nb.py --- a/nbxmpp/tls_nb.py Sun Dec 09 21:08:11 2012 +0100 +++ b/nbxmpp/tls_nb.py Sun Dec 23 17:47:21 2012 +0100 @@ -393,7 +393,7 @@ flags |= 16384 tcpsock._sslContext.set_options(flags) - tcpsock.ssl_errnum = 0 + tcpsock.ssl_errnum = [0] tcpsock._sslContext.set_verify(OpenSSL.SSL.VERIFY_PEER, self._ssl_verify_callback) try: @@ -449,11 +449,11 @@ def _ssl_verify_callback(self, sslconn, cert, errnum, depth, ok): # Exceptions can't propagate up through this callback, so print them here. try: - self._owner.ssl_fingerprint_sha1 = cert.digest('sha1') - self._owner.ssl_certificate = cert - self._owner.ssl_errnum = errnum - self._owner.ssl_cert_pem = OpenSSL.crypto.dump_certificate( - OpenSSL.crypto.FILETYPE_PEM, cert) + self._owner.ssl_fingerprint_sha1.append(cert.digest('sha1')) + self._owner.ssl_certificate.append(cert) + self._owner.ssl_errnum.append(errnum) + self._owner.ssl_cert_pem.append(OpenSSL.crypto.dump_certificate( + OpenSSL.crypto.FILETYPE_PEM, cert)) return True except: log.error("Exception caught in _ssl_info_callback:", exc_info=True) diff -r dacd58839ca8 -r 7a4fd6fbf98c nbxmpp/transports_nb.py --- a/nbxmpp/transports_nb.py Sun Dec 09 21:08:11 2012 +0100 +++ b/nbxmpp/transports_nb.py Sun Dec 23 17:47:21 2012 +0100 @@ -310,6 +310,12 @@ self.proxy_dict = proxy_dict self.on_remote_disconnect = self.disconnect + # ssl variables + self.ssl_fingerprint_sha1 = [] + self.ssl_certificate = [] + self.ssl_errnum = [] + self.ssl_cert_pem = [] + # FIXME: transport should not be aware xmpp def start_disconnect(self): NonBlockingTransport.start_disconnect(self)

1 0

gajim: start porting Gajim to gobject introspection and GTK3
by Yann Leboulanger 23 Dec '12

23 Dec '12

changeset 193bd037c983 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=193bd037c983 description: start porting Gajim to gobject introspection and GTK3 diffstat: data/gui/account_creation_wizard_window.ui | 245 +++++++-- data/gui/message_window.ui | 1 - setup_win32.py | 2 +- src/adhoc_commands.py | 20 +- src/advanced_configuration_window.py | 20 +- src/atom_window.py | 18 +- src/cell_renderer_image.py | 73 +- src/chat_control.py | 342 +++++++------ src/command_system/implementation/middleware.py | 4 +- src/command_system/tools.py | 12 +- src/common/config.py | 4 +- src/common/gajim.py | 2 + src/common/jingle_rtp.py | 6 +- src/common/jingle_transport.py | 1 + src/common/logger.py | 4 +- src/common/pep.py | 27 +- src/common/protocol/bytestream.py | 6 +- src/common/resolver.py | 22 +- src/common/zeroconf/connection_zeroconf.py | 4 +- src/config.py | 308 ++++++------ src/conversation_textview.py | 189 ++++--- src/dataforms_widget.py | 102 ++-- src/dialogs.py | 485 ++++++++++--------- src/disco.py | 217 ++++---- src/features_window.py | 20 +- src/filetransfers_window.py | 147 +++--- src/gajim.py | 103 ++- src/gajim_themes_window.py | 34 +- src/groupchat_control.py | 153 +++--- src/groups.py | 2 +- src/gtkexcepthook.py | 28 +- src/gtkgui_helpers.py | 146 +++-- src/gui_interface.py | 98 ++- src/gui_menu_builder.py | 24 +- src/history_manager.py | 86 +- src/history_window.py | 34 +- src/htmltextview.py | 182 +++--- src/ipython_view.py | 55 +- src/message_control.py | 4 +- src/message_textview.py | 147 +++--- src/message_window.py | 160 +++--- src/music_track_listener.py | 8 +- src/negotiation.py | 2 +- src/notify.py | 20 +- src/plugins/gui.py | 59 +- src/profile_window.py | 45 +- src/remote_control.py | 22 +- src/roster_window.py | 582 ++++++++++++----------- src/search_window.py | 36 +- src/statusicon.py | 67 +- src/tooltips.py | 129 ++-- src/vcard.py | 44 +- 52 files changed, 2372 insertions(+), 2179 deletions(-) diffs (truncated from 13129 to 300 lines): diff -r 21ba342ff001 -r 193bd037c983 data/gui/account_creation_wizard_window.ui --- a/data/gui/account_creation_wizard_window.ui Sun Dec 16 23:53:32 2012 +0100 +++ b/data/gui/account_creation_wizard_window.ui Sun Dec 23 16:23:43 2012 +0100 @@ -1,31 +1,51 @@ -<?xml version="1.0"?> +<?xml version="1.0" encoding="UTF-8"?> <interface> - <requires lib="gtk+" version="2.16"/> -  +  + <object class="GtkListStore" id="liststore1"> + <columns> +  + <column type="gchararray"/> + </columns> + <data> + <row> + <col id="0" translatable="yes">None</col> + </row> + </data> + </object> + <object class="GtkEntryCompletion" id="server_entrycompletion"> + <property name="model">server_liststore</property> + <property name="text_column">0</property> + </object> + <object class="GtkEntryCompletion" id="server_entrycompletion1"> + <property name="model">server_liststore</property> + <property name="text_column">0</property> + </object> <object class="GtkWindow" id="account_creation_wizard_window"> + <property name="can_focus">False</property> <property name="border_width">12</property> <property name="title" translatable="yes">Gajim: Account Creation Wizard</property> <property name="resizable">False</property> <property name="type_hint">dialog</property> - <signal name="destroy" handler="on_wizard_window_destroy"/> + <signal name="destroy" handler="on_wizard_window_destroy" swapped="no"/> <child> <object class="GtkVBox" id="vbox77"> <property name="visible">True</property> - <property name="orientation">vertical</property> + <property name="can_focus">False</property> <property name="spacing">6</property> <child> <object class="GtkNotebook" id="notebook"> <property name="visible">True</property> - <property name="show_tabs">False</property> + <property name="can_focus">False</property> <property name="show_border">False</property> <child> <object class="GtkVBox" id="vbox78"> <property name="visible">True</property> - <property name="orientation">vertical</property> + <property name="can_focus">False</property> <property name="spacing">12</property> <child> <object class="GtkLabel" id="label256"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="xalign">0</property> <property name="label" translatable="yes">You need to have an account in order to connect to the Jabber network.</property> @@ -39,26 +59,31 @@ <child> <object class="GtkFrame" id="frame33"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> <object class="GtkAlignment" id="alignment68"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="top_padding">5</property> <property name="left_padding">12</property> <child> <object class="GtkVBox" id="vbox83"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="border_width">6</property> - <property name="orientation">vertical</property> <property name="spacing">6</property> <child> <object class="GtkRadioButton" id="use_existing_account_radiobutton"> <property name="label" translatable="yes">I already have an account I want to _use</property> + <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> + <property name="use_action_appearance">False</property> <property name="use_underline">True</property> + <property name="xalign">0</property> <property name="draw_indicator">True</property> </object> <packing> @@ -70,10 +95,13 @@ <child> <object class="GtkRadioButton" id="register_new_account_radiobutton"> <property name="label" translatable="yes">I want to _register for a new account</property> + <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> + <property name="use_action_appearance">False</property> <property name="use_underline">True</property> + <property name="xalign">0</property> <property name="draw_indicator">True</property> <property name="group">use_existing_account_radiobutton</property> </object> @@ -90,6 +118,7 @@ <child type="label"> <object class="GtkLabel" id="label269"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="label" translatable="yes">Please choose one of the options below:</property> <property name="use_markup">True</property> </object> @@ -106,6 +135,7 @@ <child type="tab"> <object class="GtkLabel" id="label259"> <property name="visible">True</property> + <property name="can_focus">False</property> </object> <packing> <property name="tab_fill">False</property> @@ -114,12 +144,13 @@ <child> <object class="GtkVBox" id="register_vbox"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="border_width">6</property> - <property name="orientation">vertical</property> <property name="spacing">12</property> <child> <object class="GtkLabel" id="label270"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="xalign">0</property> <property name="label" translatable="yes">Please fill in the data for your existing account</property> <property name="use_markup">True</property> @@ -133,25 +164,30 @@ <child> <object class="GtkTable" id="table27"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="n_rows">3</property> <property name="n_columns">4</property> <property name="column_spacing">12</property> <property name="row_spacing">6</property> <child> + <placeholder/> + </child> + <child> <object class="GtkEntry" id="username_entry"> <property name="visible">True</property> <property name="can_focus">True</property> - <signal name="key_press_event" handler="on_username_entry_key_press_event"/> + <signal name="key-press-event" handler="on_username_entry_key_press_event" swapped="no"/> </object> <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> <object class="GtkLabel" id="label263"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="xalign">0</property> <property name="label" translatable="yes">_Password:</property> <property name="use_underline">True</property> @@ -161,21 +197,24 @@ <property name="top_attach">2</property> <property name="bottom_attach">3</property> <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> <object class="GtkCheckButton" id="save_password_checkbutton"> <property name="label" translatable="yes">Save pass_word</property> + <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> <property name="tooltip_text" translatable="yes">If checked, Gajim will remember the password for this account</property> + <property name="use_action_appearance">False</property> <property name="use_underline">True</property> <property name="focus_on_click">False</property> + <property name="xalign">0.5</property> <property name="active">True</property> <property name="draw_indicator">True</property> - <signal name="toggled" handler="on_save_password_checkbutton_toggled"/> + <signal name="toggled" handler="on_save_password_checkbutton_toggled" swapped="no"/> </object> <packing> <property name="left_attach">2</property> @@ -183,7 +222,7 @@ <property name="top_attach">2</property> <property name="bottom_attach">3</property> <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> @@ -198,12 +237,13 @@ <property name="right_attach">2</property> <property name="top_attach">2</property> <property name="bottom_attach">3</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> <object class="GtkLabel" id="label262"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="xalign">0</property> <property name="label" translatable="yes">_Jabber ID:</property> <property name="use_underline">True</property> @@ -211,41 +251,34 @@ </object> <packing> <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> <object class="GtkLabel" id="label1"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="xalign">0</property> <property name="label">@</property> </object> <packing> <property name="left_attach">2</property> <property name="right_attach">3</property> - <property name="x_options"></property> - </packing> - </child> - <child> - <object class="GtkComboBoxEntry" id="server_comboboxentry"> - <property name="visible">True</property> - </object> - <packing> - <property name="left_attach">3</property> - <property name="right_attach">4</property> - <property name="x_options">GTK_FILL</property> - <property name="y_options">GTK_FILL</property> + <property name="x_options"/> </packing> </child> <child> <object class="GtkCheckButton" id="anonymous_checkbutton1"> <property name="label" translatable="yes">Anon_ymous authentication</property> + <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> + <property name="use_action_appearance">False</property> <property name="use_underline">True</property> + <property name="xalign">0.5</property> <property name="draw_indicator">True</property> - <signal name="toggled" handler="on_anonymous_checkbutton1_toggled"/> + <signal name="toggled" handler="on_anonymous_checkbutton1_toggled" swapped="no"/> </object> <packing> <property name="left_attach">1</property> @@ -255,11 +288,29 @@ </packing> </child> <child> - <placeholder/> + <object class="GtkComboBoxText" id="server_comboboxentry"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="has_entry">True</property> + <property name="entry_text_column">0</property> + <property name="id_column">1</property> + <child internal-child="entry"> + <object class="GtkEntry" id="comboboxtext-entry"> + <property name="can_focus">True</property> + <property name="invisible_char">●</property> + <property name="completion">server_entrycompletion</property> + </object> + </child> + </object> + <packing> + <property name="left_attach">3</property> + <property name="right_attach">4</property> + </packing> </child> </object> <packing> <property name="expand">False</property>

1 0

gajim: fix module name
by Yann Leboulanger 16 Dec '12

16 Dec '12

changeset 21ba342ff001 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=21ba342ff001 description: fix module name diffstat: src/adhoc_commands.py | 2 +- src/common/connection.py | 6 +++--- src/common/connection_handlers.py | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diffs (41 lines): diff -r 796f1c446dbb -r 21ba342ff001 src/adhoc_commands.py --- a/src/adhoc_commands.py Sun Dec 16 20:28:57 2012 +0100 +++ b/src/adhoc_commands.py Sun Dec 16 23:53:32 2012 +0100 @@ -572,7 +572,7 @@ """ Request the command list. Change stage on delivery """ - query = nbxmpp.Iq(typ='get', to=xmpp.JID(self.jid), + query = nbxmpp.Iq(typ='get', to=nbxmpp.JID(self.jid), queryNS=nbxmpp.NS_DISCO_ITEMS) query.setQuerynode(nbxmpp.NS_COMMANDS) diff -r 796f1c446dbb -r 21ba342ff001 src/common/connection.py --- a/src/common/connection.py Sun Dec 16 20:28:57 2012 +0100 +++ b/src/common/connection.py Sun Dec 16 23:53:32 2012 +0100 @@ -2656,10 +2656,10 @@ """ message = nbxmpp.Message(to=room) - x = xmpp.DataForm(typ='submit') - x.addChild(node=xmpp.DataField(name='FORM_TYPE', + x = nbxmpp.DataForm(typ='submit') + x.addChild(node=nbxmpp.DataField(name='FORM_TYPE', value=nbxmpp.NS_MUC + '#request')) - x.addChild(node=xmpp.DataField(name='muc#role', value='participant', + x.addChild(node=nbxmpp.DataField(name='muc#role', value='participant', typ='text-single')) message.addChild(node=x) diff -r 796f1c446dbb -r 21ba342ff001 src/common/connection_handlers.py --- a/src/common/connection_handlers.py Sun Dec 16 20:28:57 2012 +0100 +++ b/src/common/connection_handlers.py Sun Dec 16 23:53:32 2012 +0100 @@ -1722,7 +1722,7 @@ gajim.jid_is_transport(obj.fjid) or obj.jid in self.jids_for_auto_auth \ or obj.transport_auto_auth: if self.connection: - p = xmpp.Presence(obj.fjid, 'subscribed') + p = nbxmpp.Presence(obj.fjid, 'subscribed') p = self.add_sha(p) self.connection.send(p) if gajim.jid_is_transport(obj.fjid) or obj.transport_auto_auth:

1 0

gajim: improve multi-resource
by Yann Leboulanger 16 Dec '12

16 Dec '12

changeset 796f1c446dbb in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=796f1c446dbb description: improve multi-resource diffstat: src/message_control.py | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (11 lines): diff -r 49e37bbba42d -r 796f1c446dbb src/message_control.py --- a/src/message_control.py Sun Dec 16 18:29:59 2012 +0100 +++ b/src/message_control.py Sun Dec 16 20:28:57 2012 +0100 @@ -219,6 +219,7 @@ def remove_session(self, session): if session != self.session: return + self.session.control = None self.session = None def _nec_message_outgoing(self, obj):

1 0

gajim: fix module name
by Yann Leboulanger 16 Dec '12

16 Dec '12

changeset 49e37bbba42d in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=49e37bbba42d description: fix module name diffstat: src/common/stanza_session.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 17cbc1fb12da -r 49e37bbba42d src/common/stanza_session.py --- a/src/common/stanza_session.py Sun Dec 16 18:29:49 2012 +0100 +++ b/src/common/stanza_session.py Sun Dec 16 18:29:59 2012 +0100 @@ -813,7 +813,7 @@ # the offset of the group we chose (need it to match up with the dhhash) group_order = 0 self.modp = int(form.getField('modp').getOptions()[group_order][1]) - x.addChild(node=xmpp.DataField(name='modp', value=self.modp)) + x.addChild(node=nbxmpp.DataField(name='modp', value=self.modp)) g = dh.generators[self.modp] p = dh.primes[self.modp]

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits December 2012