Commits April 2010

commits@gajim.org

7 participants
72 discussions

gajim: Fixed a missing import
by Alexander Cherniuk 19 Apr '10

19 Apr '10

changeset 34338e1bf078 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=34338e1bf078 description: Fixed a missing import diffstat: src/common/helpers.py | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (11 lines): diff -r e6d8dda93cd5 -r 34338e1bf078 src/common/helpers.py --- a/src/common/helpers.py Fri Apr 02 11:11:03 2010 +0200 +++ b/src/common/helpers.py Mon Apr 19 12:09:19 2010 +0300 @@ -29,6 +29,7 @@ ## along with Gajim. If not, see <http://www.gnu.org/licenses/>. ## +import sys import re import locale import os

1 0

gajim: better coding style
by Yann Leboulanger 18 Apr '10

18 Apr '10

changeset 1ff08c474cac in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=1ff08c474cac description: better coding style diffstat: src/common/xmpp/auth_nb.py | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diffs (19 lines): diff -r 7c61c3c1245e -r 1ff08c474cac src/common/xmpp/auth_nb.py --- a/src/common/xmpp/auth_nb.py Sun Apr 18 20:43:40 2010 +0200 +++ b/src/common/xmpp/auth_nb.py Sun Apr 18 20:57:47 2010 +0200 @@ -213,9 +213,12 @@ raise NodeProcessed if "EXTERNAL" in self.mecs: self.mecs.remove('EXTERNAL') - node = Node('auth', attrs={'xmlns': NS_SASL, 'mechanism': 'EXTERNAL'}, - payload=[base64.encodestring('%s@%s' % (self.username, - self._owner.Server)).replace('\n', '')]) + sasl_data = u'%s@%s' % (self.username, self._owner.Server) + sasl_data = sasl_data.encode('utf-8').encode('base64').replace( + '\n', '') + node = Node('auth', attrs={'xmlns': NS_SASL, + 'mechanism': 'EXTERNAL'}, payload=[sasl_data]) + self.mechanism = 'EXTERNAL' self.startsasl = SASL_IN_PROCESS self._owner.send(str(node)) raise NodeProcessed

1 0

gajim: [Calamar and me]sasl-external c2s authentication. Fixes #...
by Yann Leboulanger 18 Apr '10

18 Apr '10

changeset 7c61c3c1245e in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=7c61c3c1245e description: [Calamar and me]sasl-external c2s authentication. Fixes #5704 diffstat: data/gui/accounts_window.ui | 66 +++++++++++++++++++++++++++++++++++++++++++- src/common/config.py | 1 + src/common/connection.py | 2 + src/common/xmpp/tls_nb.py | 40 ++++++++++++++++++++++++-- src/config.py | 39 +++++++++++++++++++++++-- src/dialogs.py | 44 ++++++++++++++++++++++++++++++ 6 files changed, 182 insertions(+), 10 deletions(-) diffs (294 lines): diff -r d61cee2f1d6f -r 7c61c3c1245e data/gui/accounts_window.ui --- a/data/gui/accounts_window.ui Sat Apr 17 21:53:09 2010 +0300 +++ b/data/gui/accounts_window.ui Sun Apr 18 20:43:40 2010 +0200 @@ -4,7 +4,7 @@  <object class="GtkListStore" id="liststore1"> <columns> -  +  <column type="gchararray"/> </columns> <data> @@ -203,7 +203,7 @@ <object class="GtkTable" id="table1"> <property name="visible">True</property> <property name="border_width">6</property> - <property name="n_rows">5</property> + <property name="n_rows">6</property> <property name="n_columns">3</property> <property name="column_spacing">6</property> <property name="row_spacing">6</property> @@ -445,6 +445,68 @@ <property name="y_options"></property> </packing> </child> + <child> + <object class="GtkExpander" id="expander2"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <child> + <object class="GtkHBox" id="hbox2"> + <property name="visible">True</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="tooltip_text" translatable="yes">The path to the client certificate and key in PKCS#12 format</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> + <property name="tooltip_text" translatable="yes">Choose Client Cert</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">2</property> + </packing> + </child> + </object> + </child> + <child type="label"> + <object class="GtkLabel" id="label2"> + <property name="visible">True</property> + <property name="label" translatable="yes">Client certificate</property> + </object> + </child> + </object> + <packing> + <property name="right_attach">3</property> + <property name="top_attach">5</property> + <property name="bottom_attach">6</property> + <property name="y_options">GTK_FILL</property> + </packing> + </child> </object> </child> <child type="tab"> diff -r d61cee2f1d6f -r 7c61c3c1245e src/common/config.py --- a/src/common/config.py Sat Apr 17 21:53:09 2010 +0300 +++ b/src/common/config.py Sun Apr 18 20:43:40 2010 +0200 @@ -289,6 +289,7 @@ 'name': [ opt_str, '', '', True ], 'hostname': [ opt_str, '', '', True ], 'anonymous_auth': [ opt_bool, False ], + 'client_cert': [ opt_str, '', '', True ], 'savepass': [ opt_bool, False ], 'password': [ opt_str, '' ], 'resource': [ opt_str, 'gajim', '', True ], diff -r d61cee2f1d6f -r 7c61c3c1245e src/common/connection.py --- a/src/common/connection.py Sat Apr 17 21:53:09 2010 +0300 +++ b/src/common/connection.py Sun Apr 18 20:43:40 2010 +0200 @@ -701,6 +701,8 @@ 'ping_alive_every_foo_secs') else: self.pingalives = 0 + self.client_cert = gajim.config.get_per('accounts', self.name, + 'client_cert') def check_jid(self, jid): return helpers.parse_jid(jid) diff -r d61cee2f1d6f -r 7c61c3c1245e src/common/xmpp/tls_nb.py --- a/src/common/xmpp/tls_nb.py Sat Apr 17 21:53:09 2010 +0300 +++ b/src/common/xmpp/tls_nb.py Sun Apr 18 20:43:40 2010 +0200 @@ -349,10 +349,42 @@ def _startSSL_pyOpenSSL(self): log.debug("_startSSL_pyOpenSSL called") tcpsock = self._owner - # See http://docs.python.org/dev/library/ssl.html - tcpsock._sslContext = OpenSSL.SSL.Context(OpenSSL.SSL.SSLv23_METHOD) - tcpsock._sslContext.set_options(OpenSSL.SSL.OP_NO_SSLv2 | \ - OpenSSL.SSL.OP_NO_TICKET) + conn = tcpsock._owner._caller + if conn.client_cert and os.path.exists(conn.client_cert): + # FIXME make a checkbox for Client Cert / SSLv23 / TLSv1 + # If we are going to use a client cert/key pair for authentication, + # we choose TLSv1 method. + 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(client_cert_path).read()) + except OpenSSL.crypto.Error, exception_obj: + log.warning('Unable to load client pkcs12 certificate from ' + 'file %s: %s ... Is it a valid PKCS12 cert?' % \ + (conn.client_cert, exception_obj.args)) + except: + log.warning('Unknown error while loading certificate from file ' + '%s' % conn.client_cert) + else: + log.info('PKCS12 Client cert loaded OK') + try: + tcpsock._sslContext.use_certificate(p12.get_certificate()) + tcpsock._sslContext.use_privatekey(p12.get_privatekey()) + log.info('p12 cert and key loaded') + except OpenSSL.crypto.Error, exception_obj: + log.warning('Unable to extract client certificate from ' + 'file %s' % conn.client_cert) + except Exception, msg: + log.warning('Unknown error extracting client certificate ' + 'from file %s: %s' % (conn.client_cert, msg)) + else: + log.info('client cert and key loaded OK') + else: + # See http://docs.python.org/dev/library/ssl.html + tcpsock._sslContext = OpenSSL.SSL.Context(OpenSSL.SSL.SSLv23_METHOD) + tcpsock._sslContext.set_options(OpenSSL.SSL.OP_NO_SSLv2 | \ + OpenSSL.SSL.OP_NO_TICKET) + tcpsock.ssl_errnum = 0 tcpsock._sslContext.set_verify(OpenSSL.SSL.VERIFY_PEER, self._ssl_verify_callback) diff -r d61cee2f1d6f -r 7c61c3c1245e src/config.py --- a/src/config.py Sat Apr 17 21:53:09 2010 +0300 +++ b/src/config.py Sun Apr 18 20:43:40 2010 +0200 @@ -1612,13 +1612,15 @@ focused_widget = self.window.get_focus() focused_widget_name = focused_widget.get_name() if focused_widget_name in ('jid_entry1', 'resource_entry1', - 'custom_port_entry'): + 'custom_port_entry', 'cert_entry1'): if focused_widget_name == 'jid_entry1': func = self.on_jid_entry1_focus_out_event elif focused_widget_name == 'resource_entry1': func = self.on_resource_entry1_focus_out_event elif focused_widget_name == 'custom_port_entry': func = self.on_custom_port_entry_focus_out_event + elif focused_widget_name == 'cert_entry1': + func = self.on_cert_entry1_focus_out_event if func(focused_widget, None): # Error detected in entry, don't change account, re-put cursor on # previous row @@ -1641,6 +1643,22 @@ self.init_account() self.update_proxy_list() + def on_browse_for_client_cert_button_clicked(self, widget, data=None): + def on_ok(widget, path_to_clientcert_file): + self.dialog.destroy() + if not path_to_clientcert_file: + return + self.xml.get_widget('cert_entry1').set_text(path_to_clientcert_file) + gajim.config.set_per('accounts', self.current_account, + 'client_cert', path_to_clientcert_file) + + def on_cancel(widget): + self.dialog.destroy() + + path_to_clientcert_file = self.xml.get_widget('cert_entry1').get_text() + self.dialog = dialogs.ClientCertChooserDialog(path_to_clientcert_file, + on_ok, on_cancel) + def update_proxy_list(self): if self.current_account: our_proxy = gajim.config.get_per('accounts', self.current_account, @@ -1796,10 +1814,14 @@ # Account tab self.draw_normal_jid() self.xml.get_object('resource_entry1').set_text(gajim.config.get_per( - 'accounts', account, 'resource')) + 'accounts', account, 'resource')) + + client_cert = gajim.config.get_per('accounts', account, 'client_cert') + self.xml.get_widget('cert_entry1').set_text(client_cert) + self.xml.get_object('adjust_priority_with_status_checkbutton1').\ - set_active(gajim.config.get_per('accounts', account, - 'adjust_priority_with_status')) + set_active(gajim.config.get_per('accounts', account, + 'adjust_priority_with_status')) spinbutton = self.xml.get_object('priority_spinbutton1') if gajim.config.get('enable_negative_priority'): spinbutton.set_range(-128, 127) @@ -2074,6 +2096,15 @@ gajim.config.set_per('accounts', self.current_account, 'hostname', jid_splited[1]) + def on_cert_entry1_focus_out_event(self, widget, event): + if self.ignore_events: + return + client_cert = widget.get_text() + if self.option_changed('client_cert', client_cert): + self.need_relogin = True + gajim.config.set_per('accounts', self.current_account, 'client_cert', + client_cert) + def on_anonymous_checkbutton1_toggled(self, widget): if self.ignore_events: return diff -r d61cee2f1d6f -r 7c61c3c1245e src/dialogs.py --- a/src/dialogs.py Sat Apr 17 21:53:09 2010 +0300 +++ b/src/dialogs.py Sun Apr 18 20:43:40 2010 +0200 @@ -3900,6 +3900,50 @@ return True # WM's X button or Escape key should not destroy the window +class ClientCertChooserDialog(FileChooserDialog): + def __init__(self, path_to_clientcert_file='', on_response_ok=None, + on_response_cancel=None): + ''' + optionally accepts path_to_clientcert_file so it has that as selected + ''' + def on_ok(widget, callback): + ''' + check if file exists and call callback + ''' + path_to_clientcert_file = self.get_filename() + path_to_clientcert_file = \ + gtkgui_helpers.decode_filechooser_file_paths( + (path_to_clientcert_file,))[0] + if os.path.exists(path_to_clientcert_file): + callback(widget, path_to_clientcert_file) + + FileChooserDialog.__init__(self, + title_text=_('Choose Client Cert #PCKS12'), + action=gtk.FILE_CHOOSER_ACTION_OPEN, + buttons=(gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL, + gtk.STOCK_OPEN, gtk.RESPONSE_OK), + current_folder='', + default_response=gtk.RESPONSE_OK, + on_response_ok=(on_ok, on_response_ok), + on_response_cancel=on_response_cancel) + + filter_ = gtk.FileFilter() + filter_.set_name(_('All files')) + filter_.add_pattern('*') + self.add_filter(filter_) + + filter_ = gtk.FileFilter() + filter_.set_name(_('PKCS12 Files')) + filter_.add_pattern('*.p12') + self.add_filter(filter_) + self.set_filter(filter_) + + if path_to_clientcert_file: + # set_filename accept only absolute path + path_to_clientcert_file = os.path.abspath(path_to_clientcert_file) + self.set_filename(path_to_clientcert_file) + + class SoundChooserDialog(FileChooserDialog): def __init__(self, path_to_snd_file='', on_response_ok=None, on_response_cancel=None):

