Commits March 2010

commits@gajim.org

4 participants
98 discussions

gajim: reset tooltip on send file button when filetransfer becom...
by Yann Leboulanger 21 Mar '10

21 Mar '10

changeset 3c2391a9bd67 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=3c2391a9bd67 description: reset tooltip on send file button when filetransfer become available. Fixes #5669 diffstat: src/chat_control.py | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (11 lines): diff -r b26943a72d8f -r 3c2391a9bd67 src/chat_control.py --- a/src/chat_control.py Sat Mar 20 21:34:45 2010 +0100 +++ b/src/chat_control.py Sun Mar 21 09:36:51 2010 +0100 @@ -1512,6 +1512,7 @@ # Send file if self.contact.supports(NS_FILE) and self.contact.resource: self._send_file_button.set_sensitive(True) + self._send_file_button.set_tooltip_text('') else: self._send_file_button.set_sensitive(False) if not self.contact.supports(NS_FILE):

1 0

gajim: Start of Kazakh translation
by Yann Leboulanger 20 Mar '10

20 Mar '10

changeset b26943a72d8f in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=b26943a72d8f description: Start of Kazakh translation diffstat: po/LINGUAS | 1 + po/kk.po | 9687 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 9688 insertions(+), 0 deletions(-) diffs (truncated from 9699 to 300 lines): diff -r 0e4428ff124d -r b26943a72d8f po/LINGUAS --- a/po/LINGUAS Sat Mar 20 20:17:00 2010 +0000 +++ b/po/LINGUAS Sat Mar 20 21:34:45 2010 +0100 @@ -30,3 +30,4 @@ da uk ja +kk diff -r 0e4428ff124d -r b26943a72d8f po/kk.po --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/po/kk.po Sat Mar 20 21:34:45 2010 +0100 @@ -0,0 +1,9687 @@ +# gajim to kazakh +# Copyright (C) 2009 gajim team +# This file is distributed under the same license as the PACKAGE package. +# Baurzhan Muftakhidinov <baurthefirst(a)gmail.com>, 2009. +# +msgid "" +msgstr "" +"Project-Id-Version: gajim.trunk\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2010-03-20 21:33+0100\n" +"PO-Revision-Date: 2010-03-20 13:29+0600\n" +"Last-Translator: Baurzhan Muftakhidinov <baurthefirst(a)gmail.com>\n" +"Language-Team: Kazakh <kk_KZ(a)googlegroups.com>\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=1; plural=0;\n" + +#: ../data/gui/account_context_menu.ui.h:1 +msgid "_Open Gmail Inbox" +msgstr "Gmail е-жәшігін а_шу" + +#: ../data/gui/account_creation_wizard_window.ui.h:1 +msgid "" +"Connecting to server\n" +"\n" +"Please wait..." +msgstr "" +"Сервермен байланыс орнату\n" +"\n" +"Күте тұрыңыз..." + +#: ../data/gui/account_creation_wizard_window.ui.h:4 +msgid "Please choose one of the options below:" +msgstr "Төмендегі нұсқалардың біреуін таңдаңыз:" + +#: ../data/gui/account_creation_wizard_window.ui.h:5 +msgid "Please fill in the data for your existing account" +msgstr "Сізде бар тіркелгі үшін ақпаратты толтырыңыз" + +#: ../data/gui/account_creation_wizard_window.ui.h:6 +msgid "Please select a server" +msgstr "Серверді таңдаңыз" + +#: ../data/gui/account_creation_wizard_window.ui.h:7 +msgid "@" +msgstr "@" + +#: ../data/gui/account_creation_wizard_window.ui.h:8 +msgid "" +"Add this certificate to the list of trusted certificates.\n" +"SHA1 fingerprint of the certificate:\n" +msgstr "" +"Бұл сертификатты сенімділер тізіміне қосу.\n" +"Сертификаттың SHA1 баспасы:\n" + +#: ../data/gui/account_creation_wizard_window.ui.h:11 +msgid "Anon_ymous authentication" +msgstr "" + +#: ../data/gui/account_creation_wizard_window.ui.h:12 +msgid "Connect when I press Finish" +msgstr "Аяқтау басқан кезде, байланыс орнату" + +#: ../data/gui/account_creation_wizard_window.ui.h:13 +msgid "Gajim: Account Creation Wizard" +msgstr "Gajim: Тіркелгілерді жасау шебері" + +#: ../data/gui/account_creation_wizard_window.ui.h:14 +msgid "I already have an account I want to _use" +msgstr "Менде қолданғ_ым келетін тіркелгім бар" + +#: ../data/gui/account_creation_wizard_window.ui.h:15 +msgid "I want to _register for a new account" +msgstr "Жаңа ті_ркелгіні жасауды қалаймын" + +#: ../data/gui/account_creation_wizard_window.ui.h:16 +#: ../data/gui/accounts_window.ui.h:25 +msgid "If checked, Gajim will remember the password for this account" +msgstr "Белгіленген болса, Gajim бұл тіркелгі үшін парольді сақтап отырады" + +#: ../data/gui/account_creation_wizard_window.ui.h:17 +msgid "Manage..." +msgstr "Басқару..." + +#: ../data/gui/account_creation_wizard_window.ui.h:18 +#: ../data/gui/accounts_window.ui.h:36 ../data/gui/change_mood_dialog.ui.h:3 +#: ../src/config.py:1256 ../src/config.py:1359 ../src/config.py:1652 +#: ../src/config.py:1657 ../src/config.py:2208 ../src/config.py:2287 +#: ../src/config.py:2300 ../src/config.py:3538 ../src/config.py:3611 +#: ../src/dialogs.py:308 ../src/dialogs.py:310 ../src/dialogs.py:513 +#: ../src/dialogs.py:526 ../src/roster_window.py:2887 +#: ../src/roster_window.py:2893 ../src/roster_window.py:2898 +msgid "None" +msgstr "Ешнәрсе" + +#: ../data/gui/account_creation_wizard_window.ui.h:19 +msgid "Prox_y:" +msgstr "Прокс_и:" + +#: ../data/gui/account_creation_wizard_window.ui.h:20 +#: ../data/gui/accounts_window.ui.h:45 +msgid "Save pass_word" +msgstr "Пар_ольді сақтау" + +#: ../data/gui/account_creation_wizard_window.ui.h:21 +msgid "Set my profile when I connect" +msgstr "Мен қосылғанда, профайлымды орнату" + +#: ../data/gui/account_creation_wizard_window.ui.h:22 +msgid "Use custom hostname/port" +msgstr "Пайдаланушы хост аты/порт қолдану" + +#: ../data/gui/account_creation_wizard_window.ui.h:23 +msgid "" +"You need to have an account in order to connect\n" +"to the Jabber network." +msgstr "" +"Jabber желісіне байланыс орнату үшін сізде\n" +"тіркелгіңіз болуы керек." + +#: ../data/gui/account_creation_wizard_window.ui.h:25 +#: ../data/gui/roster_window.ui.h:9 +msgid "_Advanced" +msgstr "Кеңейтіл_ген" + +#: ../data/gui/account_creation_wizard_window.ui.h:26 +msgid "_Finish" +msgstr "_Аяқтау" + +#: ../data/gui/account_creation_wizard_window.ui.h:27 +msgid "_Hostname:" +msgstr "_Хост аты:" + +#: ../data/gui/account_creation_wizard_window.ui.h:28 +#: ../data/gui/accounts_window.ui.h:57 +msgid "_Jabber ID:" +msgstr "_Jabber ID:" + +#: ../data/gui/account_creation_wizard_window.ui.h:29 +#: ../data/gui/accounts_window.ui.h:59 +msgid "_Password:" +msgstr "_Пароль:" + +#: ../data/gui/account_creation_wizard_window.ui.h:30 +msgid "_Port:" +msgstr "_Порт:" + +#: ../data/gui/account_creation_wizard_window.ui.h:31 +msgid "_Server:" +msgstr "_Сервер:" + +#: ../data/gui/accounts_window.ui.h:1 ../data/gui/preferences_window.ui.h:13 +msgid "Miscellaneous" +msgstr "Таңдамалы" + +#: ../data/gui/accounts_window.ui.h:2 +msgid "OpenPGP" +msgstr "OpenPGP" + +#: ../data/gui/accounts_window.ui.h:3 +msgid "Personal Information" +msgstr "Жеке ақпарат" + +#: ../data/gui/accounts_window.ui.h:4 +msgid "Proxy" +msgstr "Прокси" + +#: ../data/gui/accounts_window.ui.h:5 +msgid "A_djust to status" +msgstr "" + +#: ../data/gui/accounts_window.ui.h:6 ../data/gui/join_groupchat_window.ui.h:1 +msgid "Account" +msgstr "Тіркелгі" + +#: ../data/gui/accounts_window.ui.h:7 +msgid "Accounts" +msgstr "Тіркелгілер" + +#: ../data/gui/accounts_window.ui.h:8 +msgid "Administration operations" +msgstr "Әкімшілік әрекеттер" + +#: ../data/gui/accounts_window.ui.h:9 +msgid "Anonymous authentication" +msgstr "" + +#: ../data/gui/accounts_window.ui.h:10 +msgid "Auto-reconnect when connection is lost" +msgstr "Байланыс үзілсе, оны қалпына келтіру" + +#: ../data/gui/accounts_window.ui.h:11 +msgid "C_onnect on Gajim startup" +msgstr "Gajim қосылғанда, байланыс _орнату" + +#: ../data/gui/accounts_window.ui.h:12 +msgid "Chan_ge Password" +msgstr "Парольді өз_герту" + +#: ../data/gui/accounts_window.ui.h:13 +msgid "" +"Check this so Gajim will ask you before sending your password over an " +"insecure connection." +msgstr "" + +#: ../data/gui/accounts_window.ui.h:14 +msgid "Choose _Key..." +msgstr "_Кілтті таңдау..." + +#: ../data/gui/accounts_window.ui.h:15 +msgid "Click to change account's password" +msgstr "Тіркелгі паролін өзгерту үшін шертіңіз" + +#: ../data/gui/accounts_window.ui.h:16 +msgid "Click to request authorization to all contacts of another account" +msgstr "" +"Басқа тіркелгінің барлық контакттарынан авторизация сұрау үшін шертіңіз" + +#: ../data/gui/accounts_window.ui.h:17 +msgid "Co_nnect on Gajim startup" +msgstr "" + +#: ../data/gui/accounts_window.ui.h:18 +msgid "Connection" +msgstr "Байланыс" + +#: ../data/gui/accounts_window.ui.h:19 +#: ../data/gui/zeroconf_information_window.ui.h:2 +msgid "E-Mail:" +msgstr "E-Mail:" + +#: ../data/gui/accounts_window.ui.h:20 +#: ../data/gui/zeroconf_information_window.ui.h:3 +msgid "First Name:" +msgstr "Аты:" + +#. No configured account +#: ../data/gui/accounts_window.ui.h:21 ../data/gui/roster_window.ui.h:2 +#: ../src/common/helpers.py:1159 ../src/common/helpers.py:1171 +#: ../src/notify.py:558 ../src/notify.py:581 ../src/notify.py:622 +#: ../src/notify.py:638 +msgid "Gajim" +msgstr "Gajim" + +#. FIXME: Ugly workaround. +#. 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:22 ../data/gui/preferences_window.ui.h:61 +#: ../src/common/contacts.py:141 ../src/dialogs.py:111 ../src/dialogs.py:121 +#: ../src/roster_window.py:2829 ../src/roster_window.py:5376 +msgid "General" +msgstr "Жалпы" + +#: ../data/gui/accounts_window.ui.h:23 +msgid "" +"If checked, Gajim will also broadcast some more IPs except from just your " +"IP, so file transfer has higher chances of working." +msgstr "" + +#: ../data/gui/accounts_window.ui.h:24 +msgid "If checked, Gajim will get the password from a GPG agent like seahorse" +msgstr "" + +#: ../data/gui/accounts_window.ui.h:26 +msgid "" +"If checked, Gajim will send keep-alive packets to prevent connection timeout " +"which results in disconnection" +msgstr "" + +#: ../data/gui/accounts_window.ui.h:27 +msgid "" +"If checked, Gajim, when launched, will automatically connect to jabber using " +"this account" +msgstr "" + +#: ../data/gui/accounts_window.ui.h:28 +msgid "" +"If checked, any change to the global status (handled by the combobox at the " +"bottom of the roster window) will change the status of this account " +"accordingly" +msgstr "" + +#: ../data/gui/accounts_window.ui.h:29 +msgid "" +"If the default port that is used for incoming messages is unfitting for your " +"setup you can select another one here.\n" +"You might consider to change possible firewall settings."

