Commits July 2011

commits@gajim.org

3 participants
40 discussions

gajim: make it clearer when groupchat messages have an error.
by Yann Leboulanger 29 Jul '11

29 Jul '11

changeset 94c1e2946304 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=94c1e2946304 description: make it clearer when groupchat messages have an error. diffstat: src/common/connection_handlers_events.py | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diffs (15 lines): diff -r 27f73cff2dfd -r 94c1e2946304 src/common/connection_handlers_events.py --- a/src/common/connection_handlers_events.py Fri Jul 29 17:34:53 2011 +0200 +++ b/src/common/connection_handlers_events.py Fri Jul 29 18:26:21 2011 +0200 @@ -1008,6 +1008,11 @@ self.get_gc_control() if self.gc_control and self.jid == self.fjid: + if self.mtype == 'error': + self.msgtxt = _('error while sending %(message)s ( %(error)s )'\ + ) % {'message': self.msgtxt, + 'error': self.stanza.getErrorMsg()} + self.stanza.delChild('html') # message from a gc without a resource self.mtype = 'groupchat'

1 0

gajim: fix arguments of request_voice() function
by Yann Leboulanger 29 Jul '11

29 Jul '11

changeset 27f73cff2dfd in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=27f73cff2dfd description: fix arguments of request_voice() function diffstat: src/common/connection.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 55630e0ffd97 -r 27f73cff2dfd src/common/connection.py --- a/src/common/connection.py Thu Jul 28 22:42:03 2011 +0200 +++ b/src/common/connection.py Fri Jul 29 17:34:53 2011 +0200 @@ -2550,7 +2550,7 @@ c.setTagData('reason', reason) self.connection.send(message) - def request_voice(self, room, nick): + def request_voice(self, room): """ Request voice in a moderated room """

1 0

gajim: call load_pkcs12 with empty string passphrase instead of ...
by Yann Leboulanger 28 Jul '11

28 Jul '11

changeset 55630e0ffd97 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=55630e0ffd97 description: call load_pkcs12 with empty string passphrase instead of None passphrase diffstat: src/common/connection.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 563d79627f4b -r 55630e0ffd97 src/common/connection.py --- a/src/common/connection.py Thu Jul 28 16:39:26 2011 +0300 +++ b/src/common/connection.py Thu Jul 28 22:42:03 2011 +0200 @@ -1174,7 +1174,7 @@ None, conn=self, con=con, port=port, secure_tuple=secure_tuple)) return - self.on_client_cert_passphrase(None, con, port, secure_tuple) + self.on_client_cert_passphrase('', con, port, secure_tuple) else: self._connect_to_next_host(retry)

1 0

gajim: Remove backspace in Gnome Keyring dialog. Fixes #6933
by Fomin Denis 28 Jul '11

28 Jul '11

changeset 563d79627f4b in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=563d79627f4b description: Remove backspace in Gnome Keyring dialog. Fixes #6933 diffstat: src/gui_interface.py | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diffs (16 lines): diff -r 84219b6e106f -r 563d79627f4b src/gui_interface.py --- a/src/gui_interface.py Tue Jul 26 22:44:11 2011 +0200 +++ b/src/gui_interface.py Thu Jul 28 16:39:26 2011 +0300 @@ -716,9 +716,9 @@ text = _('Enter your password for account %s') % account if passwords.USER_HAS_GNOMEKEYRING and \ not passwords.USER_USES_GNOMEKEYRING: - text += '\n' + _('Gnome Keyring is installed but not \ - correctly started (environment variable probably not \ - correctly set)') + text += '\n' + _('Gnome Keyring is installed but not ' + 'correctly started (environment variable probably not ' + 'correctly set)') def on_ok(passphrase, save): if save:

1 0

gajim: add initiator to every jingle stanza
by Jefry Lagrange 28 Jul '11

28 Jul '11