1 0

gajim: Do not clear the input, when there has been a command-rel...
by Alexander Cherniuk 17 Apr '10

17 Apr '10

changeset d61cee2f1d6f in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=d61cee2f1d6f description: Do not clear the input, when there has been a command-related error diffstat: src/command_system/implementation/middleware.py | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diffs (28 lines): diff -r 715ebf70ca6c -r d61cee2f1d6f src/command_system/implementation/middleware.py --- a/src/command_system/implementation/middleware.py Fri Apr 09 22:49:17 2010 +0200 +++ b/src/command_system/implementation/middleware.py Sat Apr 17 21:53:09 2010 +0300 @@ -36,13 +36,14 @@ def process_as_command(self, text): flag = super(ChatCommandProcessor, self).process_as_command(text) - if flag: + if flag and self.command_succeded: self.add_history(text) self.clear_input() return flag def execute_command(self, name, arguments): try: + self.command_succeded = False super(ChatCommandProcessor, self).execute_command(name, arguments) except NoCommandError, error: details = dict(name=error.name, message=error.message) @@ -55,6 +56,8 @@ except Exception: self.echo("An error occured while trying to execute the command", 'error') print_exc() + else: + self.command_succeded = True def looks_like_command(self, text, body, name, arguments): # Command escape stuff ggoes here. If text was prepended by the

1 0

gajim-website: l10n: Updates to ru_RU translation
by Misha Shnurapet 17 Apr '10

17 Apr '10

changeset ada71a88973c in /home/hg/repos/gajim-website details:http://hg.gajim.org/gajim-website?cmd=changeset;node=ada71a88973c description: l10n: Updates to ru_RU translation Transmitted-via: Transifex (www.transifex.net) diffstat: locale/ru_RU/LC_MESSAGES/msg.po | 417 ++++++++++----------------------------- 1 files changed, 112 insertions(+), 305 deletions(-) diffs (truncated from 874 to 300 lines): diff -r 13df2dda2438 -r ada71a88973c locale/ru_RU/LC_MESSAGES/msg.po --- a/locale/ru_RU/LC_MESSAGES/msg.po Fri Apr 16 16:56:06 2010 +0200 +++ b/locale/ru_RU/LC_MESSAGES/msg.po Sat Apr 17 10:32:03 2010 +0000 @@ -2,8 +2,8 @@ # Copyright (C) 2006 THE gajim-website'S COPYRIGHT HOLDER # This file is distributed under the same license as the gajim-website package. # Sergey Y. Khlutchin <Sergey.Khlutchin(a)gmail.com>, 2006. -# -# +# +# msgid "" msgstr "" "Project-Id-Version: gajim-website 20061103\n" @@ -15,8 +15,7 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%" -"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n" #: Design.php:85 msgid "Home" @@ -88,7 +87,7 @@ #: Design.php:105 msgid "MOPSLinux" -msgstr "" +msgstr "MOPSLinux" #: Design.php:106 msgid "FreeBSD" @@ -135,12 +134,8 @@ msgstr " Язык:" #: Design.php:179 -msgid "" -" Site optimized for W3C Standards and realized with vim editor under GNU/" -"Linux by Asterix (Jabber ID: asterix(a)jabber.lagaule.org)\n" -msgstr "" -" Сайт приведён в соответствие стандартам W3C и создан с помощью текстового " -"редактора vim GNU/Linux Asterix (Jabber-ID: asterix(a)jabber.lagaule.org)\n" +msgid " Site optimized for W3C Standards and realized with vim editor under GNU/Linux by Asterix (Jabber ID: asterix(a)jabber.lagaule.org)\n" +msgstr " Сайт приведён в соответствие стандартам W3C и создан с помощью текстового редактора vim GNU/Linux Asterix (Jabber-ID: asterix(a)jabber.lagaule.org)\n" #: dev.php:5 downloads.php:5 index.php:7 screenshots.php:7 msgid "Gajim, a Jabber client" @@ -164,8 +159,7 @@ #: dev.php:19 msgid " You may also want to subscribe to our mailing list (low-traffic): " -msgstr "" -" Вы, возможно, захотите подписаться на наш список рассылки (малый трафик): " +msgstr " Вы, возможно, захотите подписаться на наш список рассылки (малый трафик): " #: dev.php:19 msgid "or by visiting" @@ -217,12 +211,8 @@ msgstr " Вы можете помочь нам сделать Gajim ещё лучше:\n" #: dev.php:41 -msgid "" -" Coding: contact us on our mailing list or in our room gajim@conference." -"gajim.org \n" -msgstr "" -" Помогая в разработке: свяжитесь с нами в нашем списке рассылки или в " -"чате gajim(a)conference.gajim.org \n" +msgid " Coding: contact us on our mailing list or in our room gajim(a)conference.gajim.org \n" +msgstr " Помогая в разработке: свяжитесь с нами в нашем списке рассылки или в чате gajim(a)conference.gajim.org \n" #: dev.php:44 msgid " Submitting a translation: see" @@ -242,9 +232,7 @@ #: dev.php:50 msgid " Donating: contact me on Jabber (asterix(a)jabber.lagaule.org)" -msgstr "" -" Пожертвования: свяжитесь со мной через jabber (asterix(a)jabber.lagaule." -"org)" +msgstr " Пожертвования: свяжитесь со мной через jabber (asterix(a)jabber.lagaule.org)" #: dev.php:55 msgid " Translations status" @@ -289,8 +277,7 @@ #: docs.php:24 msgid " To run this version, you have to install some packages. \n" -msgstr "" -" Чтобы запустить эту версию, необходимо установить некоторые пакеты.\n" +msgstr " Чтобы запустить эту версию, необходимо установить некоторые пакеты.\n" #: docs.php:25 msgid "README file" @@ -328,11 +315,8 @@ #: docs.php:48 #, c-format -msgid "" -" Gajim uses a fork of the %s library to do the interface with Jabber " -"network.\n" -msgstr "" -" Gajim использует форк библиотеки %s для взаимодействия с сетью jabber.\n" +msgid " Gajim uses a fork of the %s library to do the interface with Jabber network.\n" +msgstr " Gajim использует форк библиотеки %s для взаимодействия с сетью jabber.\n" #: downloads.php:10 msgid " Latest version of Gajim is" @@ -359,11 +343,8 @@ msgstr " Если вы используете нестабильную ветвь Debian, сделайте" #: downloads.php:23 -msgid "" -" A daily package from mercurial is also built. To use it, remove gajim" -msgstr "" -" Так же обновляется ежедневный пакет. Чтобы использовать его, удалите " -"gajim" +msgid " A daily package from mercurial is also built. To use it, remove gajim" +msgstr " Так же обновляется ежедневный пакет. Чтобы использовать его, удалите gajim" #: downloads.php:23 msgid "add this line to your" @@ -374,12 +355,8 @@ msgstr "и установите его с помощью" #: downloads.php:28 -msgid "" -"You can get the GPG key of this package by installing gajim-dev-keyring " -"package from the same repository. Just do" -msgstr "" -"Вы можете получить GPG ключ для этого пакета, установив gajim-dev-keyring из " -"этого же репозитория. Для этого выполните" +msgid "You can get the GPG key of this package by installing gajim-dev-keyring package from the same repository. Just do" +msgstr "Вы можете получить GPG ключ для этого пакета, установив gajim-dev-keyring из этого же репозитория. Для этого выполните" #: downloads.php:36 msgid " You can get the Slackware package of Gajim" @@ -484,12 +461,8 @@ msgstr "по-английски" #: downloads.php:159 -msgid "" -"If you want to use the last unstable development version, then you should " -"checkout the mercurial repository.\n" -msgstr "" -"Если вы хотите пользоваться последней нестабильной версией для " -"разработчиков, то вам нужно загрузить репозиторий mercurial.\n" +msgid "If you want to use the last unstable development version, then you should checkout the mercurial repository.\n" +msgstr "Если вы хотите пользоваться последней нестабильной версией для разработчиков, то вам нужно загрузить репозиторий mercurial.\n" #: downloads.php:165 msgid " Mercurial\n" @@ -508,12 +481,8 @@ msgstr " Чтобы загрузить исходники Gajim, вам нужно сделать следующее:\n" #: downloads.php:174 -msgid "" -" You first have to install mercurial (apt-get install mercurial " -"under Debian)\n" -msgstr "" -" Сначала установите mercurial (apt-get install mercurial в " -"Debian)\n" +msgid " You first have to install mercurial (apt-get install mercurial under Debian)\n" +msgstr " Сначала установите mercurial (apt-get install mercurial в Debian)\n" #: downloads.php:176 msgid " Then in a console, enter the following commands:\n" @@ -540,13 +509,8 @@ msgstr "а за тем" #: downloads.php:195 -msgid "" -" Once you have the repository, you can update it periodicaly so it matches " -"the latest version from the main repository with the following command:\n" -msgstr "" -" Имея уже однажды загруженный репозиторий, вы можете обновлять его, чтобы " -"он соответствовал последней версии основного репозитория, следующей " -"командой:\n" +msgid " Once you have the repository, you can update it periodicaly so it matches the latest version from the main repository with the following command:\n" +msgstr " Имея уже однажды загруженный репозиторий, вы можете обновлять его, чтобы он соответствовал последней версии основного репозитория, следующей командой:\n" #: downloads.php:204 msgid " Under Windows\n" @@ -554,31 +518,17 @@ #: downloads.php:206 #, fuzzy -msgid "" -" You first have to install mercurial for windows. In order to do that, " -"download the binary" -msgstr "" -" Сначала вам нужно устновить subversion для windows. Чтобы это сделать, " -"загрузите исполняемый файл" +msgid " You first have to install mercurial for windows. In order to do that, download the binary" +msgstr " Сначала вам нужно устновить subversion для windows. Чтобы это сделать, загрузите исполняемый файл" #: downloads.php:208 #, fuzzy -msgid "" -" Once mercurial is installed, the commands are the same with those under " -"GNU/Linux. Only difference is instead of launch.sh you run launch.bat. Enter " -"them in an MS-DOS command line and you're done." -msgstr "" -" Для однажды установленной subversion, команды будут такие же как в GNU/" -"Linux. Единственное отличие в том, что вместо launch.sh вы должны запускать " -"launch.bat. Вводите их в командной строке MS-DOS." +msgid " Once mercurial is installed, the commands are the same with those under GNU/Linux. Only difference is instead of launch.sh you run launch.bat. Enter them in an MS-DOS command line and you're done." +msgstr " Для однажды установленной subversion, команды будут такие же как в GNU/Linux. Единственное отличие в том, что вместо launch.sh вы должны запускать launch.bat. Вводите их в командной строке MS-DOS." #: downloads.php:210 -msgid "" -" To run Gajim, you need external libraries. You can find a tutorial on the " -"way to install them" -msgstr "" -" Для того, чтобы запустить Gajim, требуются дополнительные библиотеки. Вы " -"можете найти руководство по способу их установки" +msgid " To run Gajim, you need external libraries. You can find a tutorial on the way to install them" +msgstr " Для того, чтобы запустить Gajim, требуются дополнительные библиотеки. Вы можете найти руководство по способу их установки" #: downloads.php:210 msgid "On the Wiki" @@ -590,13 +540,8 @@ #: downloads.php:218 #, fuzzy -msgid "" -" Everyday on 01:00 (GMT+1 time) gz tarballs are produced from mercurial. " -"You can use them if hg is broken for you at the moment." -msgstr "" -" Ежедневно в 01:00 (по времени GMT+1) создаются gz архивы из mercurial. " -"Вы можете использовать их, если mercurial испорчен или недоступен на данный " -"момент." +msgid " Everyday on 01:00 (GMT+1 time) gz tarballs are produced from mercurial. You can use them if hg is broken for you at the moment." +msgstr " Ежедневно в 01:00 (по времени GMT+1) создаются gz архивы из mercurial. Вы можете использовать их, если mercurial испорчен или недоступен на данный момент." #: downloads.php:218 msgid "Here to get them" @@ -615,17 +560,8 @@ msgstr "Здравствуйте и добро пожаловать на сайт проекта Gajim " #: index.php:14 -msgid "" -"The goal of Gajim is to provide a full featured and easy to use Jabber " -"client. Gajim works nicely with GNOME, but does not require it to run. It is " -"released under the GNU General Public License. If you find bugs or have " -"ideas how Gajim can be better, " -msgstr "" -"Цель Gajim — предоставить полнофункциональный и простой в использовании " -"jabber-клиент. Gajim хорошо работает в среде GNOME, но не требует её для " -"работы. Он выпущен на условиях Стандартной общественной лицензии (GNU " -"General Public License). Если вы найдёте ошибки, или у вас появятся идеи, " -"как сделать Gajim лучше, " +msgid "The goal of Gajim is to provide a full featured and easy to use Jabber client. Gajim works nicely with GNOME, but does not require it to run. It is released under the GNU General Public License. If you find bugs or have ideas how Gajim can be better, " +msgstr "Цель Gajim — предоставить полнофункциональный и простой в использовании jabber-клиент. Gajim хорошо работает в среде GNOME, но не требует её для работы. Он выпущен на условиях Стандартной общественной лицензии (GNU General Public License). Если вы найдёте ошибки, или у вас появятся идеи, как сделать Gajim лучше, " #: index.php:14 msgid "please send tickets" @@ -640,12 +576,8 @@ msgstr "Окно чата с закладками и однооконный режим" #: index.php:25 -msgid "" -"Group chat support (with MUC protocol), invitation, chat to groupchat " -"transformation, minimize groupchat to roster" -msgstr "" -"Поддержка конференций (с протоколом MUC), приглашений, преобразованиячата в " -"конференцию, сокрытие конференций в ростере" +msgid "Group chat support (with MUC protocol), invitation, chat to groupchat transformation, minimize groupchat to roster" +msgstr "Поддержка конференций (с протоколом MUC), приглашений, преобразованиячата в конференцию, сокрытие конференций в ростере" #: index.php:26 msgid "Emoticons, Avatars, PEP (user activity, mood and tune)" @@ -661,14 +593,11 @@ #: index.php:29 msgid "Trayicon, Speller, extented chat history functionalities" -msgstr "" -"Значок в трее, проверка орфографии, широкие возможности поиска в истории " -"общения" +msgstr "Значок в трее, проверка орфографии, широкие возможности поиска в истории общения" #: index.php:30 msgid "TLS, GPG and End-To-End encryption support (with SSL legacy support)" -msgstr "" -"Поддержка TLS,GPG и End-To-End шифрования(с поддержкой классического SSL)" +msgstr "Поддержка TLS,GPG и End-To-End шифрования(с поддержкой классического SSL)" #: index.php:31 msgid "Transport Registration support" @@ -705,18 +634,8 @@ #: index.php:38 #, fuzzy -msgid "" -"Gajim is available in 25 languages: Basque, Belarusian, Brasilian, British, " -"Bulgarian, Chinese (simplified), Croatian, Czech, Danish, English, " -"Esperanto, French, Galician, German, Italian, Japanese, Lithuanian, " -"Norwegian (Bokmål), Polish, Russian, Serbian, Spanish, Slovak, Swedish and " -"Ukrainian" -msgstr ""