1 0

gajim: check that we are authenticated to server before sending ...
by Yann Leboulanger 20 Mar '10

20 Mar '10

changeset fff2abdfbe8d in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=fff2abdfbe8d description: check that we are authenticated to server before sending anything. diffstat: src/common/connection.py | 90 ++++++++++++++++++++++++------------------------ 1 files changed, 45 insertions(+), 45 deletions(-) diffs (truncated from 390 to 300 lines): diff -r 1be252d1caa4 -r fff2abdfbe8d src/common/connection.py --- a/src/common/connection.py Fri Mar 19 20:46:05 2010 +0000 +++ b/src/common/connection.py Sat Mar 20 19:00:33 2010 +0100 @@ -514,7 +514,7 @@ groupchat_jid is used when we want to send a request to a real jid and act as if the answer comes from the groupchat_jid """ - if not self.connection: + if not gajim.account_is_connected(self.name): return to_whom_jid = jid if resource: @@ -1317,7 +1317,7 @@ stanza.setAttr('xml:lang', self.lang) def get_privacy_lists(self): - if not self.connection: + if not gajim.account_is_connected(self.name): return common.xmpp.features_nb.getPrivacyLists(self.connection) @@ -1336,7 +1336,7 @@ Send XMPP Ping (XEP-0199) request. If pingTo is not set, ping is sent to server to detect connection failure at application level """ - if not self.connection: + if not gajim.account_is_connected(self.name): return id_ = self.connection.getAnID() if pingTo: @@ -1364,12 +1364,12 @@ 'accounts', self.name, 'time_for_ping_alive_answer')) def get_active_default_lists(self): - if not self.connection: + if not gajim.account_is_connected(self.name): return common.xmpp.features_nb.getActiveAndDefaultPrivacyLists(self.connection) def del_privacy_list(self, privacy_list): - if not self.connection: + if not gajim.account_is_connected(self.name): return def _on_del_privacy_list_result(result): if result: @@ -1383,22 +1383,22 @@ _on_del_privacy_list_result) def get_privacy_list(self, title): - if not self.connection: + if not gajim.account_is_connected(self.name): return common.xmpp.features_nb.getPrivacyList(self.connection, title) def set_privacy_list(self, listname, tags): - if not self.connection: + if not gajim.account_is_connected(self.name): return common.xmpp.features_nb.setPrivacyList(self.connection, listname, tags) def set_active_list(self, listname): - if not self.connection: + if not gajim.account_is_connected(self.name): return common.xmpp.features_nb.setActivePrivacyList(self.connection, listname, 'active') def set_default_list(self, listname): - if not self.connection: + if not gajim.account_is_connected(self.name): return common.xmpp.features_nb.setDefaultPrivacyList(self.connection, listname) @@ -1441,14 +1441,14 @@ """ Activate a privacy rule """ - if not self.connection: + if not gajim.account_is_connected(self.name): return iq = common.xmpp.Iq('set', common.xmpp.NS_PRIVACY, xmlns = '') iq.getTag('query').setTag('active', {'name': name}) self.connection.send(iq) def send_invisible_presence(self, msg, signed, initial = False): - if not self.connection: + if not gajim.account_is_connected(self.name): return if not self.privacy_rules_supported: self.dispatch('STATUS', gajim.SHOW_LIST[self.connected]) @@ -1519,7 +1519,7 @@ def _discover_server_at_connection(self, con): self.connection = con - if not self.connection: + if not gajim.account_is_connected(self.name): return self.connection.set_send_timeout(self.keepalives, self.send_keepalive) self.connection.set_send_timeout2(self.pingalives, self.sendPing) @@ -1545,7 +1545,7 @@ def send_custom_status(self, show, msg, jid): if not show in gajim.SHOW_LIST: return -1 - if not self.connection: + if not gajim.account_is_connected(self.name): return sshow = helpers.get_xmpp_show(show) if not msg: @@ -1593,7 +1593,7 @@ self.dispatch('STATUS', show) def send_motd(self, jid, subject = '', msg = '', xhtml = None): - if not self.connection: + if not gajim.account_is_connected(self.name): return msg_iq = common.xmpp.Message(to = jid, body = msg, subject = subject, xhtml = xhtml) @@ -1626,7 +1626,7 @@ """ Send contacts with RosterX (Xep-0144) """ - if not self.connection: + if not gajim.account_is_connected(self.name): return if len(contacts) == 1: msg = _('Sent contact: "%s" (%s)') % (contacts[0].get_full_jid(), @@ -1652,14 +1652,14 @@ self.connection.send(stanza) def ack_subscribed(self, jid): - if not self.connection: + if not gajim.account_is_connected(self.name): return log.debug('ack\'ing subscription complete for %s' % jid) p = common.xmpp.Presence(jid, 'subscribe') self.connection.send(p) def ack_unsubscribed(self, jid): - if not self.connection: + if not gajim.account_is_connected(self.name): return log.debug('ack\'ing unsubscription complete for %s' % jid) p = common.xmpp.Presence(jid, 'unsubscribe') @@ -1667,7 +1667,7 @@ def request_subscription(self, jid, msg='', name='', groups=[], auto_auth=False, user_nick=''): - if not self.connection: + if not gajim.account_is_connected(self.name): return log.debug('subscription request for %s' % jid) if auto_auth: @@ -1692,21 +1692,21 @@ self.connection.send(p) def send_authorization(self, jid): - if not self.connection: + if not gajim.account_is_connected(self.name): return p = common.xmpp.Presence(jid, 'subscribed') p = self.add_sha(p) self.connection.send(p) def refuse_authorization(self, jid): - if not self.connection: + if not gajim.account_is_connected(self.name): return p = common.xmpp.Presence(jid, 'unsubscribed') p = self.add_sha(p) self.connection.send(p) def unsubscribe(self, jid, remove_auth = True): - if not self.connection: + if not gajim.account_is_connected(self.name): return if remove_auth: self.connection.getRoster().delItem(jid) @@ -1719,7 +1719,7 @@ self.update_contact(jid, '', []) def unsubscribe_agent(self, agent): - if not self.connection: + if not gajim.account_is_connected(self.name): return iq = common.xmpp.Iq('set', common.xmpp.NS_REGISTER, to = agent) iq.getTag('query').setTag('remove') @@ -1774,7 +1774,7 @@ groupchat_jid is used when we want to send a request to a real jid and act as if the answer comes from the groupchat_jid """ - if not self.connection: + if not gajim.account_is_connected(self.name): return # If we are invisible, do not request if self.connected == gajim.SHOW_LIST.index('invisible'): @@ -1797,7 +1797,7 @@ groupchat_jid is used when we want to send a request to a real jid and act as if the answer comes from the groupchat_jid """ - if not self.connection: + if not gajim.account_is_connected(self.name): return # If we are invisible, do not request if self.connected == gajim.SHOW_LIST.index('invisible'): @@ -1819,7 +1819,7 @@ """ Get Gajim settings as described in XEP 0049 """ - if not self.connection: + if not gajim.account_is_connected(self.name): return iq = common.xmpp.Iq(typ='get') iq2 = iq.addChild(name='query', namespace=common.xmpp.NS_PRIVATE) @@ -1827,7 +1827,7 @@ self.connection.send(iq) def _request_bookmarks_xml(self): - if not self.connection: + if not gajim.account_is_connected(self.name): return iq = common.xmpp.Iq(typ='get') iq2 = iq.addChild(name='query', namespace=common.xmpp.NS_PRIVATE) @@ -1845,7 +1845,7 @@ storage_type can be set to xml to force request to xml storage """ - if not self.connection: + if not gajim.account_is_connected(self.name): return if self.pubsub_supported and storage_type != 'xml': self.send_pb_retrieve('', 'storage:bookmarks') @@ -1862,7 +1862,7 @@ storage_type can be set to 'pubsub' or 'xml' so store in only one method else it will be stored on both """ - if not self.connection: + if not gajim.account_is_connected(self.name): return iq = common.xmpp.Node(tag='storage', attrs={'xmlns': 'storage:bookmarks'}) for bm in self.bookmarks: @@ -1907,7 +1907,7 @@ Get Annonations from storage as described in XEP 0048, and XEP 0145 """ self.annotations = {} - if not self.connection: + if not gajim.account_is_connected(self.name): return iq = common.xmpp.Iq(typ='get') iq2 = iq.addChild(name='query', namespace=common.xmpp.NS_PRIVATE) @@ -1918,7 +1918,7 @@ """ Set Annonations in private storage as described in XEP 0048, and XEP 0145 """ - if not self.connection: + if not gajim.account_is_connected(self.name): return iq = common.xmpp.Iq(typ='set') iq2 = iq.addChild(name='query', namespace=common.xmpp.NS_PRIVATE) @@ -1935,7 +1935,7 @@ """ Get metacontacts list from storage as described in XEP 0049 """ - if not self.connection: + if not gajim.account_is_connected(self.name): return iq = common.xmpp.Iq(typ='get') iq2 = iq.addChild(name='query', namespace=common.xmpp.NS_PRIVATE) @@ -1949,7 +1949,7 @@ """ Send meta contacts to the storage namespace """ - if not self.connection: + if not gajim.account_is_connected(self.name): return iq = common.xmpp.Iq(typ='set') iq2 = iq.addChild(name='query', namespace=common.xmpp.NS_PRIVATE) @@ -1964,7 +1964,7 @@ self.connection.send(iq) def send_agent_status(self, agent, ptype): - if not self.connection: + if not gajim.account_is_connected(self.name): return show = helpers.get_xmpp_show(gajim.SHOW_LIST[self.connected]) p = common.xmpp.Presence(to = agent, typ = ptype, show = show) @@ -1972,7 +1972,7 @@ self.connection.send(p) def check_unique_room_id_support(self, server, instance): - if not self.connection: + if not gajim.account_is_connected(self.name): return iq = common.xmpp.Iq(typ = 'get', to = server) iq.setAttr('id', 'unique1') @@ -1987,7 +1987,7 @@ def join_gc(self, nick, room_jid, password, change_nick=False): # FIXME: This room JID needs to be normalized; see #1364 - if not self.connection: + if not gajim.account_is_connected(self.name): return

1 0

gajim: update transifex tocken
by Yann Leboulanger 19 Mar '10

19 Mar '10

changeset af90b6509325 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=af90b6509325 description: update transifex tocken diffstat: README.transifex | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diffs (14 lines): diff -r 89afb2082687 -r af90b6509325 README.transifex --- a/README.transifex Fri Mar 19 20:02:13 2010 +0100 +++ b/README.transifex Fri Mar 19 20:10:26 2010 +0100 @@ -4,8 +4,8 @@ The list of tokens bellow guarantee the respective users to be able to enable submission on components using the following repository url: -http://hg.gajim.org/gajim +ssh://hg.gajim.org/gajim Tokens: -qdXG3Hzwa7UkvAABUZ7HerKLJt9LNMqa / asterix +JzQjKFEfvEhybB3vKxvsNYfusnpxWth3 / asterix

1 0

gajim: add transifex tocken to allow po file submission
by Yann Leboulanger 19 Mar '10

19 Mar '10

changeset 89afb2082687 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=89afb2082687 description: add transifex tocken to allow po file submission diffstat: README.transifex | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diffs (15 lines): diff -r fa66a3531e7c -r 89afb2082687 README.transifex --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/README.transifex Fri Mar 19 20:02:13 2010 +0100 @@ -0,0 +1,11 @@ +Transifex.net Token Verification +================================= + +The list of tokens bellow guarantee the respective users to be able to enable +submission on components using the following repository url: + +http://hg.gajim.org/gajim + +Tokens: + +qdXG3Hzwa7UkvAABUZ7HerKLJt9LNMqa / asterix

1 0

gajim: pid_alive() now works under Windows64
by David Campey 19 Mar '10

19 Mar '10

changeset fa66a3531e7c in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=fa66a3531e7c description: pid_alive() now works under Windows64 diffstat: src/gajim.py | 34 +++++++++++++++++----------------- 1 files changed, 17 insertions(+), 17 deletions(-) diffs (55 lines): diff -r e677e8e8c774 -r fa66a3531e7c src/gajim.py --- a/src/gajim.py Fri Mar 19 14:06:22 2010 +0100 +++ b/src/gajim.py Fri Mar 19 12:33:50 2010 +0200 @@ -250,7 +250,7 @@ if os.name == 'nt': try: from ctypes import (windll, c_ulong, c_int, Structure, c_char) - from ctypes import (POINTER, pointer, ) + from ctypes import (POINTER, pointer, sizeof) except Exception: return True @@ -267,26 +267,26 @@ ('dwFlags', c_ulong, ), ('szExeFile', c_char*512, ), ] - def __init__(self): - super(PROCESSENTRY32, self).__init__(self, 512+9*4) - k = windll.kernel32 - k.CreateToolhelp32Snapshot.argtypes = c_ulong, c_ulong, - k.CreateToolhelp32Snapshot.restype = c_int - k.Process32First.argtypes = c_int, POINTER(PROCESSENTRY32), - k.Process32First.restype = c_int - k.Process32Next.argtypes = c_int, POINTER(PROCESSENTRY32), - k.Process32Next.restype = c_int + kernel = windll.kernel32 + kernel.CreateToolhelp32Snapshot.argtypes = c_ulong, c_ulong, + kernel.CreateToolhelp32Snapshot.restype = c_int + kernel.Process32First.argtypes = c_int, POINTER(PROCESSENTRY32), + kernel.Process32First.restype = c_int + kernel.Process32Next.argtypes = c_int, POINTER(PROCESSENTRY32), + kernel.Process32Next.restype = c_int def get_p(pid_): - h = k.CreateToolhelp32Snapshot(2, 0) # TH32CS_SNAPPROCESS - assert h > 0, 'CreateToolhelp32Snapshot failed' - b = pointer(PROCESSENTRY32()) - f3 = k.Process32First(h, b) + TH32CS_SNAPPROCESS = 2 + CreateToolhelp32Snapshot = kernel.CreateToolhelp32Snapshot(TH32CS_SNAPPROCESS, 0) + assert CreateToolhelp32Snapshot > 0, 'CreateToolhelp32Snapshot failed' + pe32 = PROCESSENTRY32() + pe32.dwSize = sizeof( PROCESSENTRY32 ) + f3 = kernel.Process32First(CreateToolhelp32Snapshot, pointer(pe32)) while f3: - if b.contents.th32ProcessID == pid_: - return b.contents.szExeFile - f3 = k.Process32Next(h, b) + if pe32.th32ProcessID == pid_: + return pe32.szExeFile + f3 = kernel.Process32Next(CreateToolhelp32Snapshot, pointer(pe32)) if get_p(pid) in ('python.exe', 'gajim.exe'): return True