changeset 306c28bd2215 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=306c28bd2215 description: add initiator to every jingle stanza diffstat: src/common/jingle_session.py | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diffs (17 lines): diff -r 651ada0abc96 -r 306c28bd2215 src/common/jingle_session.py --- a/src/common/jingle_session.py Wed Jul 27 16:47:55 2011 -0400 +++ b/src/common/jingle_session.py Wed Jul 27 22:01:49 2011 -0400 @@ -630,10 +630,9 @@ stanza = xmpp.Iq(typ='set', to=xmpp.JID(self.peerjid), frm=self.ourjid) attrs = {'action': action, - 'sid': self.sid} - if action == 'session-initiate' or action == 'session-accept' or \ - action == 'transport-replace' or action == 'transport-info': - attrs['initiator'] = self.initiator + 'sid': self.sid, + 'initiator' : self.initiator} + jingle = stanza.addChild('jingle', attrs=attrs, namespace=xmpp.NS_JINGLE) if reason is not None: jingle.addChild(node=reason)

1 0

gajim: include ibb and bytestream, jingle transports in feature ...
by Jefry Lagrange 27 Jul '11

27 Jul '11

changeset 651ada0abc96 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=651ada0abc96 description: include ibb and bytestream, jingle transports in feature disco diffstat: src/common/helpers.py | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diffs (12 lines): diff -r 8b8ae92a5707 -r 651ada0abc96 src/common/helpers.py --- a/src/common/helpers.py Wed Jul 27 14:45:10 2011 -0400 +++ b/src/common/helpers.py Wed Jul 27 16:47:55 2011 -0400 @@ -1318,6 +1318,8 @@ gajim.gajim_optional_features[a].append(xmpp.NS_JINGLE_ICE_UDP) gajim.gajim_optional_features[a].append(xmpp.NS_JINGLE_FILE_TRANSFER) gajim.gajim_optional_features[a].append(xmpp.NS_JINGLE_XTLS) + gajim.gajim_optional_features[a].append(xmpp.NS_JINGLE_BYTESTREAM) + gajim.gajim_optional_features[a].append(xmpp.NS_JINGLE_IBB) gajim.caps_hash[a] = caps_cache.compute_caps_hash([gajim.gajim_identity], gajim.gajim_common_features + gajim.gajim_optional_features[a]) # re-send presence with new hash

1 0

gajim: initiator on transport-info
by Jefry Lagrange 27 Jul '11

27 Jul '11

changeset 8b8ae92a5707 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=8b8ae92a5707 description: initiator on transport-info diffstat: src/common/jingle_session.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r fafb66348f1d -r 8b8ae92a5707 src/common/jingle_session.py --- a/src/common/jingle_session.py Fri Jul 22 18:00:29 2011 -0400 +++ b/src/common/jingle_session.py Wed Jul 27 14:45:10 2011 -0400 @@ -632,7 +632,7 @@ attrs = {'action': action, 'sid': self.sid} if action == 'session-initiate' or action == 'session-accept' or \ - action == 'transport-replace': + action == 'transport-replace' or action == 'transport-info': attrs['initiator'] = self.initiator jingle = stanza.addChild('jingle', attrs=attrs, namespace=xmpp.NS_JINGLE) if reason is not None:

1 0

gajim: ability to connect to a host that require a PCKS certific...
by Yann Leboulanger 26 Jul '11

26 Jul '11