1 0

gajim-website: debian daily package name changed: gajim-svn -> g...
by Yann Leboulanger 16 Apr '10

16 Apr '10

changeset 13df2dda2438 in /home/hg/repos/gajim-website details:http://hg.gajim.org/gajim-website?cmd=changeset;node=13df2dda2438 description: debian daily package name changed: gajim-svn -> gajim-nightly diffstat: downloads.php | 10 ++++------ locale/bg_BG/LC_MESSAGES/msg.po | 38 +++++++++++++++++++------------------- locale/de_DE/LC_MESSAGES/msg.po | 38 +++++++++++++++++++------------------- locale/eo/LC_MESSAGES/msg.po | 38 +++++++++++++++++++------------------- locale/es_ES/LC_MESSAGES/msg.po | 37 ++++++++++++++++++------------------- locale/fr_FR/LC_MESSAGES/msg.po | 40 +++++++++++++++++++--------------------- locale/it_IT/LC_MESSAGES/msg.po | 38 +++++++++++++++++++------------------- locale/pl_PL/LC_MESSAGES/msg.po | 38 +++++++++++++++++++------------------- locale/pt_BR/LC_MESSAGES/msg.po | 39 ++++++++++++++++++++------------------- locale/ru_RU/LC_MESSAGES/msg.po | 39 ++++++++++++++++++++------------------- msg.pot | 30 +++++++++++------------------- 11 files changed, 187 insertions(+), 198 deletions(-) diffs (truncated from 1107 to 300 lines): diff -r bcf1241c8e2b -r 13df2dda2438 downloads.php --- a/downloads.php Wed Apr 07 21:29:58 2010 +0200 +++ b/downloads.php Fri Apr 16 16:56:06 2010 +0200 @@ -24,7 +24,7 @@ print (" \n"); print (" deb ftp://ftp.gajim.org/debian unstable main\n"); print (" \n"); -print _("and install it by doing")." apt-get install gajim-svn.\n"; +print _("and install it by doing")." apt-get install gajim-nightly.\n"; print _("You can get the GPG key of this package by installing gajim-dev-keyring package from the same repository. Just do")." apt-get install gajim-dev-keyring.\n"; print (" \n"); @@ -203,11 +203,9 @@ print (" <h3>\n"); print _(" Under Windows\n"); print (" </h3>\n"); -print _(" You first have to install subversion for windows. In order to do that, download the binary")." <a href=\"http://subversion.tigris.org/servlets/ProjectDocumentList?folderID=91\">"._("here")."</a>\n"; +print _(" You first have to install mercurial for windows. In order to do that, download the binary")." <a href=\"http://tortoisehg.bitbucket.org/\">"._("here")."</a>\n"; print (" \n"); -print _(" Once subversion is installed, the commands are the same with those under GNU/Linux. Only difference is instead of launch.sh you run launch.bat. Enter them in an MS-DOS command line and you're done."); -print (" \n"); -print _(" You can also use a graphical program like")." <a href=\"http://tortoisesvn.tigris.org/\">Tortoisesvn</a> "._("to get the latest Subversion version\n"); +print _(" Once mercurial is installed, the commands are the same with those under GNU/Linux. Only difference is instead of launch.sh you run launch.bat. Enter them in an MS-DOS command line and you're done."); print (" \n"); print _(" To run Gajim, you need external libraries. You can find a tutorial on the way to install them")." <a href=\"http://trac.gajim.org/wiki/Win32Env\">"._("On the Wiki").".\n"; print (" \n"); @@ -217,7 +215,7 @@ print _(" Daily Snapshots\n"); print (" </h2>\n"); print ("</a>\n"); -print _(" Everyday on 01:00 (GMT+1 time) gz tarballs are produced from mercurial. You can use them if svn is broken for you at the moment.")." <a href=\"downloads/snap/?M=D\">"._("Here to get them")."</a>.\n"; +print _(" Everyday on 01:00 (GMT+1 time) gz tarballs are produced from mercurial. You can use them if hg is broken for you at the moment.")." <a href=\"downloads/snap/?M=D\">"._("Here to get them")."</a>.\n"; print (" \n"); print ("<a name=\"old\">\n"); diff -r bcf1241c8e2b -r 13df2dda2438 locale/bg_BG/LC_MESSAGES/msg.po --- a/locale/bg_BG/LC_MESSAGES/msg.po Wed Apr 07 21:29:58 2010 +0200 +++ b/locale/bg_BG/LC_MESSAGES/msg.po Fri Apr 16 16:56:06 2010 +0200 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: gajim website\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-02 11:05+0200\n" +"POT-Creation-Date: 2010-04-16 16:54+0200\n" "PO-Revision-Date: 2007-03-14 17:52+0200\n" "Last-Translator: Yavor Doganov <yavor(a)gnu.org>\n" "Language-Team: Bulgarian <dict(a)fsa-bg.org>\n" @@ -174,7 +174,7 @@ msgstr " Архивите на списъка са достъпни " #: dev.php:20 docs.php:39 docs.php:45 downloads.php:36 downloads.php:156 -#: downloads.php:168 downloads.php:206 downloads.php:228 +#: downloads.php:168 downloads.php:206 downloads.php:226 msgid "here" msgstr "тук" @@ -562,16 +562,18 @@ msgstr " Под „Уиндоус“\n" #: downloads.php:206 +#, fuzzy msgid "" -" You first have to install subversion for windows. In order to do that, " +" You first have to install mercurial for windows. In order to do that, " "download the binary" msgstr "" " Първо трябва да инсталирате subversion за „Уиндоус“. За тази цел " "изтеглете двоичния файл" #: downloads.php:208 +#, fuzzy msgid "" -" Once subversion is installed, the commands are the same with those under " +" Once mercurial is installed, the commands are the same with those under " "GNU/Linux. Only difference is instead of launch.sh you run launch.bat. Enter " "them in an MS-DOS command line and you're done." msgstr "" @@ -580,46 +582,38 @@ "bat. Въведете ги в командния ред на допотопния „MS-DOS Prompt“ и сте готови." #: downloads.php:210 -msgid " You can also use a graphical program like" -msgstr " Може да използвате и графична програма като" - -#: downloads.php:210 -msgid "to get the latest Subversion version\n" -msgstr "за да изтеглите последната версия на кода\n" - -#: downloads.php:212 msgid "" " To run Gajim, you need external libraries. You can find a tutorial on the " "way to install them" msgstr "" -#: downloads.php:212 +#: downloads.php:210 msgid "On the Wiki" msgstr "" -#: downloads.php:217 +#: downloads.php:215 msgid " Daily Snapshots\n" msgstr " Ежедневни архиви от хранилището\n" -#: downloads.php:220 +#: downloads.php:218 #, fuzzy msgid "" " Everyday on 01:00 (GMT+1 time) gz tarballs are produced from mercurial. " -"You can use them if svn is broken for you at the moment." +"You can use them if hg is broken for you at the moment." msgstr "" " Всеки ден в 01:00 часа (GMT+1) автоматично се генерират архиви от " "хранилището във формат bz2. Може да ги използвате, ако хранилището на SVN е " "недостъпно." -#: downloads.php:220 +#: downloads.php:218 msgid "Here to get them" msgstr "Оттук може да ги изтеглите" -#: downloads.php:225 +#: downloads.php:223 msgid " Old releases\n" msgstr " Стари версии\n" -#: downloads.php:228 +#: downloads.php:226 msgid " You'll find old releases of Gajim" msgstr " Ще намерите стари версии на Gajim" @@ -937,6 +931,12 @@ msgid "Here are some screenshots of Gajim:" msgstr "Ето и някои снимки на Gajim:" +#~ msgid " You can also use a graphical program like" +#~ msgstr " Може да използвате и графична програма като" + +#~ msgid "to get the latest Subversion version\n" +#~ msgstr "за да изтеглите последната версия на кода\n" + #, fuzzy #~ msgid " A %s version is in test" #~ msgstr " Последната версия на Gajim е" diff -r bcf1241c8e2b -r 13df2dda2438 locale/de_DE/LC_MESSAGES/msg.po --- a/locale/de_DE/LC_MESSAGES/msg.po Wed Apr 07 21:29:58 2010 +0200 +++ b/locale/de_DE/LC_MESSAGES/msg.po Fri Apr 16 16:56:06 2010 +0200 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: msg\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-02 11:05+0200\n" +"POT-Creation-Date: 2010-04-16 16:54+0200\n" "PO-Revision-Date: 2008-12-22 22:59+0100\n" "Last-Translator: \n" "Language-Team: German <kde-i18n-de(a)lists.kde.org>\n" @@ -178,7 +178,7 @@ msgstr " Die Nachrichtenarchive finden Sie " #: dev.php:20 docs.php:39 docs.php:45 downloads.php:36 downloads.php:156 -#: downloads.php:168 downloads.php:206 downloads.php:228 +#: downloads.php:168 downloads.php:206 downloads.php:226 msgid "here" msgstr "hier" @@ -585,16 +585,18 @@ msgstr " Unter Windows\n" #: downloads.php:206 +#, fuzzy msgid "" -" You first have to install subversion for windows. In order to do that, " +" You first have to install mercurial for windows. In order to do that, " "download the binary" msgstr "" " Als erstes müssen Sie Subversion für Windows installieren. Laden Sie sich " "dazu die Binärdateien herunter; diese gibt es" #: downloads.php:208 +#, fuzzy msgid "" -" Once subversion is installed, the commands are the same with those under " +" Once mercurial is installed, the commands are the same with those under " "GNU/Linux. Only difference is instead of launch.sh you run launch.bat. Enter " "them in an MS-DOS command line and you're done." msgstr "" @@ -604,14 +606,6 @@ "DOS-Eingabeaufforderung auf." #: downloads.php:210 -msgid " You can also use a graphical program like" -msgstr " Sie können auch ein grafisches Programm wie z.B." - -#: downloads.php:210 -msgid "to get the latest Subversion version\n" -msgstr "benutzen, um die neuste SVN-Version von Gajim zu bekommen\n" - -#: downloads.php:212 msgid "" " To run Gajim, you need external libraries. You can find a tutorial on the " "way to install them" @@ -619,33 +613,33 @@ " Um Gajim auszuführen, brauchen Sie externe Bibliotheken. Sie können ein " "Tutorial zum installieren" -#: downloads.php:212 +#: downloads.php:210 msgid "On the Wiki" msgstr "im Wiki finden" -#: downloads.php:217 +#: downloads.php:215 msgid " Daily Snapshots\n" msgstr " Tägliche Schnappschüsse\n" -#: downloads.php:220 +#: downloads.php:218 #, fuzzy msgid "" " Everyday on 01:00 (GMT+1 time) gz tarballs are produced from mercurial. " -"You can use them if svn is broken for you at the moment." +"You can use them if hg is broken for you at the moment." msgstr "" " Jeden Tag werden um 01:00 Uhr (GMT+1) .tar.gz-Archive aus dem SVN-" "Quellcode erstellt. Sie können sie benutzen, falls SVN nicht funktionieren " "sollte." -#: downloads.php:220 +#: downloads.php:218 msgid "Here to get them" msgstr "Zum Herunterladen hier klicken" -#: downloads.php:225 +#: downloads.php:223 msgid " Old releases\n" msgstr " Ältere Versionen\n" -#: downloads.php:228 +#: downloads.php:226 msgid " You'll find old releases of Gajim" msgstr " Für ältere Versionen von Gajim klicken Sie bitte" @@ -970,6 +964,12 @@ msgid "Here are some screenshots of Gajim:" msgstr "Hier sind einige Bildschirmfotos von Gajim:" +#~ msgid " You can also use a graphical program like" +#~ msgstr " Sie können auch ein grafisches Programm wie z.B." + +#~ msgid "to get the latest Subversion version\n" +#~ msgstr "benutzen, um die neuste SVN-Version von Gajim zu bekommen\n" + #, fuzzy #~ msgid " A %s version is in test" #~ msgstr " Die aktuellste Version von Gajim ist" diff -r bcf1241c8e2b -r 13df2dda2438 locale/eo/LC_MESSAGES/msg.po --- a/locale/eo/LC_MESSAGES/msg.po Wed Apr 07 21:29:58 2010 +0200 +++ b/locale/eo/LC_MESSAGES/msg.po Fri Apr 16 16:56:06 2010 +0200 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: gajim-website 20061103\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-02 11:05+0200\n" +"POT-Creation-Date: 2010-04-16 16:54+0200\n" "PO-Revision-Date: 2007-02-19 20:40+0400\n" "Last-Translator: Sergio Ĥlutĉin <Sergey.Khlutchin(a)gmail.com>\n" "Language-Team: Esperanto <translation-team-eo(a)lists.sourceforge.net>\n" @@ -174,7 +174,7 @@ msgstr " Dissendolistaj arkivoj disponeblas " #: dev.php:20 docs.php:39 docs.php:45 downloads.php:36 downloads.php:156 -#: downloads.php:168 downloads.php:206 downloads.php:228 +#: downloads.php:168 downloads.php:206 downloads.php:226 msgid "here" msgstr "ĉi tie" @@ -553,16 +553,18 @@ msgstr " Ĉe Vindozo\n" #: downloads.php:206 +#, fuzzy msgid "" -" You first have to install subversion for windows. In order to do that, " +" You first have to install mercurial for windows. In order to do that, " "download the binary" msgstr "" " Komence vi devas instali subversion por vindozo. Por fari tion, elŝutu la " "duumaĵon" #: downloads.php:208 +#, fuzzy msgid "" -" Once subversion is installed, the commands are the same with those under " +" Once mercurial is installed, the commands are the same with those under " "GNU/Linux. Only difference is instead of launch.sh you run launch.bat. Enter " "them in an MS-DOS command line and you're done." msgstr "" @@ -571,45 +573,37 @@ "ilin en MS-DOS komanda linio."