1 0

gajim: don't try to resolve wrong streamhost. Fixes #5665
by Yann Leboulanger 19 Mar '10

19 Mar '10

changeset e677e8e8c774 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=e677e8e8c774 description: don't try to resolve wrong streamhost. Fixes #5665 diffstat: src/common/proxy65_manager.py | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diffs (22 lines): diff -r fb3aad078c87 -r e677e8e8c774 src/common/proxy65_manager.py --- a/src/common/proxy65_manager.py Fri Mar 19 11:34:50 2010 +0100 +++ b/src/common/proxy65_manager.py Fri Mar 19 14:06:22 2010 +0100 @@ -83,6 +83,8 @@ host = item.getAttr('host') port = item.getAttr('port') jid = item.getAttr('jid') + if not host or not port or not jid: + self.proxies[proxy]._on_connect_failure() self.proxies[proxy].resolve_result(host, port, jid) # we can have only one streamhost raise common.xmpp.NodeProcessed @@ -113,8 +115,7 @@ self.host = str(host) self.port = int(port) self.jid = unicode(jid) - self.state = S_RESOLVED - #FIXME: re-enable proxy testing + self.state = S_INITIAL log.info('start resolving %s:%s' % (self.host, self.port)) self.receiver_tester = ReceiverTester(self.host, self.port, self.jid, self.sid, self.sender_jid, self._on_receiver_success,