changeset 84219b6e106f in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=84219b6e106f description: ability to connect to a host that require a PCKS certificate that is encrypted. diffstat: data/gui/accounts_window.ui | 72 ++++++++++++++++++++----------- src/common/config.py | 1 + src/common/connection.py | 40 ++++++++++++----- src/common/connection_handlers_events.py | 4 + src/common/xmpp/tls_nb.py | 3 +- src/config.py | 10 ++++ src/gui_interface.py | 15 ++++++ 7 files changed, 106 insertions(+), 39 deletions(-) diffs (260 lines): diff -r b79c7258181f -r 84219b6e106f data/gui/accounts_window.ui --- a/data/gui/accounts_window.ui Tue Jul 26 16:02:22 2011 +0200 +++ b/data/gui/accounts_window.ui Tue Jul 26 22:44:11 2011 +0200 @@ -451,48 +451,70 @@ <property name="visible">True</property> <property name="can_focus">True</property> <child> - <object class="GtkHBox" id="hbox2"> + <object class="GtkVBox" id="vbox13"> <property name="visible">True</property> + <property name="orientation">vertical</property> <property name="spacing">6</property> <child> - <object class="GtkLabel" id="label28"> + <object class="GtkHBox" id="hbox2"> <property name="visible">True</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">_Client Cert File:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">cert_entry1</property> + <property name="spacing">6</property> + <child> + <object class="GtkLabel" id="label28"> + <property name="visible">True</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">_Client Cert File:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">cert_entry1</property> + </object> + <packing> + <property name="expand">False</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkEntry" id="cert_entry1"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="invisible_char">●</property> + </object> + <packing> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkButton" id="browse_for_client_cert_button"> + <property name="label" translatable="yes">Browse...</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <signal name="clicked" handler="on_browse_for_client_cert_button_clicked"/> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">2</property> + </packing> + </child> </object> <packing> - <property name="expand">False</property> <property name="position">0</property> </packing> </child> <child> - <object class="GtkEntry" id="cert_entry1"> + <object class="GtkCheckButton" id="client_cert_encrypted_checkbutton1"> + <property name="label" translatable="yes">Certificate is e_ncrypted</property> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="tooltip_text" translatable="yes">The path to the client certificate and key in PKCS#12 format</property> - <property name="invisible_char">●</property> + <property name="receives_default">False</property> + <property name="use_underline">True</property> + <property name="draw_indicator">True</property> + <signal name="toggled" handler="on_client_cert_encrypted_checkbutton1_toggled"/> </object> <packing> <property name="position">1</property> </packing> </child> - <child> - <object class="GtkButton" id="browse_for_client_cert_button"> - <property name="label" translatable="yes">Browse...</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="tooltip_text" translatable="yes">Choose Client Cert</property> - <signal name="clicked" handler="on_browse_for_client_cert_button_clicked"/> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">2</property> - </packing> - </child> </object> </child> <child type="label"> diff -r b79c7258181f -r 84219b6e106f src/common/config.py --- a/src/common/config.py Tue Jul 26 16:02:22 2011 +0200 +++ b/src/common/config.py Tue Jul 26 22:44:11 2011 +0200 @@ -298,6 +298,7 @@ 'hostname': [ opt_str, '', '', True ], 'anonymous_auth': [ opt_bool, False ], 'client_cert': [ opt_str, '', '', True ], + 'client_cert_encrypted': [ opt_bool, False, '', False ], 'savepass': [ opt_bool, False ], 'password': [ opt_str, '' ], 'resource': [ opt_str, 'gajim', '', True ], diff -r b79c7258181f -r 84219b6e106f src/common/connection.py --- a/src/common/connection.py Tue Jul 26 16:02:22 2011 +0200 +++ b/src/common/connection.py Tue Jul 26 22:44:11 2011 +0200 @@ -749,6 +749,7 @@ self.pingalives = 0 self.client_cert = gajim.config.get_per('accounts', self.name, 'client_cert') + self.client_cert_passphrase = '' def check_jid(self, jid): return helpers.parse_jid(jid) @@ -1155,29 +1156,42 @@ secure_tuple = (self._current_type, cacerts, mycerts) con = common.xmpp.NonBlockingClient( - domain=self._hostname, - caller=self, - idlequeue=gajim.idlequeue) + domain=self._hostname, + caller=self, + idlequeue=gajim.idlequeue) self.last_connection = con # increase default timeout for server responses - common.xmpp.dispatcher_nb.DEFAULT_TIMEOUT_SECONDS = self.try_connecting_for_foo_secs + common.xmpp.dispatcher_nb.DEFAULT_TIMEOUT_SECONDS = \ + self.try_connecting_for_foo_secs # FIXME: this is a hack; need a better way if self.on_connect_success == self._on_new_account: con.RegisterDisconnectHandler(self._on_new_account) - self.log_hosttype_info(port) - con.connect( - hostname=self._current_host['host'], - port=port, - on_connect=self.on_connect_success, - on_proxy_failure=self.on_proxy_failure, - on_connect_failure=self.connect_to_next_type, - proxy=self._proxy, - secure_tuple = secure_tuple) + if self.client_cert and gajim.config.get_per('accounts', self.name, + 'client_cert_encrypted'): + gajim.nec.push_incoming_event(ClientCertPassphraseEvent( + None, conn=self, con=con, port=port, + secure_tuple=secure_tuple)) + return + self.on_client_cert_passphrase(None, con, port, secure_tuple) + else: self._connect_to_next_host(retry) + def on_client_cert_passphrase(self, passphrase, con, port, secure_tuple): + self.client_cert_passphrase = passphrase + + self.log_hosttype_info(port) + con.connect( + hostname=self._current_host['host'], + port=port, + on_connect=self.on_connect_success, + on_proxy_failure=self.on_proxy_failure, + on_connect_failure=self.connect_to_next_type, + proxy=self._proxy, + secure_tuple = secure_tuple) + def log_hosttype_info(self, port): msg = '>>>>>> Connecting to %s [%s:%d], type = %s' % (self.name, self._current_host['host'], port, self._current_type) diff -r b79c7258181f -r 84219b6e106f src/common/connection_handlers_events.py --- a/src/common/connection_handlers_events.py Tue Jul 26 16:02:22 2011 +0200 +++ b/src/common/connection_handlers_events.py Tue Jul 26 22:44:11 2011 +0200 @@ -2069,3 +2069,7 @@ def generate(self): return True + +class ClientCertPassphraseEvent(nec.NetworkIncomingEvent): + name = 'client-cert-passphrase' + base_network_events = [] diff -r b79c7258181f -r 84219b6e106f src/common/xmpp/tls_nb.py --- a/src/common/xmpp/tls_nb.py Tue Jul 26 16:02:22 2011 +0200 +++ b/src/common/xmpp/tls_nb.py Tue Jul 26 22:44:11 2011 +0200 @@ -359,7 +359,8 @@ tcpsock._sslContext = OpenSSL.SSL.Context(OpenSSL.SSL.TLSv1_METHOD) log.debug('Using client cert and key from %s' % conn.client_cert) try: - p12 = OpenSSL.crypto.load_pkcs12(open(conn.client_cert).read()) + p12 = OpenSSL.crypto.load_pkcs12(open(conn.client_cert).read(), + conn.client_cert_passphrase) except OpenSSL.crypto.Error, exception_obj: log.warning('Unable to load client pkcs12 certificate from ' 'file %s: %s ... Is it a valid PKCS12 cert?' % \ diff -r b79c7258181f -r 84219b6e106f src/config.py --- a/src/config.py Tue Jul 26 16:02:22 2011 +0200 +++ b/src/config.py Tue Jul 26 22:44:11 2011 +0200 @@ -1851,6 +1851,10 @@ client_cert = gajim.config.get_per('accounts', account, 'client_cert') self.xml.get_object('cert_entry1').set_text(client_cert) + client_cert_encrypted = gajim.config.get_per('accounts', account, + 'client_cert_encrypted') + self.xml.get_object('client_cert_encrypted_checkbutton1').\ + set_active(client_cert_encrypted) self.xml.get_object('adjust_priority_with_status_checkbutton1').\ set_active(gajim.config.get_per('accounts', account, @@ -2222,6 +2226,12 @@ # if we showed ErrorDialog, there will not be dialog instance return + def on_client_cert_encrypted_checkbutton1_toggled(self, widget): + if self.ignore_events: + return + self.on_checkbutton_toggled(widget, 'client_cert_encrypted', + account=self.current_account) + def on_autoconnect_checkbutton_toggled(self, widget): if self.ignore_events: return diff -r b79c7258181f -r 84219b6e106f src/gui_interface.py --- a/src/gui_interface.py Tue Jul 26 16:02:22 2011 +0200 +++ b/src/gui_interface.py Tue Jul 26 22:44:11 2011 +0200 @@ -671,6 +671,19 @@ _('You are currently connected without your OpenPGP key.')) self.forget_gpg_passphrase(obj.keyID) + def handle_event_client_cert_passphrase(self, obj): + def on_ok(passphrase, checked): + obj.conn.on_client_cert_passphrase(passphrase, obj.con, obj.port, + obj.secure_tuple) + + def on_cancel(): + obj.conn.on_client_cert_passphrase('', obj.con, obj.port, + obj.secure_tuple) + + dialogs.PassphraseDialog(_('Certificate Passphrase Required'), + _('Enter the passphrase for the certificate for account %s') % \ + obj.conn.name, ok_handler=on_ok, cancel_handler=on_cancel) + def handle_event_gpg_password_required(self, obj): #('GPG_PASSWORD_REQUIRED', account, (callback,)) if obj.keyid in self.gpg_passphrase: @@ -1401,6 +1414,8 @@ 'atom-entry-received': [self.handle_atom_entry], 'bad-gpg-passphrase': [self.handle_event_bad_gpg_passphrase], 'bookmarks-received': [self.handle_event_bookmarks], + 'client-cert-passphrase': [ + self.handle_event_client_cert_passphrase], 'connection-lost': [self.handle_event_connection_lost], 'failed-decrypt': [(self.handle_event_failed_decrypt, ged.GUI2)], 'file-request-error': [self.handle_event_file_request_error],