1 0

gajim: [Stefan] handle user/password from HTTP_PROXY environment...
by Yann Leboulanger 09 Apr '10

09 Apr '10

changeset 715ebf70ca6c in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=715ebf70ca6c description: [Stefan] handle user/password from HTTP_PROXY environment variable. Fixes #5691 diffstat: src/common/connection.py | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diffs (16 lines): diff -r 1caf3ce29634 -r 715ebf70ca6c src/common/connection.py --- a/src/common/connection.py Fri Apr 09 21:25:50 2010 +0200 +++ b/src/common/connection.py Fri Apr 09 22:49:17 2010 +0200 @@ -990,9 +990,10 @@ proxy['port'] = 3128 if len(login) == 2: - proxy['password'] = login[1] + proxy['pass'] = login[1] + proxy['useauth'] = True else: - proxy['password'] = u'' + proxy['pass'] = u'' except Exception: proxy = None

1 0

gajim: merge trunk
by Yann Leboulanger 09 Apr '10

09 Apr '10

changeset 1caf3ce29634 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=1caf3ce29634 description: merge trunk diffstat: scripts/dev/run-pylint.py | 1 - setup_win32.py | 4 +- src/common/dataforms.py | 1 - src/common/dh.py | 41 ++++++++++++++++---------------- src/common/multimedia_helpers.py | 1 - src/common/xmpp/auth_nb.py | 2 +- src/common/xmpp/c14n.py | 1 - src/common/xmpp/idlequeue.py | 1 - src/common/zeroconf/zeroconf_bonjour.py | 1 - src/dialogs.py | 1 - src/ipython_view.py | 1 - test/lib/mock.py | 3 -- 12 files changed, 23 insertions(+), 35 deletions(-) diffs (159 lines): diff -r 9fd207639cc3 -r 1caf3ce29634 scripts/dev/run-pylint.py --- a/scripts/dev/run-pylint.py Fri Apr 09 15:11:04 2010 +0200 +++ b/scripts/dev/run-pylint.py Fri Apr 09 21:25:50 2010 +0200 @@ -8,4 +8,3 @@ os.chdir('../../src/') # we were in scripts/dev os.system("pylint --include-ids=y --additional-builtins='_' --disable-msg=C0103,C0111,W0703,W0511,W0142,W0613,R0201 --disable-checker=design " + "".join(sys.argv[1:])) - diff -r 9fd207639cc3 -r 1caf3ce29634 setup_win32.py --- a/setup_win32.py Fri Apr 09 15:11:04 2010 +0200 +++ b/setup_win32.py Fri Apr 09 21:25:50 2010 +0200 @@ -52,7 +52,8 @@ opts = { 'py2exe': { # ConfigParser,UserString,roman are needed for docutils - 'includes': 'pango,atk,gobject,cairo,pangocairo,gtk.keysyms,encodings,encodings.*,ConfigParser,UserString', + 'includes': ('pango,atk,gobject,cairo,pangocairo,gtk.keysyms,' + 'encodings,encodings.*,ConfigParser,UserString'), 'dll_excludes': [ 'iconv.dll', 'intl.dll', 'libatk-1.0-0.dll', 'libgdk_pixbuf-2.0-0.dll', 'libgdk-win32-2.0-0.dll', @@ -78,7 +79,6 @@ url='http://www.gajim.org/', download_url='http://www.gajim.org/downloads.php', license='GPL', - windows=[{'script': 'src/gajim.py', 'icon_resources': [(1, 'data/pixmaps/gajim.ico')]}, {'script': 'src/history_manager.py', diff -r 9fd207639cc3 -r 1caf3ce29634 src/common/dataforms.py --- a/src/common/dataforms.py Fri Apr 09 15:11:04 2010 +0200 +++ b/src/common/dataforms.py Fri Apr 09 21:25:50 2010 +0200 @@ -615,4 +615,3 @@ # record.setName('reported') # self.addChild(node=record) # return locals() - diff -r 9fd207639cc3 -r 1caf3ce29634 src/common/dh.py --- a/src/common/dh.py Fri Apr 09 15:11:04 2010 +0200 +++ b/src/common/dh.py Fri Apr 09 21:25:50 2010 +0200 @@ -28,28 +28,27 @@ import string -generators = [ None, # one to get the right offset - 2, - 2, - None, - None, - 2, - None, - None, - None, - None, - None, - None, - None, - None, - 2, # group 14 - 2, - 2, - 2, - 2, - ] +generators = [None, # one to get the right offset + 2, + 2, + None, + None, + 2, + None, + None, + None, + None, + None, + None, + None, + None, + 2, # group 14 + 2, + 2, + 2, + 2] -hex_primes = [ None, +hex_primes = [None, # group 1 '''FFFFFFFF FFFFFFFF C90FDAA2 2168C234 C4C6628B 80DC1CD1 diff -r 9fd207639cc3 -r 1caf3ce29634 src/common/multimedia_helpers.py --- a/src/common/multimedia_helpers.py Fri Apr 09 15:11:04 2010 +0200 +++ b/src/common/multimedia_helpers.py Fri Apr 09 21:25:50 2010 +0200 @@ -97,4 +97,3 @@ # ximagesink self.detect_element('ximagesink', _('X Window System (without Xv)')) self.detect_element('autovideosink', _('Autodetect')) - diff -r 9fd207639cc3 -r 1caf3ce29634 src/common/xmpp/auth_nb.py --- a/src/common/xmpp/auth_nb.py Fri Apr 09 15:11:04 2010 +0200 +++ b/src/common/xmpp/auth_nb.py Fri Apr 09 21:25:50 2010 +0200 @@ -438,7 +438,7 @@ self.scram_soup = 'n=' + self.username + ',r=' + nonce self.scram_gs2 = 'n,,' # No CB yet. sasl_data = (self.scram_gs2 + self.scram_soup).encode('base64').\ - replace('\n','') + replace('\n', '') node = Node('auth', attrs={'xmlns': NS_SASL, 'mechanism': self.mechanism}, payload=[sasl_data]) elif self.mechanism == 'DIGEST-MD5': diff -r 9fd207639cc3 -r 1caf3ce29634 src/common/xmpp/c14n.py --- a/src/common/xmpp/c14n.py Fri Apr 09 15:11:04 2010 +0200 +++ b/src/common/xmpp/c14n.py Fri Apr 09 21:25:50 2010 +0200 @@ -57,4 +57,3 @@ def normalise_text(val): return val.replace('&', '&').replace('<', '<').replace('>', '>').replace('\r', '') - diff -r 9fd207639cc3 -r 1caf3ce29634 src/common/xmpp/idlequeue.py --- a/src/common/xmpp/idlequeue.py Fri Apr 09 15:11:04 2010 +0200 +++ b/src/common/xmpp/idlequeue.py Fri Apr 09 21:25:50 2010 +0200 @@ -543,4 +543,3 @@ def process(self): self._check_time_events() - diff -r 9fd207639cc3 -r 1caf3ce29634 src/common/zeroconf/zeroconf_bonjour.py --- a/src/common/zeroconf/zeroconf_bonjour.py Fri Apr 09 15:11:04 2010 +0200 +++ b/src/common/zeroconf/zeroconf_bonjour.py Fri Apr 09 21:25:50 2010 +0200 @@ -330,4 +330,3 @@ except pybonjour.BonjourError: return False return True - diff -r 9fd207639cc3 -r 1caf3ce29634 src/dialogs.py --- a/src/dialogs.py Fri Apr 09 15:11:04 2010 +0200 +++ b/src/dialogs.py Fri Apr 09 21:25:50 2010 +0200 @@ -4956,4 +4956,3 @@ session.reject_content(content) dialog.destroy() - diff -r 9fd207639cc3 -r 1caf3ce29634 src/ipython_view.py --- a/src/ipython_view.py Fri Apr 09 15:11:04 2010 +0200 +++ b/src/ipython_view.py Fri Apr 09 21:25:50 2010 +0200 @@ -534,4 +534,3 @@ if rv: rv = rv.strip('\n') self.showReturned(rv) self.cout.truncate(0) - diff -r 9fd207639cc3 -r 1caf3ce29634 test/lib/mock.py --- a/test/lib/mock.py Fri Apr 09 15:11:04 2010 +0200 +++ b/test/lib/mock.py Fri Apr 09 21:25:50 2010 +0200 @@ -461,6 +461,3 @@ return testFn CALLABLE = callable - - -