1 0

gajim: update po files
by Yann Leboulanger 19 Mar '10

19 Mar '10

changeset fb3aad078c87 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=fb3aad078c87 description: update po files diffstat: po/be.po | 5002 +++++++++++++++++--------------- po/be(a)latin.po | 5014 +++++++++++++++++--------------- po/bg.po | 5041 ++++++++++++++++++--------------- po/br.po | 4946 +++++++++++++++++--------------- po/cs.po | 6955 ++++++++++++++++++++++++++-------------------- po/da.po | 5027 ++++++++++++++++++--------------- po/de.po | 7503 ++++++++++++++++++++++++++++--------------------- po/el.po | 4991 +++++++++++++++++--------------- po/en_GB.po | 5071 ++++++++++++++++++--------------- po/eo.po | 5006 +++++++++++++++++--------------- po/es.po | 4950 +++++++++++++++++--------------- po/eu.po | 5016 +++++++++++++++++--------------- po/fr.po | 5049 ++++++++++++++++++--------------- po/gl.po | 4920 +++++++++++++++++--------------- po/hr.po | 5037 ++++++++++++++++++--------------- po/it.po | 5008 +++++++++++++++++--------------- po/ja.po | 4883 +++++++++++++++++++------------- po/lt.po | 4906 +++++++++++++++++--------------- po/nb.po | 5050 ++++++++++++++++++--------------- po/nl.po | 8431 +++++++++++++++++++++++++++++-------------------------- po/no.po | 5050 ++++++++++++++++++--------------- po/pl.po | 7328 ++++++++++++++++++++++++++++-------------------- po/pt.po | 4961 +++++++++++++++++--------------- po/pt_BR.po | 4627 +++++++++++++++-------------- po/ru.po | 5006 ++++++++++++++++++--------------- po/sk.po | 5418 ++++++++++++++++++++--------------- po/sr.po | 5027 ++++++++++++++++++--------------- po/sr(a)Latn.po | 5032 ++++++++++++++++++--------------- po/sv.po | 5076 ++++++++++++++++++--------------- po/uk.po | 5040 ++++++++++++++++++--------------- po/zh_CN.po | 4987 +++++++++++++++++--------------- 31 files changed, 89863 insertions(+), 75495 deletions(-) diffs (truncated from 317107 to 300 lines): diff -r a9f7bbc818d8 -r fb3aad078c87 po/be.po --- a/po/be.po Fri Mar 19 08:27:35 2010 +0100 +++ b/po/be.po Fri Mar 19 11:34:50 2010 +0100 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: 0.10.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-11-25 22:20+0100\n" +"POT-Creation-Date: 2010-03-19 11:27+0100\n" "PO-Revision-Date: 2009-08-19 23:42+0200\n" "Last-Translator: Ihar Hrachyshka <ihar.hrachyshka(a)gmail.com>\n" "Language-Team: Belarusian <i18n(a)mova.org>\n" @@ -17,63 +17,11 @@ "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" -#: ../data/gajim.desktop.in.in.h:1 -msgid "A GTK+ Jabber client" -msgstr "Jabber-праграма для GTK+" - -#: ../data/gajim.desktop.in.in.h:2 -msgid "Gajim Instant Messenger" -msgstr "Імгненны паведамляльнік Gajim" - -#: ../data/gajim.desktop.in.in.h:3 -msgid "Jabber IM Client" -msgstr "Jabber-праграма" - -#: ../data/glade/account_context_menu.glade.h:1 -#: ../data/glade/roster_window.glade.h:7 -#, fuzzy -msgid "Join _Group Chat..." -msgstr "Удзельнічаць у _групавой размове" - -#: ../data/glade/account_context_menu.glade.h:2 -msgid "_Add Contact..." -msgstr "_Дадаць чалавека..." - -#: ../data/glade/account_context_menu.glade.h:3 -#: ../data/glade/roster_window.glade.h:17 -msgid "_Discover Services" -msgstr "_Пошук сервісаў" - -#: ../data/glade/account_context_menu.glade.h:4 -msgid "_Execute Command..." -msgstr "_Выканаць загад..." - -#: ../data/glade/account_context_menu.glade.h:5 -#, fuzzy -msgid "_Modify Account" -msgstr "Змяніць рахунак" - -#: ../data/glade/account_context_menu.glade.h:6 +#: ../data/gui/account_context_menu.ui.h:1 msgid "_Open Gmail Inbox" msgstr "_Адкрыць уваходную пошту Gmail" -#: ../data/glade/account_context_menu.glade.h:7 -#, fuzzy -msgid "_Personal Events" -msgstr "Асабістыя звесткі" - -#: ../data/glade/account_context_menu.glade.h:8 -#: ../data/glade/roster_window.glade.h:25 -#, fuzzy -msgid "_Start Chat..." -msgstr "_Пачаць размову" - -#: ../data/glade/account_context_menu.glade.h:9 -#: ../data/glade/zeroconf_context_menu.glade.h:2 -msgid "_Status" -msgstr "_Стан" - -#: ../data/glade/account_creation_wizard_window.glade.h:1 +#: ../data/gui/account_creation_wizard_window.ui.h:1 #, fuzzy msgid "" "Connecting to server\n" @@ -84,83 +32,90 @@ "\n" "Калі ласка, пачакайце..." -#: ../data/glade/account_creation_wizard_window.glade.h:4 +#: ../data/gui/account_creation_wizard_window.ui.h:4 msgid "Please choose one of the options below:" msgstr "Выберыце адну з наступных опцый:" -#: ../data/glade/account_creation_wizard_window.glade.h:5 +#: ../data/gui/account_creation_wizard_window.ui.h:5 #, fuzzy msgid "Please fill in the data for your existing account" msgstr "Запоўніце звесткі Вашага рахунка" -#: ../data/glade/account_creation_wizard_window.glade.h:6 +#: ../data/gui/account_creation_wizard_window.ui.h:6 msgid "Please select a server" msgstr "" -#: ../data/glade/account_creation_wizard_window.glade.h:7 +#: ../data/gui/account_creation_wizard_window.ui.h:7 msgid "@" msgstr "" -#: ../data/glade/account_creation_wizard_window.glade.h:8 +#: ../data/gui/account_creation_wizard_window.ui.h:8 msgid "" "Add this certificate to the list of trusted certificates.\n" "SHA1 fingerprint of the certificate:\n" msgstr "" -#: ../data/glade/account_creation_wizard_window.glade.h:11 +#: ../data/gui/account_creation_wizard_window.ui.h:11 #, fuzzy msgid "Anon_ymous authentication" msgstr "Аўтарызацыя" -#: ../data/glade/account_creation_wizard_window.glade.h:12 +#: ../data/gui/account_creation_wizard_window.ui.h:12 msgid "Connect when I press Finish" msgstr "Злучыцца па націску кнопкі \"Скончыць\"" -#: ../data/glade/account_creation_wizard_window.glade.h:13 +#: ../data/gui/account_creation_wizard_window.ui.h:13 msgid "Gajim: Account Creation Wizard" msgstr "Gajim: Стварэнне рахунка" -#: ../data/glade/account_creation_wizard_window.glade.h:14 +#: ../data/gui/account_creation_wizard_window.ui.h:14 #, fuzzy msgid "I already have an account I want to _use" msgstr "Я ўжо маю патрэбны рахунак" -#: ../data/glade/account_creation_wizard_window.glade.h:15 +#: ../data/gui/account_creation_wizard_window.ui.h:15 msgid "I want to _register for a new account" msgstr "_Зарэгістраваць новы рахунак" -#: ../data/glade/account_creation_wizard_window.glade.h:16 -#: ../data/glade/account_modification_window.glade.h:20 -#: ../data/glade/accounts_window.glade.h:25 +#: ../data/gui/account_creation_wizard_window.ui.h:16 +#: ../data/gui/accounts_window.ui.h:25 msgid "If checked, Gajim will remember the password for this account" msgstr "Калі гэтая опцыя ўключаная, Gajim запомніць пароль для гэтага рахунка" -#: ../data/glade/account_creation_wizard_window.glade.h:17 -#: ../data/glade/account_modification_window.glade.h:26 +#: ../data/gui/account_creation_wizard_window.ui.h:17 msgid "Manage..." msgstr "Кіраванне..." -#: ../data/glade/account_creation_wizard_window.glade.h:18 +#: ../data/gui/account_creation_wizard_window.ui.h:18 +#: ../data/gui/accounts_window.ui.h:36 ../data/gui/change_mood_dialog.ui.h:3 +#: ../src/config.py:1256 ../src/config.py:1359 ../src/config.py:1652 +#: ../src/config.py:1657 ../src/config.py:2208 ../src/config.py:2287 +#: ../src/config.py:2300 ../src/config.py:3538 ../src/config.py:3611 +#: ../src/dialogs.py:308 ../src/dialogs.py:310 ../src/dialogs.py:513 +#: ../src/dialogs.py:526 ../src/roster_window.py:2887 +#: ../src/roster_window.py:2893 ../src/roster_window.py:2898 +msgid "None" +msgstr "Ніякі" + +#: ../data/gui/account_creation_wizard_window.ui.h:19 #, fuzzy msgid "Prox_y:" msgstr "Проксі:" -#: ../data/glade/account_creation_wizard_window.glade.h:19 -#: ../data/glade/account_modification_window.glade.h:40 -#: ../data/glade/accounts_window.glade.h:46 +#: ../data/gui/account_creation_wizard_window.ui.h:20 +#: ../data/gui/accounts_window.ui.h:45 msgid "Save pass_word" msgstr "Захоўваць па_роль" -#: ../data/glade/account_creation_wizard_window.glade.h:20 +#: ../data/gui/account_creation_wizard_window.ui.h:21 msgid "Set my profile when I connect" msgstr "Абнавіць профіль па злучэнні" -#: ../data/glade/account_creation_wizard_window.glade.h:21 -#: ../data/glade/account_modification_window.glade.h:45 +#: ../data/gui/account_creation_wizard_window.ui.h:22 msgid "Use custom hostname/port" msgstr "Адмысловы вузел / порт" -#: ../data/glade/account_creation_wizard_window.glade.h:22 +#: ../data/gui/account_creation_wizard_window.ui.h:23 msgid "" "You need to have an account in order to connect\n" "to the Jabber network." @@ -168,149 +123,145 @@ "Трэба зарэгістраваць рахунак, каб далучыцца да\n" "сеткі Jabber." -#: ../data/glade/account_creation_wizard_window.glade.h:24 -#: ../data/glade/roster_window.glade.h:15 +#: ../data/gui/account_creation_wizard_window.ui.h:25 +#: ../data/gui/roster_window.ui.h:9 msgid "_Advanced" msgstr "_Адмысловыя" -#: ../data/glade/account_creation_wizard_window.glade.h:25 +#: ../data/gui/account_creation_wizard_window.ui.h:26 msgid "_Finish" msgstr "_Скончыць" -#: ../data/glade/account_creation_wizard_window.glade.h:26 +#: ../data/gui/account_creation_wizard_window.ui.h:27 #, fuzzy msgid "_Hostname:" msgstr "Назва вузла: " -#: ../data/glade/account_creation_wizard_window.glade.h:27 -#: ../data/glade/account_modification_window.glade.h:48 -#: ../data/glade/accounts_window.glade.h:58 +#: ../data/gui/account_creation_wizard_window.ui.h:28 +#: ../data/gui/accounts_window.ui.h:57 msgid "_Jabber ID:" msgstr "_Jabber ID:" -#: ../data/glade/account_creation_wizard_window.glade.h:28 -#: ../data/glade/account_modification_window.glade.h:50 -#: ../data/glade/accounts_window.glade.h:60 +#: ../data/gui/account_creation_wizard_window.ui.h:29 +#: ../data/gui/accounts_window.ui.h:59 msgid "_Password:" msgstr "_Пароль:" -#: ../data/glade/account_creation_wizard_window.glade.h:29 +#: ../data/gui/account_creation_wizard_window.ui.h:30 msgid "_Port:" msgstr "_Порт:" -#: ../data/glade/account_creation_wizard_window.glade.h:30 +#: ../data/gui/account_creation_wizard_window.ui.h:31 msgid "_Server:" msgstr "_Сервер:" -#: ../data/glade/account_modification_window.glade.h:1 -#: ../data/glade/accounts_window.glade.h:1 -#: ../data/glade/preferences_window.glade.h:11 +#: ../data/gui/accounts_window.ui.h:1 ../data/gui/preferences_window.ui.h:13 msgid "Miscellaneous" msgstr "Рознае" -#: ../data/glade/account_modification_window.glade.h:2 -#: ../data/glade/accounts_window.glade.h:2 +#: ../data/gui/accounts_window.ui.h:2 msgid "OpenPGP" msgstr "OpenPGP" -#: ../data/glade/account_modification_window.glade.h:3 -#: ../data/glade/accounts_window.glade.h:3 +#: ../data/gui/accounts_window.ui.h:3 msgid "Personal Information" msgstr "Асабістыя звесткі" -#: ../data/glade/account_modification_window.glade.h:4 -#: ../data/glade/accounts_window.glade.h:6 -#: ../data/glade/join_groupchat_window.glade.h:1 +#: ../data/gui/accounts_window.ui.h:4 +#, fuzzy +msgid "Proxy" +msgstr "Уласцівасці" + +#: ../data/gui/accounts_window.ui.h:5 +#, fuzzy +msgid "A_djust to status" +msgstr "_Адпаведна стану" + +#: ../data/gui/accounts_window.ui.h:6 ../data/gui/join_groupchat_window.ui.h:1 msgid "Account" msgstr "Рахунак" -#: ../data/glade/account_modification_window.glade.h:5 -msgid "Account Modification" -msgstr "Змяненне рахунка" - -#: ../data/glade/account_modification_window.glade.h:6 -#: ../data/glade/accounts_window.glade.h:8 +#: ../data/gui/accounts_window.ui.h:7 +msgid "Accounts" +msgstr "Рахункі" + +#: ../data/gui/accounts_window.ui.h:8 #, fuzzy msgid "Administration operations" msgstr "Спіс адміністратараў" -#: ../data/glade/account_modification_window.glade.h:7 -#: ../data/glade/accounts_window.glade.h:10 +#: ../data/gui/accounts_window.ui.h:9 +#, fuzzy +msgid "Anonymous authentication" +msgstr "Аўтарызацыя" + +#: ../data/gui/accounts_window.ui.h:10 msgid "Auto-reconnect when connection is lost"