1 0

gajim: [Wieland Hoffmann] updated debian translation
by Yann Leboulanger 26 Jul '11

26 Jul '11

changeset b79c7258181f in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=b79c7258181f description: [Wieland Hoffmann] updated debian translation diffstat: po/de.po | 4447 +++++++++++++++++++++++++++++++------------------------------ 1 files changed, 2252 insertions(+), 2195 deletions(-) diffs (truncated from 9958 to 300 lines): diff -r 9b25665b6e5e -r b79c7258181f po/de.po --- a/po/de.po Sun Jul 24 21:45:57 2011 +0200 +++ b/po/de.po Tue Jul 26 16:02:22 2011 +0200 @@ -5,18 +5,14 @@ # Benjamin Drung <benjamin.drung(a)gmail.com>, 2007, 2008. # Fabian Fingerle <fabian(a)datensalat.eu>, 2007, 2008. # Sebastian Schäfer <sarek(a)uliweb.de>, 2007. -# Nico Gulden <cilugnedon(a)gmx.de>, 2007, 2008, 2009. +# Nico Gulden <cilugnedon(a)gmx.de>, 2007, 2008, 2009, 2010. # Niklas Hambüchen <nh2(a)deditus.de>, 2009. -#: ../src/gajim-remote-plugin.py:221 ../src/gajim-remote-plugin.py:228 -#: ../src/gajim-remote-plugin.py:254 ../src/gajim-remote-plugin.py:255 -#: ../src/gajim-remote-plugin.py:261 ../src/gajim-remote-plugin.py:262 -#: ../src/gajim-remote-plugin.py:263 ../src/gajim-remote-plugin.py:264 msgid "" msgstr "" "Project-Id-Version: gajim 0.13\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-10-01 20:39+0200\n" -"PO-Revision-Date: 2009-12-13 23:46+0100\n" +"POT-Creation-Date: 2011-07-26 16:01+0200\n" +"PO-Revision-Date: 2010-08-03 22:43+0200\n" "Last-Translator: Nico Gulden <cilugnedon(a)gmx.de>\n" "Language-Team: German <translators(a)gajim.org>\n" "Language: de\n" @@ -34,7 +30,7 @@ msgid "_Add Contact..." msgstr "Kont_akt hinzufügen …" -#: ../data/gui/account_context_menu.ui.h:3 ../data/gui/roster_window.ui.h:18 +#: ../data/gui/account_context_menu.ui.h:3 ../data/gui/roster_window.ui.h:19 msgid "_Discover Services" msgstr "_Dienste durchsuchen" @@ -124,12 +120,12 @@ #: ../data/gui/account_creation_wizard_window.ui.h:17 #: ../data/gui/accounts_window.ui.h:39 ../data/gui/change_mood_dialog.ui.h:3 -#: ../src/config.py:1280 ../src/config.py:1383 ../src/config.py:1694 -#: ../src/config.py:1699 ../src/config.py:2265 ../src/config.py:2344 -#: ../src/config.py:2357 ../src/config.py:3613 ../src/config.py:3688 -#: ../src/dialogs.py:309 ../src/dialogs.py:311 ../src/dialogs.py:514 -#: ../src/dialogs.py:527 ../src/roster_window.py:2956 -#: ../src/roster_window.py:2962 ../src/roster_window.py:2967 +#: ../src/config.py:1289 ../src/config.py:1392 ../src/config.py:1703 +#: ../src/config.py:1708 ../src/config.py:2274 ../src/config.py:2353 +#: ../src/config.py:2366 ../src/config.py:3644 ../src/config.py:3719 +#: ../src/dialogs.py:311 ../src/dialogs.py:313 ../src/dialogs.py:519 +#: ../src/dialogs.py:532 ../src/roster_window.py:3091 +#: ../src/roster_window.py:3097 ../src/roster_window.py:3102 msgid "None" msgstr "Kein Proxy" @@ -159,7 +155,7 @@ "verbinden können." #: ../data/gui/account_creation_wizard_window.ui.h:24 -#: ../data/gui/roster_window.ui.h:16 +#: ../data/gui/roster_window.ui.h:17 msgid "_Advanced" msgstr "_Erweitert" @@ -178,6 +174,7 @@ #: ../data/gui/account_creation_wizard_window.ui.h:28 #: ../data/gui/accounts_window.ui.h:64 +#: ../data/gui/manage_bookmarks_window.ui.h:8 msgid "_Password:" msgstr "_Passwort:" @@ -186,6 +183,7 @@ msgstr "_Port:" #: ../data/gui/account_creation_wizard_window.ui.h:30 +#: ../data/gui/manage_bookmarks_window.ui.h:9 msgid "_Server:" msgstr "_Server:" @@ -230,7 +228,6 @@ msgstr "Automatisch neu verbinden, falls die Verbindung abbricht" #: ../data/gui/accounts_window.ui.h:11 -#, fuzzy msgid "Browse..." msgstr "_Durchsuche" @@ -251,9 +248,8 @@ "Verbindung gesendet wird." #: ../data/gui/accounts_window.ui.h:15 -#, fuzzy msgid "Choose Client Cert" -msgstr "Datei auswählen …" +msgstr "Clientzertifikat auswählen …" #: ../data/gui/accounts_window.ui.h:16 msgid "Choose _Key..." @@ -269,9 +265,8 @@ "Klicken, um alle Kontakte eines anderen Kontos um Autorisierung zu fragen." #: ../data/gui/accounts_window.ui.h:19 -#, fuzzy msgid "Client certificate" -msgstr "Selbstsigniertes Zertifikat" +msgstr "Clientzertifikat" #: ../data/gui/accounts_window.ui.h:20 msgid "Co_nnect on Gajim startup" @@ -293,18 +288,19 @@ #. No configured account #: ../data/gui/accounts_window.ui.h:24 ../data/gui/roster_window.ui.h:5 -#: ../src/common/helpers.py:1159 ../src/common/helpers.py:1171 -#: ../src/notify.py:528 ../src/notify.py:551 ../src/notify.py:600 -#: ../src/notify.py:616 +#: ../src/common/helpers.py:1148 ../src/common/helpers.py:1160 +#: ../src/notify.py:474 ../src/notify.py:497 ../src/notify.py:546 +#: ../src/notify.py:562 msgid "Gajim" msgstr "Gajim" #. FIXME: Ugly workaround. -#. FIXME: Ugly workaround. Maybe we haven't been in any group (defaults to General) +#. FIXME: Ugly workaround. +#. Maybe we haven't been in any group (defaults to General) #. General group cannot be changed -#: ../data/gui/accounts_window.ui.h:25 ../data/gui/preferences_window.ui.h:57 -#: ../src/common/contacts.py:141 ../src/dialogs.py:112 ../src/dialogs.py:122 -#: ../src/roster_window.py:2898 ../src/roster_window.py:5451 +#: ../data/gui/accounts_window.ui.h:25 ../data/gui/preferences_window.ui.h:56 +#: ../src/common/contacts.py:141 ../src/dialogs.py:112 ../src/dialogs.py:124 +#: ../src/roster_window.py:3033 ../src/roster_window.py:5648 msgid "General" msgstr "Allgemein" @@ -366,8 +362,8 @@ msgstr "Informationen über Sie, die auf dem Server gespeichert sind" #: ../data/gui/accounts_window.ui.h:35 -#: ../data/gui/zeroconf_information_window.ui.h:4 ../src/config.py:1817 -#: ../src/dialogs.py:831 +#: ../data/gui/zeroconf_information_window.ui.h:4 ../src/config.py:1826 +#: ../src/dialogs.py:837 msgid "Jabber ID:" msgstr "Jabber-ID:" @@ -380,8 +376,8 @@ msgid "Mer_ge accounts" msgstr "Konten _zusammenführen" -#: ../data/gui/accounts_window.ui.h:38 ../src/config.py:1790 -#: ../src/config.py:2358 +#: ../data/gui/accounts_window.ui.h:38 ../src/config.py:1799 +#: ../src/config.py:2367 msgid "No key selected" msgstr "Kein Schlüssel ausgewählt" @@ -409,7 +405,7 @@ "Falls aktiviert, ändert sich die Priorität automatisch gemäß dem Status." #. Rename -#: ../data/gui/accounts_window.ui.h:44 ../src/roster_window.py:5401 +#: ../data/gui/accounts_window.ui.h:44 ../src/roster_window.py:5598 msgid "Re_name" msgstr "_Umbenennen" @@ -454,7 +450,7 @@ #: ../data/gui/accounts_window.ui.h:53 msgid "The path to the client certificate and key in PKCS#12 format" -msgstr "" +msgstr "Pfad zum Clientzertifikat und Schlüssel im PKCS#12 Format" #: ../data/gui/accounts_window.ui.h:54 msgid "Use G_PG Agent" @@ -474,7 +470,7 @@ #: ../data/gui/accounts_window.ui.h:58 msgid "_Client Cert File:" -msgstr "" +msgstr "Datei für _Clientzertifikat:" #: ../data/gui/accounts_window.ui.h:59 msgid "_Edit Personal Information..." @@ -546,6 +542,7 @@ msgstr "_Gruppe:" #: ../data/gui/add_new_contact_window.ui.h:12 +#: ../data/gui/manage_bookmarks_window.ui.h:7 msgid "_Nickname:" msgstr "Spitz_name:" @@ -558,9 +555,8 @@ msgstr "_Registrieren" #: ../data/gui/add_new_contact_window.ui.h:15 -#, fuzzy msgid "_Save subscription message" -msgstr "_Abonnement" +msgstr "_Abonnementnachricht speichern" #: ../data/gui/add_new_contact_window.ui.h:16 msgid "_User ID:" @@ -587,9 +583,8 @@ msgstr "Fehlerbeschreibung …" #: ../data/gui/adhoc_commands_window.ui.h:6 -#, fuzzy msgid "F_inish" -msgstr "_Beenden" +msgstr "_Fertigstellen" #: ../data/gui/adhoc_commands_window.ui.h:7 msgid "Please wait while retrieving command list..." @@ -676,194 +671,6 @@ msgid "_Send Server Message..." msgstr "Servernachricht _senden …" -#: ../data/gui/advanced_notifications_window.ui.h:1 -msgid " a window/tab opened with that contact " -msgstr " ein Fenster/Tab mit diesem Kontakt geöffnet " - -#: ../data/gui/advanced_notifications_window.ui.h:2 -msgid "Actions" -msgstr "Aktionen" - -#: ../data/gui/advanced_notifications_window.ui.h:3 -msgid "Conditions" -msgstr "Ereignisse" - -#: ../data/gui/advanced_notifications_window.ui.h:4 -#: ../data/gui/preferences_window.ui.h:17 -msgid "Sounds" -msgstr "Klänge" - -#: ../data/gui/advanced_notifications_window.ui.h:5 -msgid "Advanced Actions" -msgstr "Erweiterte Aktionen" - -#: ../data/gui/advanced_notifications_window.ui.h:6 -msgid "Advanced Notifications Control" -msgstr "Erweiterter Benachrichtigungseditor" - -#: ../data/gui/advanced_notifications_window.ui.h:7 -msgid "All statuses" -msgstr "Alle Status" - -#: ../data/gui/advanced_notifications_window.ui.h:8 -#: ../src/common/commands.py:106 ../src/common/helpers.py:239 -#: ../src/tooltips.py:193 -msgid "Away" -msgstr "Abwesend" - -#: ../data/gui/advanced_notifications_window.ui.h:9 -msgid "Busy " -msgstr "Beschäftigt " - -#: ../data/gui/advanced_notifications_window.ui.h:10 -#, fuzzy -msgid "Contact Change Status " -msgstr "Kontakt hat Status verändert" - -#: ../data/gui/advanced_notifications_window.ui.h:11 -#, fuzzy -msgid "Contact Disconnected " -msgstr "Kontakt nicht verbunden" - -#: ../data/gui/advanced_notifications_window.ui.h:12 -msgid "Don't have " -msgstr "habe nicht " - -#: ../data/gui/advanced_notifications_window.ui.h:13 -#, fuzzy -msgid "File Transfer Finished" -msgstr "Dateiübertragungen" - -#: ../data/gui/advanced_notifications_window.ui.h:14 -#, fuzzy -msgid "File Transfer Request " -msgstr "Anfrage zur Dateiübertragung" - -#: ../data/gui/advanced_notifications_window.ui.h:15 -#, fuzzy -msgid "File Transfer Started " -msgstr "Dateiübertragung gestoppt" - -#: ../data/gui/advanced_notifications_window.ui.h:16 -#, fuzzy -msgid "Group Chat Message Highlight " -msgstr "Hervorhebung von Chatraum-Nachrichten" - -#: ../data/gui/advanced_notifications_window.ui.h:17 -#, fuzzy -msgid "Group Chat Message Received " -msgstr "Chatraum-Nachricht empfangen" - -#: ../data/gui/advanced_notifications_window.ui.h:18 -msgid "Have " -msgstr "habe " -

1 0

gajim: jump newline when ending a element in html. Fixes #6880
by Yann Leboulanger 24 Jul '11

24 Jul '11

changeset 9b25665b6e5e in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=9b25665b6e5e description: jump newline when ending a element in html. Fixes #6880 diffstat: src/htmltextview.py | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diffs (30 lines): diff -r fdbb8050d2a2 -r 9b25665b6e5e src/htmltextview.py --- a/src/htmltextview.py Sun Jul 24 10:54:43 2011 +0200 +++ b/src/htmltextview.py Sun Jul 24 21:45:57 2011 +0200 @@ -794,7 +794,7 @@ elif name in ('a', 'img', 'body', 'html'): pass elif name in INLINE: - self._jump_line() + pass else: log.warning('Unhandled element "%s"' % name) @@ -830,6 +830,8 @@ elif name in BLOCK: if name == 'pre': endPreserving = True + elif name in BLOCK_STRUCT: + newLine = True else: log.warning("Unhandled element '%s'" % name) self._flush_text() @@ -838,8 +840,6 @@ if newLine: self._jump_line() self._end_span() - #if not self._starts_line(): - # self.text = ' ' class HtmlTextView(gtk.TextView):

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits July 2011