1 0

gajim: convert tabs to spaces in source code thanks to reindent.py
by Éric Araujo 09 Apr '10

09 Apr '10

changeset e80de54a6600 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=e80de54a6600 description: convert tabs to spaces in source code thanks to reindent.py Also use sed to remove now unneeded Vim lines, 2to3 -f ws_comma to fix some whitespace, and fix some other madness manually. diffstat: data/emoticons/animated/emoticons.py | 96 +- data/emoticons/static-big/emoticons.py | 82 +- data/emoticons/static/emoticons.py | 82 +- data/emoticons/tango/emoticons.py | 2 +- plugins/acronyms_expander.py | 123 +- plugins/banner_tweaks/__init__.py | 2 +- plugins/banner_tweaks/plugin.py | 312 +- plugins/dbus_plugin/__init__.py | 2 +- plugins/dbus_plugin/plugin.py | 1363 +- plugins/events_dump/__init__.py | 2 +- plugins/events_dump/plugin.py | 188 +- plugins/google_translation/__init__.py | 2 +- plugins/google_translation/plugin.py | 151 +- plugins/length_notifier/__init__.py | 2 +- plugins/length_notifier/length_notifier.py | 243 +- plugins/new_events_example/__init__.py | 2 +- plugins/new_events_example/plugin.py | 204 +- plugins/roster_buttons/plugin.py | 99 +- plugins/snarl_notifications/PySnarl.py | 1544 +- plugins/snarl_notifications/__init__.py | 2 +- plugins/snarl_notifications/plugin.py | 97 +- scripts/dev/run-build-test.py | 15 +- scripts/dev/run-pylint.py | 5 +- setup_win32.py | 46 +- src/adhoc_commands.py | 848 +- src/advanced_configuration_window.py | 434 +- src/atom_window.py | 190 +- src/cell_renderer_image.py | 194 +- src/chat_control.py | 5598 ++++---- src/common/GnuPG.py | 368 +- src/common/GnuPGInterface.py | 2 - src/common/__init__.py | 2 - src/common/account.py | 20 +- src/common/atom.py | 220 +- src/common/caps_cache.py | 566 +- src/common/check_paths.py | 530 +- src/common/commands.py | 678 +- src/common/config.py | 1296 +- src/common/configpaths.py | 224 +- src/common/connection.py | 3968 +++--- src/common/connection_handlers.py | 4096 +++--- src/common/contacts.py | 1360 +- src/common/crypto.py | 88 +- src/common/dataforms.py | 949 +- src/common/dbus_support.py | 238 +- src/common/defs.py | 4 +- src/common/dh.py | 49 +- src/common/events.py | 550 +- src/common/exceptions.py | 148 +- src/common/fuzzyclock.py | 56 +- src/common/gajim.py | 428 +- src/common/ged.py | 51 +- src/common/helpers.py | 2207 +- src/common/i18n.py | 92 +- src/common/idle.py | 116 +- src/common/jingle.py | 180 +- src/common/jingle_content.py | 200 +- src/common/jingle_rtp.py | 532 +- src/common/jingle_session.py | 1092 +- src/common/jingle_transport.py | 206 +- src/common/kwalletbinding.py | 86 +- src/common/latex.py | 176 +- src/common/location_listener.py | 196 +- src/common/logger.py | 1810 +- src/common/logging_helpers.py | 252 +- src/common/multimedia_helpers.py | 136 +- src/common/nec.py | 195 +- src/common/optparser.py | 1558 +- src/common/passwords.py | 324 +- src/common/pep.py | 1088 +- src/common/protocol/__init__.py | 2 +- src/common/protocol/bytestream.py | 1094 +- src/common/protocol/caps.py | 130 +- src/common/proxy65_manager.py | 768 +- src/common/pubsub.py | 294 +- src/common/resolver.py | 546 +- src/common/rst_xhtml_generator.py | 226 +- src/common/sleepy.py | 172 +- src/common/socks5.py | 2070 +- src/common/stanza_session.py | 1550 +- src/common/xmpp/__init__.py | 2 - src/common/xmpp/auth_nb.py | 944 +- src/common/xmpp/bosh.py | 862 +- src/common/xmpp/c14n.py | 57 +- src/common/xmpp/client_nb.py | 1000 +- src/common/xmpp/dispatcher_nb.py | 998 +- src/common/xmpp/features_nb.py | 290 +- src/common/xmpp/idlequeue.py | 879 +- src/common/xmpp/plugin.py | 130 +- src/common/xmpp/protocol.py | 2012 +- src/common/xmpp/proxy_connectors.py | 386 +- src/common/xmpp/roster_nb.py | 602 +- src/common/xmpp/simplexml.py | 1178 +- src/common/xmpp/stringprepare.py | 274 +- src/common/xmpp/tls_nb.py | 670 +- src/common/xmpp/transports_nb.py | 1230 +- src/common/zeroconf/__init__.py | 2 - src/common/zeroconf/client_zeroconf.py | 1374 +- src/common/zeroconf/connection_handlers_zeroconf.py | 222 +- src/common/zeroconf/connection_zeroconf.py | 562 +- src/common/zeroconf/roster_zeroconf.py | 232 +- src/common/zeroconf/zeroconf.py | 36 +- src/common/zeroconf/zeroconf_avahi.py | 734 +- src/common/zeroconf/zeroconf_bonjour.py | 487 +- src/config.py | 7911 ++++++------ src/conversation_textview.py | 2264 +- src/dataforms_widget.py | 972 +- src/dialogs.py | 9475 +++++++------- src/disco.py | 3860 ++-- src/features_window.py | 394 +- src/filetransfers_window.py | 1662 +- src/gajim-remote-plugin.py | 946 +- src/gajim-remote.py | 1038 +- src/gajim.py | 516 +- src/gajim_themes_window.py | 676 +- src/groupchat_control.py | 4188 +++--- src/groups.py | 78 +- src/gtkexcepthook.py | 112 +- src/gtkgui_helpers.py | 1748 +- src/gtkspell.py | 1 - src/gui_interface.py | 6658 +++++----- src/gui_menu_builder.py | 790 +- src/history_manager.py | 990 +- src/history_window.py | 1044 +- src/htmltextview.py | 1672 +- src/ipython_view.py | 921 +- src/message_control.py | 326 +- src/message_textview.py | 511 +- src/message_window.py | 2034 +- src/music_track_listener.py | 478 +- src/negotiation.py | 86 +- src/network_manager_listener.py | 118 +- src/notify.py | 1146 +- src/plugins/gui.py | 346 +- src/plugins/helpers.py | 42 +- src/plugins/plugin.py | 376 +- src/plugins/pluginmanager.py | 798 +- src/profile_window.py | 604 +- src/pycallgraph.py | 4 +- src/remote_control.py | 1316 +- src/roster_window.py | 11732 ++++++++--------- src/search_window.py | 354 +- src/secrets.py | 122 +- src/session.py | 792 +- src/statusicon.py | 672 +- src/tooltips.py | 1302 +- src/vcard.py | 922 +- test/integration/__init__.py | 2 +- test/integration/test_gui_event_integration.py | 234 +- test/integration/test_resolver.py | 142 +- test/integration/test_roster.py | 282 +- test/integration/test_xmpp_client_nb.py | 240 +- test/integration/test_xmpp_transports_nb.py | 440 +- test/lib/__init__.py | 40 +- test/lib/data.py | 124 +- test/lib/gajim_mocks.py | 194 +- test/lib/mock.py | 13 +- test/lib/notify.py | 10 +- test/lib/xmpp_mocks.py | 136 +- test/runtests.py | 72 +- test/test_pluginmanager.py | 38 +- test/unit/__init__.py | 2 +- test/unit/test_account.py | 14 +- test/unit/test_caps_cache.py | 178 +- test/unit/test_contacts.py | 212 +- test/unit/test_gui_interface.py | 170 +- test/unit/test_protocol_caps.py | 86 +- test/unit/test_sessions.py | 270 +- test/unit/test_xmpp_dispatcher_nb.py | 140 +- test/unit/test_xmpp_transports_nb.py | 124 +- 170 files changed, 67579 insertions(+), 67863 deletions(-) diffs (truncated from 144283 to 300 lines): diff -r 96aff3fee71f -r e80de54a6600 data/emoticons/animated/emoticons.py --- a/data/emoticons/animated/emoticons.py Fri Feb 12 21:08:40 2010 +0100 +++ b/data/emoticons/animated/emoticons.py Thu Apr 08 01:20:17 2010 +0200 @@ -1,52 +1,50 @@ # coding=utf-8 emoticons = { - 'smile.png': [':-)', ':)'], - 'coolglasses.png': ['B-)', '(H)'], - 'wink.gif': [';-)', ';)'], - 'biggrin.png': [':-D', ':D'], - 'unhappy.png': [':-(', ':('], - 'cry.gif': [":'-(", ":'(", ';-(', ';(', ";'-("], - 'frowning.png': [':-/', ':/', ':-\\', ':\\', ':-S', ':S'], - 'blush.png': [':-$', ':$'], - 'angry.png': [':-@', ':@'], - 'bat.gif': [':-[', ':['], - 'kiss.png': [':-{}', ':-*', ':*', '(K)'], - 'stare.png': [':-|', ':|'], - 'devil.png': [']:->', '>:-)', '>:)', '(6)'], - 'tongue.png': [':-P', ':P', ':-þ', ':þ'], - 'oh.png': ['=-O', ':-O', ':O'], - 'heart.png': ['<3', '(L)', '*IN LOVE*'], - 'pussy.png': ['(@)'], - 'cuffs.png': ['(%)'], - 'moon.png': ['(S)'], - 'lamp.png': ['(I)'], - 'music.png': ['(8)'], - 'beer.png': ['(B)', '*DRINK*'], - 'brflower.png': ['(W)'], - 'boy.png': ['(Z)'], - 'girl.png': ['(X)'], - 'mail.png': ['(E)'], - 'thumbdown.png': ['(N)'], - 'photo.png': ['(P)'], - 'thumbup.png': ['(Y)', '*THUMBS UP*'], - 'hugleft.png': ['(})'], - 'brheart.png': ['</3', '(U)'], - 'flower.png': ['@}->--', '(F)'], - 'drink.png': ['(D)'], - 'phone.png': ['(T)'], - 'coffee.png': ['(C)'], - 'hugright.png': ['({)'], - 'star.png': ['(*)'], - 'rainbow.png': ['(R)'], - 'cigarette.gif': ['(ci)'], - 'cake.gif': ['(^)'], - 'dontknow.gif': [':^)'], - 'eyeroll.gif': ['8-)'], - 'lightning.gif': ['(li)'], - 'party.gif': ['<:o)'], - 'sleepy.gif': ['|-)'], - 'think.gif': ['*-)'], - 'puke.gif': [':-!'], + 'smile.png': [':-)', ':)'], + 'coolglasses.png': ['B-)', '(H)'], + 'wink.gif': [';-)', ';)'], + 'biggrin.png': [':-D', ':D'], + 'unhappy.png': [':-(', ':('], + 'cry.gif': [":'-(", ":'(", ';-(', ';(', ";'-("], + 'frowning.png': [':-/', ':/', ':-\\', ':\\', ':-S', ':S'], + 'blush.png': [':-$', ':$'], + 'angry.png': [':-@', ':@'], + 'bat.gif': [':-[', ':['], + 'kiss.png': [':-{}', ':-*', ':*', '(K)'], + 'stare.png': [':-|', ':|'], + 'devil.png': [']:->', '>:-)', '>:)', '(6)'], + 'tongue.png': [':-P', ':P', ':-þ', ':þ'], + 'oh.png': ['=-O', ':-O', ':O'], + 'heart.png': ['<3', '(L)', '*IN LOVE*'], + 'pussy.png': ['(@)'], + 'cuffs.png': ['(%)'], + 'moon.png': ['(S)'], + 'lamp.png': ['(I)'], + 'music.png': ['(8)'], + 'beer.png': ['(B)', '*DRINK*'], + 'brflower.png': ['(W)'], + 'boy.png': ['(Z)'], + 'girl.png': ['(X)'], + 'mail.png': ['(E)'], + 'thumbdown.png': ['(N)'], + 'photo.png': ['(P)'], + 'thumbup.png': ['(Y)', '*THUMBS UP*'], + 'hugleft.png': ['(})'], + 'brheart.png': ['</3', '(U)'], + 'flower.png': ['@}->--', '(F)'], + 'drink.png': ['(D)'], + 'phone.png': ['(T)'], + 'coffee.png': ['(C)'], + 'hugright.png': ['({)'], + 'star.png': ['(*)'], + 'rainbow.png': ['(R)'], + 'cigarette.gif': ['(ci)'], + 'cake.gif': ['(^)'], + 'dontknow.gif': [':^)'], + 'eyeroll.gif': ['8-)'], + 'lightning.gif': ['(li)'], + 'party.gif': ['<:o)'], + 'sleepy.gif': ['|-)'], + 'think.gif': ['*-)'], + 'puke.gif': [':-!'], } - -# vim: se ts=3: diff -r 96aff3fee71f -r e80de54a6600 data/emoticons/static-big/emoticons.py --- a/data/emoticons/static-big/emoticons.py Fri Feb 12 21:08:40 2010 +0100 +++ b/data/emoticons/static-big/emoticons.py Thu Apr 08 01:20:17 2010 +0200 @@ -1,45 +1,43 @@ # coding=utf-8 emoticons = { - 'smile.png': [':-)', ':)'], - 'coolglasses.png': ['8-)', 'B-)', '(H)'], - 'wink.png': [';-)', ';)'], - 'biggrin.png': [':-D', ':D'], - 'unhappy.png': [':-(', ':('], - 'cry.png': [":'-(", ":'(", ';-(', ';(', ";'-("], - 'frowning.png': [':-/', ':/', ':-\\', ':\\', ':-S', ':S'], - 'blush.png': [':-$', ':$'], - 'angry.png': [':-@', ':@'], - 'bat.png': [':-[', ':['], - 'kiss.png': [':-{}', ':-*', ':*', '(K)'], - 'stare.png': [':-|', ':|'], - 'devil.png': [']:->', '>:-)', '>:)', '(6)'], - 'tongue.png': [':-P', ':P', ':-þ', ':þ'], - 'oh.png': ['=-O', ':-O', ':O'], - 'heart.png': ['<3', '(L)', '*IN LOVE*'], - 'lion.png': [':3', '>:3'], - 'pussy.png': ['(@)', '=^.^='], - 'cuffs.png': ['(%)'], - 'moon.png': ['(S)'], - 'lamp.png': ['(I)'], - 'music.png': ['(8)'], - 'beer.png': ['(B)', '*DRINK*'], - 'brflower.png': ['(W)'], - 'boy.png': ['(Z)'], - 'girl.png': ['(X)'], - 'mail.png': ['(E)'], - 'thumbdown.png': ['(N)'], - 'photo.png': ['(P)'], - 'thumbup.png': ['(Y)', '*THUMBS UP*'], - 'hugleft.png': ['(})'], - 'brheart.png': ['</3', '(U)'], - 'flower.png': ['@}->--', '(F)'], - 'drink.png': ['(D)'], - 'phone.png': ['(T)'], - 'coffee.png': ['(C)'], - 'hugright.png': ['({)'], - 'star.png': ['(*)'], - 'rainbow.png': ['(R)'], - 'puke.png': [':-!'], + 'smile.png': [':-)', ':)'], + 'coolglasses.png': ['8-)', 'B-)', '(H)'], + 'wink.png': [';-)', ';)'], + 'biggrin.png': [':-D', ':D'], + 'unhappy.png': [':-(', ':('], + 'cry.png': [":'-(", ":'(", ';-(', ';(', ";'-("], + 'frowning.png': [':-/', ':/', ':-\\', ':\\', ':-S', ':S'], + 'blush.png': [':-$', ':$'], + 'angry.png': [':-@', ':@'], + 'bat.png': [':-[', ':['], + 'kiss.png': [':-{}', ':-*', ':*', '(K)'], + 'stare.png': [':-|', ':|'], + 'devil.png': [']:->', '>:-)', '>:)', '(6)'], + 'tongue.png': [':-P', ':P', ':-þ', ':þ'], + 'oh.png': ['=-O', ':-O', ':O'], + 'heart.png': ['<3', '(L)', '*IN LOVE*'], + 'lion.png': [':3', '>:3'], + 'pussy.png': ['(@)', '=^.^='], + 'cuffs.png': ['(%)'], + 'moon.png': ['(S)'], + 'lamp.png': ['(I)'], + 'music.png': ['(8)'], + 'beer.png': ['(B)', '*DRINK*'], + 'brflower.png': ['(W)'], + 'boy.png': ['(Z)'], + 'girl.png': ['(X)'], + 'mail.png': ['(E)'], + 'thumbdown.png': ['(N)'], + 'photo.png': ['(P)'], + 'thumbup.png': ['(Y)', '*THUMBS UP*'], + 'hugleft.png': ['(})'], + 'brheart.png': ['</3', '(U)'], + 'flower.png': ['@}->--', '(F)'], + 'drink.png': ['(D)'], + 'phone.png': ['(T)'], + 'coffee.png': ['(C)'], + 'hugright.png': ['({)'], + 'star.png': ['(*)'], + 'rainbow.png': ['(R)'], + 'puke.png': [':-!'], } - -# vim: se ts=3: diff -r 96aff3fee71f -r e80de54a6600 data/emoticons/static/emoticons.py --- a/data/emoticons/static/emoticons.py Fri Feb 12 21:08:40 2010 +0100 +++ b/data/emoticons/static/emoticons.py Thu Apr 08 01:20:17 2010 +0200 @@ -1,45 +1,43 @@ # coding=utf-8 emoticons = { - 'smile.png': [':-)', ':)'], - 'coolglasses.png': ['8-)', 'B-)', '(H)'], - 'wink.png': [';-)', ';)'], - 'biggrin.png': [':-D', ':D'], - 'unhappy.png': [':-(', ':('], - 'cry.png': [":'-(", ":'(", ';-(', ';(', ";'-("], - 'frowning.png': [':-/', ':/', ':-\\', ':\\', ':-S', ':S'], - 'blush.png': [':-$', ':$'], - 'angry.png': [':-@', ':@'], - 'bat.png': [':-[', ':['], - 'kiss.png': [':-{}', ':-*', ':*', '(K)'], - 'stare.png': [':-|', ':|'], - 'devil.png': [']:->', '>:-)', '>:)', '(6)'], - 'tongue.png': [':-P', ':P', ':-þ', ':þ'], - 'oh.png': ['=-O', ':-O', ':O'], - 'heart.png': ['<3', '(L)', '*IN LOVE*'], - 'lion.png': [':3', '>:3'], - 'pussy.png': ['(@)', '=^.^='], - 'cuffs.png': ['(%)'], - 'moon.png': ['(S)'], - 'lamp.png': ['(I)'], - 'music.png': ['(8)'], - 'beer.png': ['(B)', '*DRINK*'], - 'brflower.png': ['(W)'], - 'boy.png': ['(Z)'], - 'girl.png': ['(X)'], - 'mail.png': ['(E)'], - 'thumbdown.png': ['(N)'], - 'photo.png': ['(P)'], - 'thumbup.png': ['(Y)', '*THUMBS UP*'], - 'hugleft.png': ['(})'], - 'brheart.png': ['</3', '(U)'], - 'flower.png': ['@}->--', '(F)'], - 'drink.png': ['(D)'], - 'phone.png': ['(T)'], - 'coffee.png': ['(C)'], - 'hugright.png': ['({)'], - 'star.png': ['(*)'], - 'rainbow.png': ['(R)'], - 'puke.png': [':-!'], + 'smile.png': [':-)', ':)'], + 'coolglasses.png': ['8-)', 'B-)', '(H)'], + 'wink.png': [';-)', ';)'], + 'biggrin.png': [':-D', ':D'], + 'unhappy.png': [':-(', ':('], + 'cry.png': [":'-(", ":'(", ';-(', ';(', ";'-("], + 'frowning.png': [':-/', ':/', ':-\\', ':\\', ':-S', ':S'], + 'blush.png': [':-$', ':$'], + 'angry.png': [':-@', ':@'], + 'bat.png': [':-[', ':['], + 'kiss.png': [':-{}', ':-*', ':*', '(K)'], + 'stare.png': [':-|', ':|'], + 'devil.png': [']:->', '>:-)', '>:)', '(6)'], + 'tongue.png': [':-P', ':P', ':-þ', ':þ'], + 'oh.png': ['=-O', ':-O', ':O'], + 'heart.png': ['<3', '(L)', '*IN LOVE*'], + 'lion.png': [':3', '>:3'], + 'pussy.png': ['(@)', '=^.^='], + 'cuffs.png': ['(%)'], + 'moon.png': ['(S)'], + 'lamp.png': ['(I)'], + 'music.png': ['(8)'], + 'beer.png': ['(B)', '*DRINK*'], + 'brflower.png': ['(W)'], + 'boy.png': ['(Z)'], + 'girl.png': ['(X)'], + 'mail.png': ['(E)'], + 'thumbdown.png': ['(N)'], + 'photo.png': ['(P)'], + 'thumbup.png': ['(Y)', '*THUMBS UP*'], + 'hugleft.png': ['(})'], + 'brheart.png': ['</3', '(U)'], + 'flower.png': ['@}->--', '(F)'], + 'drink.png': ['(D)'], + 'phone.png': ['(T)'], + 'coffee.png': ['(C)'], + 'hugright.png': ['({)'], + 'star.png': ['(*)'], + 'rainbow.png': ['(R)'], + 'puke.png': [':-!'], } - -# vim: se ts=3: diff -r 96aff3fee71f -r e80de54a6600 data/emoticons/tango/emoticons.py --- a/data/emoticons/tango/emoticons.py Fri Feb 12 21:08:40 2010 +0100 +++ b/data/emoticons/tango/emoticons.py Thu Apr 08 01:20:17 2010 +0200 @@ -49,4 +49,4 @@ 'pissed-off.png': ['*WALL*'], 'mail.png': ['*WRITE*', '(E)'], 'tremble.png': ['*SCRATCH*'], -} \ No newline at end of file +} diff -r 96aff3fee71f -r e80de54a6600 plugins/acronyms_expander.py --- a/plugins/acronyms_expander.py Fri Feb 12 21:08:40 2010 +0100 +++ b/plugins/acronyms_expander.py Thu Apr 08 01:20:17 2010 +0200 @@ -33,69 +33,70 @@ from plugins.helpers import log, log_calls class AcronymsExpanderPlugin(GajimPlugin): - name = u'Acronyms Expander' - short_name = u'acronyms_expander'