1 0

gajim: fix traceback with zeroconf under windows. Fixes #5652
by Yann Leboulanger 19 Mar '10

19 Mar '10

changeset a9f7bbc818d8 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=a9f7bbc818d8 description: fix traceback with zeroconf under windows. Fixes #5652 diffstat: src/common/zeroconf/zeroconf_bonjour.py | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diffs (16 lines): diff -r 931969111a91 -r a9f7bbc818d8 src/common/zeroconf/zeroconf_bonjour.py --- a/src/common/zeroconf/zeroconf_bonjour.py Fri Mar 19 08:23:24 2010 +0100 +++ b/src/common/zeroconf/zeroconf_bonjour.py Fri Mar 19 08:27:35 2010 +0100 @@ -274,9 +274,9 @@ def disconnect(self): if self.connected: self.connected = False - self.browse_sdRef.close() - self.remove_announce() - + if hasattr(self, 'browse_sdRef'): + self.browse_sdRef.close() + self.remove_announce() def browse_domain(self, domain=None): gajim.log.debug('starting to browse')

1 0

gajim: merge with default
by Yann Leboulanger 19 Mar '10

19 Mar '10

changeset 931969111a91 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=931969111a91 description: merge with default diffstat: src/command_system/__init__.py | 2 +- src/command_system/dispatching.py | 2 +- src/command_system/errors.py | 8 +- src/command_system/framework.py | 8 +- src/command_system/implementation/__init__.py | 2 +- src/command_system/implementation/custom.py | 6 +- src/command_system/implementation/hosts.py | 2 +- src/command_system/implementation/middleware.py | 31 +++++--- src/command_system/implementation/standard.py | 88 ++++++++++++++---------- src/command_system/mapping.py | 2 +- src/common/multimedia_helpers.py | 4 +- src/common/xmpp/auth_nb.py | 27 +++--- src/dataforms_widget.py | 2 +- src/gajim-remote.py | 2 + 14 files changed, 107 insertions(+), 79 deletions(-) diffs (truncated from 566 to 300 lines): diff -r 18254a32fdd7 -r 931969111a91 src/command_system/__init__.py --- a/src/command_system/__init__.py Fri Mar 19 08:21:57 2010 +0100 +++ b/src/command_system/__init__.py Fri Mar 19 08:23:24 2010 +0100 @@ -1,4 +1,4 @@ -# Copyright (C) 2009 Alexander Cherniuk <ts33kr(a)gmail.com> +# Copyright (C) 2009-2010 Alexander Cherniuk <ts33kr(a)gmail.com> # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff -r 18254a32fdd7 -r 931969111a91 src/command_system/dispatching.py --- a/src/command_system/dispatching.py Fri Mar 19 08:21:57 2010 +0100 +++ b/src/command_system/dispatching.py Fri Mar 19 08:23:24 2010 +0100 @@ -1,4 +1,4 @@ -# Copyright (C) 2009 Alexander Cherniuk <ts33kr(a)gmail.com> +# Copyright (C) 2009-2010 Alexander Cherniuk <ts33kr(a)gmail.com> # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff -r 18254a32fdd7 -r 931969111a91 src/command_system/errors.py --- a/src/command_system/errors.py Fri Mar 19 08:21:57 2010 +0100 +++ b/src/command_system/errors.py Fri Mar 19 08:23:24 2010 +0100 @@ -1,4 +1,4 @@ -# Copyright (C) 2009 Alexander Cherniuk <ts33kr(a)gmail.com> +# Copyright (C) 2009-2010 Alexander Cherniuk <ts33kr(a)gmail.com> # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -45,3 +45,9 @@ Used to indicate errors occured during command execution. """ pass + +class NoCommandError(BaseError): + """ + Used to indicate an inability to find the specified command. + """ + pass diff -r 18254a32fdd7 -r 931969111a91 src/command_system/framework.py --- a/src/command_system/framework.py Fri Mar 19 08:21:57 2010 +0100 +++ b/src/command_system/framework.py Fri Mar 19 08:23:24 2010 +0100 @@ -1,4 +1,4 @@ -# Copyright (C) 2009 Alexander Cherniuk <ts33kr(a)gmail.com> +# Copyright (C) 2009-2010 Alexander Cherniuk <ts33kr(a)gmail.com> # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -25,7 +25,7 @@ from dispatching import Dispatcher, HostDispatcher, ContainerDispatcher from mapping import parse_arguments, adapt_arguments -from errors import DefinitionError, CommandError +from errors import DefinitionError, CommandError, NoCommandError class CommandHost(object): """ @@ -128,7 +128,7 @@ def get_command(self, name): command = Dispatcher.get_command(self.COMMAND_HOST, name) if not command: - raise CommandError("Command does not exist", name=name) + raise NoCommandError("Command does not exist", name=name) return command def list_commands(self): @@ -330,7 +330,7 @@ return decorator -def documentation(text): +def doc(text): """ This decorator is used to bind a documentation (a help) to a command. diff -r 18254a32fdd7 -r 931969111a91 src/command_system/implementation/__init__.py --- a/src/command_system/implementation/__init__.py Fri Mar 19 08:21:57 2010 +0100 +++ b/src/command_system/implementation/__init__.py Fri Mar 19 08:23:24 2010 +0100 @@ -1,4 +1,4 @@ -# Copyright (C) 2009 Alexander Cherniuk <ts33kr(a)gmail.com> +# Copyright (C) 2009-2010 Alexander Cherniuk <ts33kr(a)gmail.com> # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff -r 18254a32fdd7 -r 931969111a91 src/command_system/implementation/custom.py --- a/src/command_system/implementation/custom.py Fri Mar 19 08:21:57 2010 +0100 +++ b/src/command_system/implementation/custom.py Fri Mar 19 08:23:24 2010 +0100 @@ -1,4 +1,4 @@ -# Copyright (C) 2009 Alexander Cherniuk <ts33kr(a)gmail.com> +# Copyright (C) 2009-2010 Alexander Cherniuk <ts33kr(a)gmail.com> # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -21,7 +21,7 @@ be executed and commands defined here will not be detected. """ -from ..framework import CommandContainer, command, documentation +from ..framework import CommandContainer, command, doc from hosts import ChatCommands, PrivateChatCommands, GroupChatCommands class CustomCommonCommands(CommandContainer): @@ -58,7 +58,7 @@ HOSTS = (ChatCommands,) - @documentation(_("The same as using a doc-string, except it supports translation")) + @doc(_("The same as using a doc-string, except it supports translation")) @command def sing(self): return "Are you phreaking kidding me? Buy yourself a damn stereo..." diff -r 18254a32fdd7 -r 931969111a91 src/command_system/implementation/hosts.py --- a/src/command_system/implementation/hosts.py Fri Mar 19 08:21:57 2010 +0100 +++ b/src/command_system/implementation/hosts.py Fri Mar 19 08:23:24 2010 +0100 @@ -1,4 +1,4 @@ -# Copyright (C) 2009 Alexander Cherniuk <ts33kr(a)gmail.com> +# Copyright (C) 2009-2010 Alexander Cherniuk <ts33kr(a)gmail.com> # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff -r 18254a32fdd7 -r 931969111a91 src/command_system/implementation/middleware.py --- a/src/command_system/implementation/middleware.py Fri Mar 19 08:21:57 2010 +0100 +++ b/src/command_system/implementation/middleware.py Fri Mar 19 08:23:24 2010 +0100 @@ -1,4 +1,4 @@ -# Copyright (C) 2009 Alexander Cherniuk <ts33kr(a)gmail.com> +# Copyright (C) 2009-2010 Alexander Cherniuk <ts33kr(a)gmail.com> # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -26,7 +26,7 @@ from common import gajim from ..framework import CommandProcessor -from ..errors import CommandError +from ..errors import CommandError, NoCommandError class ChatCommandProcessor(CommandProcessor): """ @@ -44,33 +44,40 @@ def execute_command(self, name, arguments): try: super(ChatCommandProcessor, self).execute_command(name, arguments) + except NoCommandError, error: + details = dict(name=error.name, message=error.message) + message = "%(name)s: %(message)s\n" % details + message += "Try using the //%(name)s or /say /%(name)s " % details + message += "construct if you intended to send it as a text." + self.echo(message, 'error') except CommandError, error: - self.echo("%s: %s" %(error.name, error.message), 'error') + self.echo("%s: %s" % (error.name, error.message), 'error') except Exception: self.echo("An error occured while trying to execute the command", 'error') print_exc() def looks_like_command(self, text, body, name, arguments): - # Command escape stuff ggoes here. If text was prepended by the command - # prefix twice, like //not_a_command (if prefix is set to /) then it - # will be escaped, that is sent just as a regular message with one (only - # one) prefix removed, so message will be /not_a_command. + # Command escape stuff ggoes here. If text was prepended by the + # command prefix twice, like //not_a_command (if prefix is set + # to /) then it will be escaped, that is sent just as a regular + # message with one (only one) prefix removed, so message will be + # /not_a_command. if body.startswith(self.COMMAND_PREFIX): self.send(body) return True def command_preprocessor(self, command, name, arguments, args, kwargs): - # If command argument contain h or help option - forward it to the /help - # command. Dont forget to pass self, as all commands are unbound. And - # also don't forget to print output. + # If command argument contain h or help option - forward it to + # the /help command. Dont forget to pass self, as all commands + # are unbound. And also don't forget to print output. if 'h' in kwargs or 'help' in kwargs: help = self.get_command('help') self.echo(help(self, name)) return True def command_postprocessor(self, command, name, arguments, args, kwargs, value): - # If command returns a string - print it to a user. A convenient and - # sufficient in most simple cases shortcut to a using echo. + # If command returns a string - print it to a user. A convenient + # and sufficient in most simple cases shortcut to a using echo. if value and isinstance(value, StringTypes): self.echo(value) diff -r 18254a32fdd7 -r 931969111a91 src/command_system/implementation/standard.py --- a/src/command_system/implementation/standard.py Fri Mar 19 08:21:57 2010 +0100 +++ b/src/command_system/implementation/standard.py Fri Mar 19 08:23:24 2010 +0100 @@ -1,4 +1,4 @@ -# Copyright (C) 2009 Alexander Cherniuk <ts33kr(a)gmail.com> +# Copyright (C) 2009-2010 Alexander Cherniuk <ts33kr(a)gmail.com> # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -27,7 +27,7 @@ from common.logger import Constants from ..errors import CommandError -from ..framework import CommandContainer, command, documentation +from ..framework import CommandContainer, command, doc from ..mapping import generate_usage from hosts import ChatCommands, PrivateChatCommands, GroupChatCommands @@ -45,18 +45,18 @@ HOSTS = (ChatCommands, PrivateChatCommands, GroupChatCommands) @command - @documentation(_("Clear the text window")) + @doc(_("Clear the text window")) def clear(self): self.conv_textview.clear() @command - @documentation(_("Hide the chat buttons")) + @doc(_("Hide the chat buttons")) def compact(self): new_status = not self.hide_chat_buttons self.chat_buttons_set_visible(new_status) @command(overlap=True) - @documentation(_("Show help on a given command or a list of available commands if -(-a)ll is given")) + @doc(_("Show help on a given command or a list of available commands if -(-a)ll is given")) def help(self, command=None, all=False): if command: command = self.get_command(command) @@ -83,17 +83,17 @@ self.echo(help(self, 'help')) @command(raw=True) - @documentation(_("Send a message to the contact")) + @doc(_("Send a message to the contact")) def say(self, message): self.send(message) @command(raw=True) - @documentation(_("Send action (in the third person) to the current chat")) + @doc(_("Send action (in the third person) to the current chat")) def me(self, action): self.send("/me %s" % action) @command('lastlog', overlap=True) - @documentation(_("Show logged messages which mention given text")) + @doc(_("Show logged messages which mention given text")) def grep(self, text, limit=None): results = gajim.logger.get_search_results_for_query(self.contact.jid, text, self.account) @@ -129,7 +129,7 @@ self.echo(formatted) @command(raw=True, empty=True) - @documentation(_(""" + @doc(_(""" Set current the status Status can be given as one of the following values: online, away, @@ -142,7 +142,7 @@ connection.change_status(status, message) @command(raw=True, empty=True) - @documentation(_("Set the current status to away")) + @doc(_("Set the current status to away")) def away(self, message): if not message: message = _("Away") @@ -150,36 +150,40 @@ connection.change_status('away', message) @command('back', raw=True, empty=True) - @documentation(_("Set the current status to online")) + @doc(_("Set the current status to online")) def online(self, message): if not message: message = _("Available") for connection in gajim.connections.itervalues(): connection.change_status('online', message) -class StandardChatCommands(CommandContainer): +class StandardCommonChatCommands(CommandContainer): """ - This command container contains standard command which are unique to - a chat. + This command container contans standard commands, which are common + to a chat and a private chat only. """ - HOSTS = (ChatCommands,) + HOSTS = (ChatCommands, PrivateChatCommands) @command - @documentation(_("Send a ping to the contact")) + @doc(_("Toggle the GPG encryption")) + def gpg(self): + self._toggle_gpg() + + @command + @doc(_("Send a ping to the contact")) def ping(self): if self.account == gajim.ZEROCONF_ACC_NAME:

1 0

← Newer
1
2
3
4
5
6
7
8
9
10
Older →

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits March 2010