1 0

gajim: convert tabs to spaces in source code thanks to reindent.py
by Éric Araujo 09 Apr '10

09 Apr '10

changeset 08e02336dfc1 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=08e02336dfc1 description: convert tabs to spaces in source code thanks to reindent.py Additional fixes thanks to sed, 2to3 -f ws_comma, and manual editing. diffstat: data/emoticons/animated/emoticons.py | 96 +- data/emoticons/static-big/emoticons.py | 82 +- data/emoticons/static/emoticons.py | 82 +- scripts/dev/run-pychecker.py | 5 +- setup_osx.py | 236 +- setup_win32.py | 44 +- src/adhoc_commands.py | 762 +- src/advanced.py | 434 +- src/atom_window.py | 166 +- src/cell_renderer_image.py | 194 +- src/chat_control.py | 4714 +++--- src/common/GnuPG.py | 356 +- src/common/GnuPGInterface.py | 2 - src/common/__init__.py | 2 - src/common/atom.py | 192 +- src/common/caps.py | 474 +- src/common/check_paths.py | 202 +- src/common/commands.py | 646 +- src/common/config.py | 1238 +- src/common/configpaths.py | 174 +- src/common/connection.py | 3496 ++-- src/common/connection_handlers.py | 4710 +++--- src/common/contacts.py | 1117 +- src/common/crypto.py | 88 +- src/common/dataforms.py | 923 +- src/common/dbus_support.py | 222 +- src/common/defs.py | 4 +- src/common/dh.py | 56 +- src/common/events.py | 482 +- src/common/exceptions.py | 100 +- src/common/fuzzyclock.py | 156 +- src/common/gajim.py | 384 +- src/common/helpers.py | 2258 +- src/common/i18n.py | 66 +- src/common/idle.py | 110 +- src/common/jingle.py | 1232 +- src/common/latex.py | 176 +- src/common/logger.py | 1366 +- src/common/logging_helpers.py | 252 +- src/common/optparser.py | 1168 +- src/common/passwords.py | 234 +- src/common/pep.py | 992 +- src/common/proxy65_manager.py | 708 +- src/common/pubsub.py | 196 +- src/common/resolver.py | 540 +- src/common/rst_xhtml_generator.py | 224 +- src/common/sleepy.py | 134 +- src/common/socks5.py | 1920 +- src/common/stanza_session.py | 1486 +- src/common/xmpp/__init__.py | 2 - src/common/xmpp/auth_nb.py | 884 +- src/common/xmpp/bosh.py | 868 +- src/common/xmpp/c14n.py | 53 +- src/common/xmpp/client_nb.py | 950 +- src/common/xmpp/dispatcher_nb.py | 986 +- src/common/xmpp/features_nb.py | 286 +- src/common/xmpp/idlequeue.py | 859 +- src/common/xmpp/plugin.py | 136 +- src/common/xmpp/protocol.py | 1326 +- src/common/xmpp/proxy_connectors.py | 398 +- src/common/xmpp/roster_nb.py | 376 +- src/common/xmpp/simplexml.py | 858 +- src/common/xmpp/tls_nb.py | 644 +- src/common/xmpp/transports_nb.py | 1170 +- src/common/xmpp_stringprep.py | 336 +- src/common/zeroconf/__init__.py | 2 - src/common/zeroconf/client_zeroconf.py | 1210 +- src/common/zeroconf/connection_handlers_zeroconf.py | 778 +- src/common/zeroconf/connection_zeroconf.py | 930 +- src/common/zeroconf/roster_zeroconf.py | 222 +- src/common/zeroconf/zeroconf.py | 36 +- src/common/zeroconf/zeroconf_avahi.py | 694 +- src/common/zeroconf/zeroconf_bonjour.py | 485 +- src/config.py | 7195 +++++----- src/conversation_textview.py | 2146 +- src/dataforms_widget.py | 894 +- src/dialogs.py | 7876 +++++----- src/disco.py | 3410 ++-- src/features_window.py | 420 +- src/filetransfers_window.py | 1665 +- src/gajim-remote.py | 922 +- src/gajim.py | 6864 ++++---- src/gajim_themes_window.py | 656 +- src/groupchat_control.py | 4352 +++--- src/groups.py | 64 +- src/gtkexcepthook.py | 114 +- src/gtkgui_helpers.py | 1530 +- src/gtkspell.py | 1 - src/history_manager.py | 954 +- src/history_window.py | 972 +- src/htmltextview.py | 1678 +- src/ipython_view.py | 927 +- src/message_control.py | 250 +- src/message_textview.py | 470 +- src/message_window.py | 1944 +- src/music_track_listener.py | 500 +- src/negotiation.py | 84 +- src/network_manager_listener.py | 106 +- src/notify.py | 1150 +- src/osx/__init__.py | 42 +- src/osx/dbus.py | 184 +- src/osx/growl/Growl.py | 6 +- src/osx/growl/__init__.py | 2 - src/osx/growl/setup.py | 7 +- src/osx/growler.py | 75 +- src/osx/prep_py2app.py | 24 +- src/osx/setup.py | 32 +- src/osx/syncmenu/setup.py | 24 +- src/osx/syncmenu/test-menu.py | 82 +- src/profile_window.py | 590 +- src/remote_control.py | 1114 +- src/roster_window.py | 12583 ++++++++--------- src/search_window.py | 355 +- src/secrets.py | 122 +- src/session.py | 746 +- src/statusicon.py | 106 +- src/systray.py | 704 +- src/tooltips.py | 1264 +- src/vcard.py | 930 +- src/whiteboardwidget.py | 580 +- test/lib/__init__.py | 40 +- test/lib/data.py | 124 +- test/lib/gajim_mocks.py | 198 +- test/lib/mock.py | 13 +- test/lib/notify.py | 10 +- test/lib/xmpp_mocks.py | 136 +- test/runtests.py | 62 +- test/test_caps.py | 60 +- test/test_misc_interface.py | 274 +- test/test_resolver.py | 142 +- test/test_roster.py | 290 +- test/test_sessions.py | 270 +- test/test_xmpp_client_nb.py | 240 +- test/test_xmpp_dispatcher_nb.py | 140 +- test/test_xmpp_transports_nb.py | 528 +- 135 files changed, 59179 insertions(+), 59454 deletions(-) diffs (truncated from 126615 to 300 lines): diff -r ae5e9961e699 -r 08e02336dfc1 data/emoticons/animated/emoticons.py --- a/data/emoticons/animated/emoticons.py Mon Aug 24 04:07:41 2009 -0700 +++ b/data/emoticons/animated/emoticons.py Thu Apr 08 01:20:19 2010 +0200 @@ -1,52 +1,50 @@ # coding=utf-8 emoticons = { - 'smile.png': [':-)', ':)'], - 'coolglasses.png': ['B-)', '(H)'], - 'wink.gif': [';-)', ';)'], - 'biggrin.png': [':-D', ':D'], - 'unhappy.png': [':-(', ':('], - 'cry.gif': [":'-(", ":'(", ';-(', ';(', ";'-("], - 'frowning.png': [':-/', ':/', ':-\\', ':\\', ':-S', ':S'], - 'blush.png': [':-$', ':$'], - 'angry.png': [':-@', ':@'], - 'bat.gif': [':-[', ':['], - 'kiss.png': [':-{}', ':-*', ':*', '(K)'], - 'stare.png': [':-|', ':|'], - 'devil.png': [']:->', '>:-)', '>:)', '(6)'], - 'tongue.png': [':-P', ':P', ':-þ', ':þ'], - 'oh.png': ['=-O', ':-O', ':O'], - 'heart.png': ['<3', '(L)', '*IN LOVE*'], - 'pussy.png': ['(@)'], - 'cuffs.png': ['(%)'], - 'moon.png': ['(S)'], - 'lamp.png': ['(I)'], - 'music.png': ['(8)'], - 'beer.png': ['(B)', '*DRINK*'], - 'brflower.png': ['(W)'], - 'boy.png': ['(Z)'], - 'girl.png': ['(X)'], - 'mail.png': ['(E)'], - 'thumbdown.png': ['(N)'], - 'photo.png': ['(P)'], - 'thumbup.png': ['(Y)', '*THUMBS UP*'], - 'hugleft.png': ['(})'], - 'brheart.png': ['</3', '(U)'], - 'flower.png': ['@}->--', '(F)'], - 'drink.png': ['(D)'], - 'phone.png': ['(T)'], - 'coffee.png': ['(C)'], - 'hugright.png': ['({)'], - 'star.png': ['(*)'], - 'rainbow.png': ['(R)'], - 'cigarette.gif': ['(ci)'], - 'cake.gif': ['(^)'], - 'dontknow.gif': [':^)'], - 'eyeroll.gif': ['8-)'], - 'lightning.gif': ['(li)'], - 'party.gif': ['<:o)'], - 'sleepy.gif': ['|-)'], - 'think.gif': ['*-)'], - 'puke.gif': [':-!'], + 'smile.png': [':-)', ':)'], + 'coolglasses.png': ['B-)', '(H)'], + 'wink.gif': [';-)', ';)'], + 'biggrin.png': [':-D', ':D'], + 'unhappy.png': [':-(', ':('], + 'cry.gif': [":'-(", ":'(", ';-(', ';(', ";'-("], + 'frowning.png': [':-/', ':/', ':-\\', ':\\', ':-S', ':S'], + 'blush.png': [':-$', ':$'], + 'angry.png': [':-@', ':@'], + 'bat.gif': [':-[', ':['], + 'kiss.png': [':-{}', ':-*', ':*', '(K)'], + 'stare.png': [':-|', ':|'], + 'devil.png': [']:->', '>:-)', '>:)', '(6)'], + 'tongue.png': [':-P', ':P', ':-þ', ':þ'], + 'oh.png': ['=-O', ':-O', ':O'], + 'heart.png': ['<3', '(L)', '*IN LOVE*'], + 'pussy.png': ['(@)'], + 'cuffs.png': ['(%)'], + 'moon.png': ['(S)'], + 'lamp.png': ['(I)'], + 'music.png': ['(8)'], + 'beer.png': ['(B)', '*DRINK*'], + 'brflower.png': ['(W)'], + 'boy.png': ['(Z)'], + 'girl.png': ['(X)'], + 'mail.png': ['(E)'], + 'thumbdown.png': ['(N)'], + 'photo.png': ['(P)'], + 'thumbup.png': ['(Y)', '*THUMBS UP*'], + 'hugleft.png': ['(})'], + 'brheart.png': ['</3', '(U)'], + 'flower.png': ['@}->--', '(F)'], + 'drink.png': ['(D)'], + 'phone.png': ['(T)'], + 'coffee.png': ['(C)'], + 'hugright.png': ['({)'], + 'star.png': ['(*)'], + 'rainbow.png': ['(R)'], + 'cigarette.gif': ['(ci)'], + 'cake.gif': ['(^)'], + 'dontknow.gif': [':^)'], + 'eyeroll.gif': ['8-)'], + 'lightning.gif': ['(li)'], + 'party.gif': ['<:o)'], + 'sleepy.gif': ['|-)'], + 'think.gif': ['*-)'], + 'puke.gif': [':-!'], } - -# vim: se ts=3: diff -r ae5e9961e699 -r 08e02336dfc1 data/emoticons/static-big/emoticons.py --- a/data/emoticons/static-big/emoticons.py Mon Aug 24 04:07:41 2009 -0700 +++ b/data/emoticons/static-big/emoticons.py Thu Apr 08 01:20:19 2010 +0200 @@ -1,45 +1,43 @@ # coding=utf-8 emoticons = { - 'smile.png': [':-)', ':)'], - 'coolglasses.png': ['8-)', 'B-)', '(H)'], - 'wink.png': [';-)', ';)'], - 'biggrin.png': [':-D', ':D'], - 'unhappy.png': [':-(', ':('], - 'cry.png': [":'-(", ":'(", ';-(', ';(', ";'-("], - 'frowning.png': [':-/', ':/', ':-\\', ':\\', ':-S', ':S'], - 'blush.png': [':-$', ':$'], - 'angry.png': [':-@', ':@'], - 'bat.png': [':-[', ':['], - 'kiss.png': [':-{}', ':-*', ':*', '(K)'], - 'stare.png': [':-|', ':|'], - 'devil.png': [']:->', '>:-)', '>:)', '(6)'], - 'tongue.png': [':-P', ':P', ':-þ', ':þ'], - 'oh.png': ['=-O', ':-O', ':O'], - 'heart.png': ['<3', '(L)', '*IN LOVE*'], - 'lion.png': [':3', '>:3'], - 'pussy.png': ['(@)', '=^.^='], - 'cuffs.png': ['(%)'], - 'moon.png': ['(S)'], - 'lamp.png': ['(I)'], - 'music.png': ['(8)'], - 'beer.png': ['(B)', '*DRINK*'], - 'brflower.png': ['(W)'], - 'boy.png': ['(Z)'], - 'girl.png': ['(X)'], - 'mail.png': ['(E)'], - 'thumbdown.png': ['(N)'], - 'photo.png': ['(P)'], - 'thumbup.png': ['(Y)', '*THUMBS UP*'], - 'hugleft.png': ['(})'], - 'brheart.png': ['</3', '(U)'], - 'flower.png': ['@}->--', '(F)'], - 'drink.png': ['(D)'], - 'phone.png': ['(T)'], - 'coffee.png': ['(C)'], - 'hugright.png': ['({)'], - 'star.png': ['(*)'], - 'rainbow.png': ['(R)'], - 'puke.png': [':-!'], + 'smile.png': [':-)', ':)'], + 'coolglasses.png': ['8-)', 'B-)', '(H)'], + 'wink.png': [';-)', ';)'], + 'biggrin.png': [':-D', ':D'], + 'unhappy.png': [':-(', ':('], + 'cry.png': [":'-(", ":'(", ';-(', ';(', ";'-("], + 'frowning.png': [':-/', ':/', ':-\\', ':\\', ':-S', ':S'], + 'blush.png': [':-$', ':$'], + 'angry.png': [':-@', ':@'], + 'bat.png': [':-[', ':['], + 'kiss.png': [':-{}', ':-*', ':*', '(K)'], + 'stare.png': [':-|', ':|'], + 'devil.png': [']:->', '>:-)', '>:)', '(6)'], + 'tongue.png': [':-P', ':P', ':-þ', ':þ'], + 'oh.png': ['=-O', ':-O', ':O'], + 'heart.png': ['<3', '(L)', '*IN LOVE*'], + 'lion.png': [':3', '>:3'], + 'pussy.png': ['(@)', '=^.^='], + 'cuffs.png': ['(%)'], + 'moon.png': ['(S)'], + 'lamp.png': ['(I)'], + 'music.png': ['(8)'], + 'beer.png': ['(B)', '*DRINK*'], + 'brflower.png': ['(W)'], + 'boy.png': ['(Z)'], + 'girl.png': ['(X)'], + 'mail.png': ['(E)'], + 'thumbdown.png': ['(N)'], + 'photo.png': ['(P)'], + 'thumbup.png': ['(Y)', '*THUMBS UP*'], + 'hugleft.png': ['(})'], + 'brheart.png': ['</3', '(U)'], + 'flower.png': ['@}->--', '(F)'], + 'drink.png': ['(D)'], + 'phone.png': ['(T)'], + 'coffee.png': ['(C)'], + 'hugright.png': ['({)'], + 'star.png': ['(*)'], + 'rainbow.png': ['(R)'], + 'puke.png': [':-!'], } - -# vim: se ts=3: diff -r ae5e9961e699 -r 08e02336dfc1 data/emoticons/static/emoticons.py --- a/data/emoticons/static/emoticons.py Mon Aug 24 04:07:41 2009 -0700 +++ b/data/emoticons/static/emoticons.py Thu Apr 08 01:20:19 2010 +0200 @@ -1,45 +1,43 @@ # coding=utf-8 emoticons = { - 'smile.png': [':-)', ':)'], - 'coolglasses.png': ['8-)', 'B-)', '(H)'], - 'wink.png': [';-)', ';)'], - 'biggrin.png': [':-D', ':D'], - 'unhappy.png': [':-(', ':('], - 'cry.png': [":'-(", ":'(", ';-(', ';(', ";'-("], - 'frowning.png': [':-/', ':/', ':-\\', ':\\', ':-S', ':S'], - 'blush.png': [':-$', ':$'], - 'angry.png': [':-@', ':@'], - 'bat.png': [':-[', ':['], - 'kiss.png': [':-{}', ':-*', ':*', '(K)'], - 'stare.png': [':-|', ':|'], - 'devil.png': [']:->', '>:-)', '>:)', '(6)'], - 'tongue.png': [':-P', ':P', ':-þ', ':þ'], - 'oh.png': ['=-O', ':-O', ':O'], - 'heart.png': ['<3', '(L)', '*IN LOVE*'], - 'lion.png': [':3', '>:3'], - 'pussy.png': ['(@)', '=^.^='], - 'cuffs.png': ['(%)'], - 'moon.png': ['(S)'], - 'lamp.png': ['(I)'], - 'music.png': ['(8)'], - 'beer.png': ['(B)', '*DRINK*'], - 'brflower.png': ['(W)'], - 'boy.png': ['(Z)'], - 'girl.png': ['(X)'], - 'mail.png': ['(E)'], - 'thumbdown.png': ['(N)'], - 'photo.png': ['(P)'], - 'thumbup.png': ['(Y)', '*THUMBS UP*'], - 'hugleft.png': ['(})'], - 'brheart.png': ['</3', '(U)'], - 'flower.png': ['@}->--', '(F)'], - 'drink.png': ['(D)'], - 'phone.png': ['(T)'], - 'coffee.png': ['(C)'], - 'hugright.png': ['({)'], - 'star.png': ['(*)'], - 'rainbow.png': ['(R)'], - 'puke.png': [':-!'], + 'smile.png': [':-)', ':)'], + 'coolglasses.png': ['8-)', 'B-)', '(H)'], + 'wink.png': [';-)', ';)'], + 'biggrin.png': [':-D', ':D'], + 'unhappy.png': [':-(', ':('], + 'cry.png': [":'-(", ":'(", ';-(', ';(', ";'-("], + 'frowning.png': [':-/', ':/', ':-\\', ':\\', ':-S', ':S'], + 'blush.png': [':-$', ':$'], + 'angry.png': [':-@', ':@'], + 'bat.png': [':-[', ':['], + 'kiss.png': [':-{}', ':-*', ':*', '(K)'], + 'stare.png': [':-|', ':|'], + 'devil.png': [']:->', '>:-)', '>:)', '(6)'], + 'tongue.png': [':-P', ':P', ':-þ', ':þ'], + 'oh.png': ['=-O', ':-O', ':O'], + 'heart.png': ['<3', '(L)', '*IN LOVE*'], + 'lion.png': [':3', '>:3'], + 'pussy.png': ['(@)', '=^.^='], + 'cuffs.png': ['(%)'], + 'moon.png': ['(S)'], + 'lamp.png': ['(I)'], + 'music.png': ['(8)'], + 'beer.png': ['(B)', '*DRINK*'], + 'brflower.png': ['(W)'], + 'boy.png': ['(Z)'], + 'girl.png': ['(X)'], + 'mail.png': ['(E)'], + 'thumbdown.png': ['(N)'], + 'photo.png': ['(P)'], + 'thumbup.png': ['(Y)', '*THUMBS UP*'], + 'hugleft.png': ['(})'], + 'brheart.png': ['</3', '(U)'], + 'flower.png': ['@}->--', '(F)'], + 'drink.png': ['(D)'], + 'phone.png': ['(T)'], + 'coffee.png': ['(C)'], + 'hugright.png': ['({)'], + 'star.png': ['(*)'], + 'rainbow.png': ['(R)'], + 'puke.png': [':-!'], } - -# vim: se ts=3: diff -r ae5e9961e699 -r 08e02336dfc1 scripts/dev/run-pychecker.py --- a/scripts/dev/run-pychecker.py Mon Aug 24 04:07:41 2009 -0700 +++ b/scripts/dev/run-pychecker.py Thu Apr 08 01:20:19 2010 +0200 @@ -5,10 +5,7 @@ import sys if os.getcwd().endswith('dev'): - os.chdir('../../src/') # we were in scripts/dev + os.chdir('../../src/') # we were in scripts/dev os.system('pychecker --limit 10000 --no-shadowbuiltin *.py &> /tmp/pychecker-gajim.log') os.system('$EDITOR /tmp/pychecker-gajim.log') - - -# vim: se ts=3: diff -r ae5e9961e699 -r 08e02336dfc1 setup_osx.py --- a/setup_osx.py Mon Aug 24 04:07:41 2009 -0700 +++ b/setup_osx.py Thu Apr 08 01:20:19 2010 +0200 @@ -70,135 +70,135 @@

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits April 2010