Commits March 2010

commits@gajim.org

4 participants
98 discussions

gajim: don't disconnect an account that is not fully connected. ...
by Yann Leboulanger 10 Mar '10

10 Mar '10

changeset 359e72a3644c in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=359e72a3644c description: don't disconnect an account that is not fully connected. Fixes #5648 diffstat: src/roster_window.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r de7e78b44b84 -r 359e72a3644c src/roster_window.py --- a/src/roster_window.py Wed Mar 10 22:07:59 2010 +0100 +++ b/src/roster_window.py Wed Mar 10 22:43:55 2010 +0100 @@ -2343,7 +2343,7 @@ self.quit_on_next_offline = 0 accounts_to_disconnect = [] for acct in accounts: - if gajim.connections[acct].connected: + if gajim.connections[acct].connected > 1: self.quit_on_next_offline += 1 accounts_to_disconnect.append(acct)

1 0

gajim: [Mako N] add japanese translation
by Yann Leboulanger 10 Mar '10

10 Mar '10

changeset de7e78b44b84 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=de7e78b44b84 description: [Mako N] add japanese translation diffstat: po/LINGUAS | 1 + po/ja.po | 9427 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 9428 insertions(+), 0 deletions(-) diffs (truncated from 9439 to 300 lines): diff -r be4f8698ac8d -r de7e78b44b84 po/LINGUAS --- a/po/LINGUAS Wed Mar 10 21:58:14 2010 +0100 +++ b/po/LINGUAS Wed Mar 10 22:07:59 2010 +0100 @@ -29,3 +29,4 @@ lt da uk +ja diff -r be4f8698ac8d -r de7e78b44b84 po/ja.po --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/po/ja.po Wed Mar 10 22:07:59 2010 +0100 @@ -0,0 +1,9427 @@ +# Japanese translations for Gajim - A Jabber Instant Messager package. +# Copyright (C) 2009 THE Gajim - A Jabber Instant Messager'S COPYRIGHT HOLDER +# This file is distributed under the same license as the Gajim - A Jabber Instant Messager package. +# +msgid "" +msgstr "" +"Project-Id-Version: Gajim 0.13.3\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2010-03-10 22:07+0100\n" +"PO-Revision-Date: 2010-03-10 17:59+0900\n" +"Last-Translator: Mako N. <mako(a)pasero.net>\n" +"Language-Team: Japanese\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: ../data/gajim.desktop.in.in.h:1 +msgid "A GTK+ Jabber client" +msgstr "GTK+ Jabber クライアント" + +#: ../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 IM クライアント" + +#: ../src/adhoc_commands.py:298 +msgid "Cancel confirmation" +msgstr "中止の確認" + +#: ../src/adhoc_commands.py:299 +msgid "" +"You are in process of executing command. Do you really want to cancel it?" +msgstr "コマンドの実行中です。本当に中止してもいいですか ?" + +#: ../src/adhoc_commands.py:331 ../src/adhoc_commands.py:354 +msgid "Service sent malformed data" +msgstr "" + +#: ../src/adhoc_commands.py:340 +msgid "Service changed the session identifier." +msgstr "" + +#. when stanza doesn't have error description +#: ../src/adhoc_commands.py:441 +#, fuzzy +msgid "Service returned an error." +msgstr "エラーを返してきました。" + +#. For i18n +#: ../src/advanced_configuration_window.py:91 +msgid "Activated" +msgstr "真" + +#: ../src/advanced_configuration_window.py:91 +msgid "Deactivated" +msgstr "偽" + +#: ../src/advanced_configuration_window.py:93 +msgid "Boolean" +msgstr "真偽型" + +#: ../src/advanced_configuration_window.py:94 +msgid "Integer" +msgstr "整数型" + +#: ../src/advanced_configuration_window.py:95 +msgid "Text" +msgstr "文字列型" + +#: ../src/advanced_configuration_window.py:96 ../src/chat_control.py:902 +msgid "Color" +msgstr "色" + +#: ../src/advanced_configuration_window.py:107 +msgid "Preference Name" +msgstr "設定名" + +#: ../src/advanced_configuration_window.py:113 +msgid "Value" +msgstr "値" + +#: ../src/advanced_configuration_window.py:121 +msgid "Type" +msgstr "種類" + +#. we talk about option description in advanced configuration editor +#: ../src/advanced_configuration_window.py:176 +msgid "(None)" +msgstr "(なし)" + +#: ../src/advanced_configuration_window.py:259 +#, fuzzy +msgid "Hidden" +msgstr "隠し" + +#: ../src/atom_window.py:119 +#, fuzzy, python-format +msgid "You have received new entries (and %d not displayed):" +msgid_plural "You have received new entries (and %d not displayed):" +msgstr[0] "新しいエントリーを受け取りました (%(count)d が表示されません):" +msgstr[1] "新しいエントリーを受け取りました (%(count)d が表示されません):" + +#: ../src/atom_window.py:124 +msgid "You have received new entry:" +msgstr "新しいエントリーを受け取りました:" + +#. the next script, executed in the "po" directory, +#. generates the following list. +#. #!/bin/sh +#. LANG=$(for i in *.po; do j=${i/.po/}; echo -n "_('"$j"')":" '"$j"', " ; done) +#. echo "{_('en'):'en'",$LANG"}" +#: ../src/chat_control.py:75 +msgid "English" +msgstr "英語" + +#: ../src/chat_control.py:75 +msgid "Belarusian" +msgstr "ベラルーシ語" + +#: ../src/chat_control.py:75 +msgid "Bulgarian" +msgstr "ブルガリア語" + +#: ../src/chat_control.py:75 +msgid "Breton" +msgstr "ブルトン語" + +#: ../src/chat_control.py:75 +msgid "Czech" +msgstr "チェコ語" + +#: ../src/chat_control.py:75 +msgid "German" +msgstr "ドイツ語" + +#: ../src/chat_control.py:75 +msgid "Greek" +msgstr "ギリシア語" + +#: ../src/chat_control.py:75 +msgid "British" +msgstr "英語 (イギリス)" + +#: ../src/chat_control.py:75 +msgid "Esperanto" +msgstr "エスペラント" + +#: ../src/chat_control.py:75 +msgid "Spanish" +msgstr "スペイン語" + +#: ../src/chat_control.py:75 +msgid "Basque" +msgstr "バスク語" + +#: ../src/chat_control.py:75 +msgid "French" +msgstr "フランス語" + +#: ../src/chat_control.py:75 +msgid "Croatian" +msgstr "クロアチア語" + +#: ../src/chat_control.py:75 +msgid "Italian" +msgstr "イタリア語" + +#: ../src/chat_control.py:75 +msgid "Norwegian (b)" +msgstr "ノルウェー語 (b)" + +#: ../src/chat_control.py:75 +msgid "Dutch" +msgstr "オランダ語" + +#: ../src/chat_control.py:75 +msgid "Norwegian" +msgstr "ノルウェー語" + +#: ../src/chat_control.py:75 +msgid "Polish" +msgstr "ポーランド語" + +#: ../src/chat_control.py:75 +msgid "Portuguese" +msgstr "ポルトガル語" + +#: ../src/chat_control.py:75 +msgid "Brazilian Portuguese" +msgstr "ポルトガル語 (ブラジル)" + +#: ../src/chat_control.py:75 +msgid "Russian" +msgstr "ロシア語" + +#: ../src/chat_control.py:75 +msgid "Serbian" +msgstr "セルビア語" + +#: ../src/chat_control.py:75 +msgid "Slovak" +msgstr "スロバキア語" + +#: ../src/chat_control.py:75 +msgid "Swedish" +msgstr "スウェーデン語" + +#: ../src/chat_control.py:75 +msgid "Chinese (Ch)" +msgstr "中国語 (Ch)" + +#: ../src/chat_control.py:447 +msgid "Spelling language" +msgstr "スペルチェックの言語" + +#. we are not connected +#: ../src/chat_control.py:479 ../src/chat_control.py:690 +msgid "A connection is not available" +msgstr "接続は有効ではありません" + +#: ../src/chat_control.py:480 ../src/chat_control.py:691 +msgid "Your message can not be sent until you are connected." +msgstr "接続するまでメッセージは送信されません。" + +#: ../src/chat_control.py:882 +msgid "Bold" +msgstr "太字にする" + +#: ../src/chat_control.py:883 +msgid "Italic" +msgstr "イタリック" + +#: ../src/chat_control.py:884 +msgid "Underline" +msgstr "下線" + +#: ../src/chat_control.py:885 +msgid "Strike" +msgstr "抹消線" + +#: ../src/chat_control.py:908 +msgid "Font" +msgstr "フォント" + +#: ../src/chat_control.py:917 +msgid "Clear formating" +msgstr "書式のクリア" + +#: ../src/chat_control.py:995 +msgid "Really send file?" +msgstr "ファイルを送信しますか ?" + +#: ../src/chat_control.py:996 +#, python-format +msgid "If you send a file to %s, he/she will know your real Jabber ID." +msgstr "" +"ファイルを %s に送信すると、その相手はあなたの本当の Jabber ID を知ることにな" +"ります。" + +#: ../src/chat_control.py:1449 ../src/chat_control.py:1943 +#, fuzzy +msgid "GPG encryption enabled" +msgstr "GPG 暗号化は有効" + +#. Add to roster +#: ../src/chat_control.py:1474 ../src/common/contacts.py:158 +#: ../src/common/contacts.py:277 ../src/common/helpers.py:57 +#: ../src/common/helpers.py:245 ../src/dialogs.py:1064 ../src/dialogs.py:2069 +#: ../src/dialogs.py:2098 ../src/gui_interface.py:673 +#: ../src/gui_menu_builder.py:251 ../src/gui_menu_builder.py:394 +#: ../src/roster_window.py:1609 ../src/roster_window.py:1611 +#: ../src/roster_window.py:1939 ../src/roster_window.py:3286 +#: ../src/roster_window.py:3313 +msgid "Not in Roster" +msgstr "名簿にありません" + +#: ../src/chat_control.py:1518 +msgid "This contact does not support file transfer." +msgstr "この相手先はファイル転送をサポートしていません。" + +#: ../src/chat_control.py:1521 +msgid "You need to know the real JID of the contact to send him or her a file." +msgstr "ファイル転送を行なうには、本当の JID を知っている必要があります。" +

1 0

gajim: [Mako N] add japanese translation
by Yann Leboulanger 10 Mar '10

10 Mar '10

changeset 659ff4104537 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=659ff4104537 description: [Mako N] add japanese translation diffstat: po/LINGUAS | 1 + po/ja.po | 9867 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 9868 insertions(+), 0 deletions(-) diffs (truncated from 9879 to 300 lines): diff -r 7ba172f896ba -r 659ff4104537 po/LINGUAS --- a/po/LINGUAS Mon Mar 08 18:30:52 2010 +0200 +++ b/po/LINGUAS Wed Mar 10 22:05:11 2010 +0100 @@ -29,3 +29,4 @@ lt da uk +ja diff -r 7ba172f896ba -r 659ff4104537 po/ja.po --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/po/ja.po Wed Mar 10 22:05:11 2010 +0100 @@ -0,0 +1,9867 @@ +# Japanese translations for Gajim - A Jabber Instant Messager package. +# Copyright (C) 2009 THE Gajim - A Jabber Instant Messager'S COPYRIGHT HOLDER +# This file is distributed under the same license as the Gajim - A Jabber Instant Messager package. +# +msgid "" +msgstr "" +"Project-Id-Version: Gajim 0.13.3\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2010-03-10 22:02+0100\n" +"PO-Revision-Date: 2010-03-10 17:59+0900\n" +"Last-Translator: Mako N. <mako(a)pasero.net>\n" +"Language-Team: Japanese\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: ../data/gajim.desktop.in.in.h:1 +msgid "A GTK+ Jabber client" +msgstr "GTK+ Jabber クライアント" + +#: ../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 IM クライアント" + +#: ../data/glade/account_context_menu.glade.h:1 +#: ../data/glade/roster_window.glade.h:7 +msgid "Join _Group Chat..." +msgstr "グループチャットに参加する (_G)..." + +#: ../data/glade/account_context_menu.glade.h:2 +msgid "_Add Contact..." +msgstr "相手先リストに追加する (_A)..." + +#: ../data/glade/account_context_menu.glade.h:3 +#: ../data/glade/roster_window.glade.h:17 +msgid "_Discover Services" +msgstr "サービスを探索する (_D)" + +#: ../data/glade/account_context_menu.glade.h:4 +msgid "_Execute Command..." +msgstr "コマンドを実行する (_E)..." + +#: ../data/glade/account_context_menu.glade.h:5 +msgid "_Modify Account" +msgstr "アカウントを修正する (_M)" + +#: ../data/glade/account_context_menu.glade.h:6 +msgid "_Open Gmail Inbox" +msgstr "Gmail の受信箱を開く (_O)" + +#: ../data/glade/account_context_menu.glade.h:7 +msgid "_Personal Events" +msgstr "個人イベント (_P)" + +#: ../data/glade/account_context_menu.glade.h:8 +#: ../data/glade/roster_window.glade.h:25 +msgid "_Start Chat..." +msgstr "チャットを開始する (_S)..." + +#: ../data/glade/account_context_menu.glade.h:9 +#: ../data/glade/zeroconf_context_menu.glade.h:2 +msgid "_Status" +msgstr "在席状況 (_S)" + +#: ../data/glade/account_creation_wizard_window.glade.h:1 +msgid "" +"Connecting to server\n" +"\n" +"Please wait..." +msgstr "" +"サーバに接続しています\n" +"\n" +"しばらくお待ちください..." + +#: ../data/glade/account_creation_wizard_window.glade.h:4 +msgid "Please choose one of the options below:" +msgstr "下の選択肢から一つ選んでください:" + +#: ../data/glade/account_creation_wizard_window.glade.h:5 +msgid "Please fill in the data for your existing account" +msgstr "既にお持ちのアカウントの情報を入力してください" + +#: ../data/glade/account_creation_wizard_window.glade.h:6 +msgid "Please select a server" +msgstr "サーバーを選択してください" + +#: ../data/glade/account_creation_wizard_window.glade.h:7 +msgid "@" +msgstr "@" + +#: ../data/glade/account_creation_wizard_window.glade.h:8 +msgid "" +"Add this certificate to the list of trusted certificates.\n" +"SHA1 fingerprint of the certificate:\n" +msgstr "" +"この証明書を、信頼できる証明書一覧に加えます。\n" +"この証明書の SHA1 指紋:\n" + +#: ../data/glade/account_creation_wizard_window.glade.h:11 +msgid "Anon_ymous authentication" +msgstr "匿名の認証 (_y)" + +#: ../data/glade/account_creation_wizard_window.glade.h:12 +msgid "Connect when I press Finish" +msgstr "「完了」を押したらすぐに接続する" + +#: ../data/glade/account_creation_wizard_window.glade.h:13 +msgid "Gajim: Account Creation Wizard" +msgstr "Gajim: アカウント作成ウィザード" + +#: ../data/glade/account_creation_wizard_window.glade.h:14 +msgid "I already have an account I want to _use" +msgstr "既にアカウントを持っているのでそれを使う (_u)" + +#: ../data/glade/account_creation_wizard_window.glade.h:15 +msgid "I want to _register for a new account" +msgstr "新しいアカウントを作成する (_r)" + +#: ../data/glade/account_creation_wizard_window.glade.h:16 +#: ../data/glade/account_modification_window.glade.h:20 +#: ../data/glade/accounts_window.glade.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 +msgid "Manage..." +msgstr "管理..." + +#: ../data/glade/account_creation_wizard_window.glade.h:18 +msgid "Prox_y:" +msgstr "プロキシ (_y)" + +#: ../data/glade/account_creation_wizard_window.glade.h:19 +#: ../data/glade/account_modification_window.glade.h:40 +#: ../data/glade/accounts_window.glade.h:46 +msgid "Save pass_word" +msgstr "パスワードを保存する" + +#: ../data/glade/account_creation_wizard_window.glade.h:20 +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 +msgid "Use custom hostname/port" +msgstr "別のホスト名/ポート番号を使う" + +#: ../data/glade/account_creation_wizard_window.glade.h:22 +msgid "" +"You need to have an account in order to connect\n" +"to the Jabber network." +msgstr "Jabber ネットワークに接続するには、アカウントが必要です。" + +#: ../data/glade/account_creation_wizard_window.glade.h:24 +#: ../data/glade/roster_window.glade.h:15 +msgid "_Advanced" +msgstr "拡張 (_A)" + +#: ../data/glade/account_creation_wizard_window.glade.h:25 +msgid "_Finish" +msgstr "完了 (_F)" + +#: ../data/glade/account_creation_wizard_window.glade.h:26 +msgid "_Hostname:" +msgstr "ホスト名 (_H):" + +#: ../data/glade/account_creation_wizard_window.glade.h:27 +#: ../data/glade/account_modification_window.glade.h:48 +#: ../data/glade/accounts_window.glade.h:58 +msgid "_Jabber ID:" +msgstr "Jabber ID (_J):" + +#: ../data/glade/account_creation_wizard_window.glade.h:28 +#: ../data/glade/account_modification_window.glade.h:50 +#: ../data/glade/accounts_window.glade.h:60 +msgid "_Password:" +msgstr "パスワード (_P):" + +#: ../data/glade/account_creation_wizard_window.glade.h:29 +msgid "_Port:" +msgstr "ポート番号 (_P):" + +#: ../data/glade/account_creation_wizard_window.glade.h:30 +msgid "_Server:" +msgstr "サーバー (_S):" + +#: ../data/glade/account_modification_window.glade.h:1 +#: ../data/glade/accounts_window.glade.h:1 +#: ../data/glade/preferences_window.glade.h:11 +msgid "Miscellaneous" +msgstr "その他の設定" + +#: ../data/glade/account_modification_window.glade.h:2 +#: ../data/glade/accounts_window.glade.h:2 +msgid "OpenPGP" +msgstr "OpenPGP" + +#: ../data/glade/account_modification_window.glade.h:3 +#: ../data/glade/accounts_window.glade.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 +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 +msgid "Administration operations" +msgstr "管理の操作" + +#: ../data/glade/account_modification_window.glade.h:7 +#: ../data/glade/accounts_window.glade.h:10 +msgid "Auto-reconnect when connection is lost" +msgstr "切断したら自動で再接続する" + +#: ../data/glade/account_modification_window.glade.h:8 +#: ../data/glade/accounts_window.glade.h:11 +msgid "C_onnect on Gajim startup" +msgstr "Gajim 起動時に接続する (_o)" + +#: ../data/glade/account_modification_window.glade.h:9 +#: ../data/glade/accounts_window.glade.h:12 +msgid "Chan_ge Password" +msgstr "パスワードを変更する (_g)" + +# (Mako)broadcast 困った。しかたなくカタカナで +#: ../data/glade/account_modification_window.glade.h:10 +msgid "" +"Check this so Gajim will connect in port 5223 where legacy servers are " +"expected to have SSL capabilities. Note that Gajim uses TLS encryption by " +"default if broadcasted by the server, and with this option enabled TLS will " +"be disabled" +msgstr "" +"これをチェックすると、Gajim はポート 5223 で接続します。このポートは古いタイ" +"プのサーバーで SSL として期待されるものです。サーバーによってブロードキャス" +"トされる場合、Gajim のデフォルトでは TLS が用いられることに注意してください。" +"またこのオプションを有効にすると TLS は無効とされることに注意してください。" + +#: ../data/glade/account_modification_window.glade.h:11 +#: ../data/glade/accounts_window.glade.h:14 +msgid "Choose _Key..." +msgstr "鍵の選択 (_K)..." + +#: ../data/glade/account_modification_window.glade.h:12 +#: ../data/glade/accounts_window.glade.h:15 +msgid "Click to change account's password" +msgstr "アカウントのパスワードを変更するにはクリック" + +#: ../data/glade/account_modification_window.glade.h:13 +#: ../data/glade/accounts_window.glade.h:16 +msgid "Click to request authorization to all contacts of another account" +msgstr "別アカウントのすべての相手先に承認を求めるにはクリック" + +#: ../data/glade/account_modification_window.glade.h:14 +#: ../data/glade/accounts_window.glade.h:18 +msgid "Connection" +msgstr "接続" + +#: ../data/glade/account_modification_window.glade.h:15 +msgid "Edit Personal Information..." +msgstr "個人情報を編集する..." + +#. No configured account +#: ../data/glade/account_modification_window.glade.h:16 +#: ../data/glade/accounts_window.glade.h:21 +#: ../data/glade/roster_window.glade.h:5 ../src/common/helpers.py:1217 +#: ../src/common/helpers.py:1229 ../src/notify.py:547 ../src/notify.py:568 +#: ../src/notify.py:607 ../src/notify.py:619 +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/glade/account_modification_window.glade.h:17

1 0

gajim: ability to send jabber:iq:last query over zeroconf. Fixes...
by Yann Leboulanger 10 Mar '10

10 Mar '10

changeset be4f8698ac8d in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=be4f8698ac8d description: ability to send jabber:iq:last query over zeroconf. Fixes #5644 diffstat: src/common/connection.py | 39 +++++++++------------ src/common/connection_handlers.py | 59 +++++++++++++++++++-------------- src/common/zeroconf/client_zeroconf.py | 12 +++++- 3 files changed, 60 insertions(+), 50 deletions(-) diffs (202 lines): diff -r e0912fe3fd94 -r be4f8698ac8d src/common/connection.py --- a/src/common/connection.py Wed Mar 10 13:52:54 2010 +0100 +++ b/src/common/connection.py Wed Mar 10 21:58:14 2010 +0100 @@ -509,11 +509,25 @@ def account_changed(self, new_name): self.name = new_name - def request_last_status_time(self, jid, resource): + def request_last_status_time(self, jid, resource, groupchat_jid=None): """ - To be implemented by derivated classes + 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 """ - raise NotImplementedError + print 'request_last_status_time', self.connection + if not self.connection: + return + to_whom_jid = jid + if resource: + to_whom_jid += '/' + resource + iq = common.xmpp.Iq(to=to_whom_jid, typ='get', queryNS=\ + common.xmpp.NS_LAST) + id_ = self.connection.getAnID() + iq.setID(id_) + if groupchat_jid: + self.groupchat_jids[id_] = groupchat_jid + self.last_ids.append(id_) + self.connection.send(iq) def request_os_info(self, jid, resource): """ @@ -1756,25 +1770,6 @@ self.connection = con common.xmpp.features_nb.getRegInfo(con, self._hostname) - def request_last_status_time(self, jid, resource, groupchat_jid=None): - """ - 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: - return - to_whom_jid = jid - if resource: - to_whom_jid += '/' + resource - iq = common.xmpp.Iq(to = to_whom_jid, typ = 'get', queryNS =\ - common.xmpp.NS_LAST) - id_ = self.connection.getAnID() - iq.setID(id_) - if groupchat_jid: - self.groupchat_jids[id_] = groupchat_jid - self.last_ids.append(id_) - self.connection.send(iq) - def request_os_info(self, jid, resource, groupchat_jid=None): """ groupchat_jid is used when we want to send a request to a real jid and diff -r e0912fe3fd94 -r be4f8698ac8d src/common/connection_handlers.py --- a/src/common/connection_handlers.py Wed Mar 10 13:52:54 2010 +0100 +++ b/src/common/connection_handlers.py Wed Mar 10 21:58:14 2010 +0100 @@ -782,10 +782,42 @@ # keep the jids we auto added (transports contacts) to not send the # SUBSCRIBED event to gui self.automatically_added = [] + # IDs of jabber:iq:last requests + self.last_ids = [] # keep track of sessions this connection has with other JIDs self.sessions = {} + def _ErrorCB(self, con, iq_obj): + log.debug('ErrorCB') + jid_from = helpers.get_full_jid_from_iq(iq_obj) + jid_stripped, resource = gajim.get_room_and_nick_from_fjid(jid_from) + id_ = unicode(iq_obj.getID()) + if id_ in self.last_ids: + self.dispatch('LAST_STATUS_TIME', (jid_stripped, resource, -1, '')) + self.last_ids.remove(id_) + return + + def _LastResultCB(self, con, iq_obj): + log.debug('LastResultCB') + qp = iq_obj.getTag('query') + seconds = qp.getAttr('seconds') + status = qp.getData() + try: + seconds = int(seconds) + except Exception: + return + id_ = iq_obj.getID() + if id_ in self.groupchat_jids: + who = self.groupchat_jids[id_] + del self.groupchat_jids[id_] + else: + who = helpers.get_full_jid_from_iq(iq_obj) + if id_ in self.last_ids: + self.last_ids.remove(id_) + jid_stripped, resource = gajim.get_room_and_nick_from_fjid(who) + self.dispatch('LAST_STATUS_TIME', (jid_stripped, resource, seconds, status)) + def get_sessions(self, jid): """ Get all sessions for the given full jid @@ -936,8 +968,6 @@ # keep the latest subscribed event for each jid to prevent loop when we # acknowledge presences self.subscribed_events = {} - # IDs of jabber:iq:last requests - self.last_ids = [] # IDs of jabber:iq:version requests self.version_ids = [] # IDs of urn:xmpp:time requests @@ -981,6 +1011,7 @@ def _ErrorCB(self, con, iq_obj): log.debug('ErrorCB') + ConnectionHandlersBase._ErrorCB(self, con, iq_obj) jid_from = helpers.get_full_jid_from_iq(iq_obj) jid_stripped, resource = gajim.get_room_and_nick_from_fjid(jid_from) id_ = unicode(iq_obj.getID()) @@ -988,10 +1019,6 @@ self.dispatch('OS_INFO', (jid_stripped, resource, '', '')) self.version_ids.remove(id_) return - if id_ in self.last_ids: - self.dispatch('LAST_STATUS_TIME', (jid_stripped, resource, -1, '')) - self.last_ids.remove(id_) - return if id_ in self.entity_time_ids: self.dispatch('ENTITY_TIME', (jid_stripped, resource, '')) self.entity_time_ids.remove(id_) @@ -1132,26 +1159,6 @@ self.connection.send(iq_obj) raise common.xmpp.NodeProcessed - def _LastResultCB(self, con, iq_obj): - log.debug('LastResultCB') - qp = iq_obj.getTag('query') - seconds = qp.getAttr('seconds') - status = qp.getData() - try: - seconds = int(seconds) - except Exception: - return - id_ = iq_obj.getID() - if id_ in self.groupchat_jids: - who = self.groupchat_jids[id_] - del self.groupchat_jids[id_] - else: - who = helpers.get_full_jid_from_iq(iq_obj) - if id_ in self.last_ids: - self.last_ids.remove(id_) - jid_stripped, resource = gajim.get_room_and_nick_from_fjid(who) - self.dispatch('LAST_STATUS_TIME', (jid_stripped, resource, seconds, status)) - def _VersionResultCB(self, con, iq_obj): log.debug('VersionResultCB') client_info = '' diff -r e0912fe3fd94 -r be4f8698ac8d src/common/zeroconf/client_zeroconf.py --- a/src/common/zeroconf/client_zeroconf.py Wed Mar 10 13:52:54 2010 +0100 +++ b/src/common/zeroconf/client_zeroconf.py Wed Mar 10 21:58:14 2010 +0100 @@ -30,6 +30,8 @@ import socket import errno import sys +import string +from random import Random import logging log = logging.getLogger('gajim.c.z.client_zeroconf') @@ -412,7 +414,6 @@ If supplied data is unicode string, encode it to UTF-8. """ - print 'ici' if self.state <= 0: return @@ -726,7 +727,8 @@ def send(self, stanza, is_message=False, now=False, on_ok=None, on_not_ok=None): stanza.setFrom(self.roster.zeroconf.name) - to = stanza.getTo() + to = unicode(stanza.getTo()) + to = gajim.get_jid_without_resource(to) try: item = self.roster[to] @@ -759,6 +761,12 @@ P2PClient(None, item['address'], item['port'], self, [(stanza, is_message)], to, on_ok=on_ok, on_not_ok=on_not_ok) + def getAnID(self): + """ + Generate a random id + """ + ''.join(Random().sample(string.letters + string.digits, 6)) + def RegisterDisconnectHandler(self, handler): """ Register handler that will be called on disconnect

1 0

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

10 Mar '10

changeset e0912fe3fd94 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=e0912fe3fd94 description: merge with default diffstat: AUTHORS | 10 +- data/gui/join_groupchat_window.ui | 80 +- data/gui/message_window.ui | 2 +- data/gui/service_discovery_window.ui | 3 +- po/sk.po | 8216 ++++++++---------- src/command_system/__init__.py | 6 +- src/command_system/dispatching.py | 7 +- src/command_system/errors.py | 5 +- src/command_system/framework.py | 184 +- src/command_system/implementation/__init__.py | 5 +- src/command_system/implementation/custom.py | 34 +- src/command_system/implementation/hosts.py | 16 +- src/command_system/implementation/middleware.py | 20 +- src/command_system/implementation/standard.py | 15 +- src/command_system/mapping.py | 204 +- src/common/check_paths.py | 7 +- src/common/connection.py | 4 +- src/common/connection_handlers.py | 27 +- src/common/contacts.py | 7 +- src/common/dbus_support.py | 7 + src/common/helpers.py | 1 + src/common/optparser.py | 4 +- src/common/protocol/bytestream.py | 369 +- src/common/xmpp/auth_nb.py | 96 +- src/common/xmpp/client_nb.py | 3 + src/common/xmpp/dispatcher_nb.py | 4 - src/common/xmpp/tls_nb.py | 2 + src/common/zeroconf/connection_handlers_zeroconf.py | 9 +- src/conversation_textview.py | 5 +- src/dialogs.py | 52 +- src/disco.py | 7 +- src/gtkgui_helpers.py | 3 +- src/gui_interface.py | 15 + src/roster_window.py | 2 +- 34 files changed, 4553 insertions(+), 4878 deletions(-) diffs (truncated from 14250 to 300 lines): diff -r 0796002940d1 -r e0912fe3fd94 AUTHORS --- a/AUTHORS Wed Mar 10 13:51:55 2010 +0100 +++ b/AUTHORS Wed Mar 10 13:52:54 2010 +0100 @@ -1,13 +1,8 @@ CURRENT DEVELOPERS: Alexander Cherniuk (ts33kr AT gmail.com) -Nikos Kouremenos (kourem AT gmail.com) Yann Leboulanger (asterix AT lagaule.org) -Julien Pivotto (roidelapluie AT gmail.com) Jonathan Schleifer (js-gajim AT webkeks.org) -Travis Shirk (travis AT pobox.com) -Brendan Taylor (whateley AT gmail.com) -Jean-Marie Traissard (jim AT lapin.org) PAST DEVELOPERS: @@ -15,3 +10,8 @@ Stephan Erb (steve-e AT h3c.de) Vincent Hanquez (tab AT snarc.org) Dimitur Kirov (dkirov AT gmail.com) +Nikos Kouremenos (kourem AT gmail.com) +Julien Pivotto (roidelapluie AT gmail.com) +Travis Shirk (travis AT pobox.com) +Brendan Taylor (whateley AT gmail.com) +Jean-Marie Traissard (jim AT lapin.org) diff -r 0796002940d1 -r e0912fe3fd94 data/gui/join_groupchat_window.ui --- a/data/gui/join_groupchat_window.ui Wed Mar 10 13:51:55 2010 +0100 +++ b/data/gui/join_groupchat_window.ui Wed Mar 10 13:52:54 2010 +0100 @@ -15,7 +15,7 @@ <child> <object class="GtkTable" id="table15"> <property name="visible">True</property> - <property name="n_rows">7</property> + <property name="n_rows">8</property> <property name="n_columns">2</property> <property name="column_spacing">12</property> <property name="row_spacing">6</property> @@ -110,8 +110,8 @@ <property name="label" translatable="yes">Password:</property> </object> <packing> - <property name="top_attach">4</property> - <property name="bottom_attach">5</property> + <property name="top_attach">5</property> + <property name="bottom_attach">6</property> <property name="x_options">GTK_FILL</property> <property name="y_options"></property> </packing> @@ -126,14 +126,14 @@ <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> - <property name="top_attach">4</property> - <property name="bottom_attach">5</property> + <property name="top_attach">5</property> + <property name="bottom_attach">6</property> <property name="y_options"></property> </packing> </child> <child> <object class="GtkCheckButton" id="auto_join_checkbutton"> - <property name="label" translatable="yes">Join this room automatically when I connect</property> + <property name="label" translatable="yes">Join this room _automatically when I connect</property> <property name="visible">True</property> <property name="sensitive">False</property> <property name="can_focus">True</property> @@ -143,8 +143,8 @@ </object> <packing> <property name="right_attach">2</property> - <property name="top_attach">6</property> - <property name="bottom_attach">7</property> + <property name="top_attach">7</property> + <property name="bottom_attach">8</property> <property name="x_options">GTK_FILL</property> <property name="y_options"></property> </packing> @@ -174,21 +174,69 @@ </child> <child> <object class="GtkCheckButton" id="bookmark_checkbutton"> - <property name="label" translatable="yes">Bookmark this room</property> + <property name="label" translatable="yes">_Bookmark this room</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> + <property name="use_underline">True</property> <property name="draw_indicator">True</property> <signal name="toggled" handler="on_bookmark_checkbutton_toggled"/> </object> <packing> <property name="right_attach">2</property> - <property name="top_attach">5</property> - <property name="bottom_attach">6</property> + <property name="top_attach">6</property> + <property name="bottom_attach">7</property> <property name="x_options">GTK_FILL</property> <property name="y_options"></property> </packing> </child> + <child> + <object class="GtkLabel" id="label1"> + <property name="visible">True</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">Server:</property> + </object> + <packing> + <property name="top_attach">4</property> + <property name="bottom_attach">5</property> + </packing> + </child> + <child> + <object class="GtkHBox" id="hbox1"> + <property name="visible">True</property> + <property name="spacing">6</property> + <child> + <object class="GtkComboBoxEntry" id="server_comboboxentry"> + <property name="visible">True</property> + <property name="model">liststore1</property> + <property name="text_column">0</property> + </object> + <packing> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkButton" id="browse_rooms_button"> + <property name="label" translatable="yes">Bro_wse Rooms</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="image">image1</property> + <property name="use_underline">True</property> + <signal name="clicked" handler="on_browse_rooms_button_clicked"/> + </object> + <packing> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <property name="top_attach">4</property> + <property name="bottom_attach">5</property> + </packing> + </child> </object> <packing> <property name="position">0</property> @@ -275,4 +323,14 @@ </object> </child> </object> + <object class="GtkListStore" id="liststore1"> + <columns> +  + <column type="gchararray"/> + </columns> + </object> + <object class="GtkImage" id="image1"> + <property name="visible">True</property> + <property name="stock">gtk-find</property> + </object> </interface> diff -r 0796002940d1 -r e0912fe3fd94 data/gui/message_window.ui --- a/data/gui/message_window.ui Wed Mar 10 13:51:55 2010 +0100 +++ b/data/gui/message_window.ui Wed Mar 10 13:52:54 2010 +0100 @@ -14,6 +14,7 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="scrollable">True</property> + <property name="tab_border">0</property> </object> </child> </object> @@ -59,7 +60,6 @@ <child> <object class="GtkImage" id="image1329"> <property name="visible">True</property> - <property name="ypad">6</property> <property name="stock">gtk-close</property> <property name="icon-size">1</property> </object> diff -r 0796002940d1 -r e0912fe3fd94 data/gui/service_discovery_window.ui --- a/data/gui/service_discovery_window.ui Wed Mar 10 13:51:55 2010 +0100 +++ b/data/gui/service_discovery_window.ui Wed Mar 10 13:52:54 2010 +0100 @@ -4,7 +4,7 @@  <object class="GtkListStore" id="liststore1"> <columns> -  +  <column type="gchararray"/> </columns> </object> @@ -71,7 +71,6 @@ <property name="visible">True</property> <property name="model">liststore1</property> <signal name="changed" handler="on_address_comboboxentry_changed"/> - <signal name="key_press_event" handler="on_address_comboboxentry_key_press_event"/> <child> <object class="GtkCellRendererText" id="cellrenderertext1"/> <attributes> diff -r 0796002940d1 -r e0912fe3fd94 po/sk.po --- a/po/sk.po Wed Mar 10 13:51:55 2010 +0100 +++ b/po/sk.po Wed Mar 10 13:52:54 2010 +0100 @@ -1,21 +1,21 @@ -# Slovak translation for gajim -# Copyright (c) (c) 2005-2009 Canonical Ltd, and Rosetta Contributors 2005-2009 -# This file is distributed under the same license as the gajim package. -# Juraj Michalek <juraj.michalek(a)asinus.org>, 2005. -# Pavol Klačanský <pavolzetor(a)gmail.com>, 2008, 2009. -# +# Slovak translation for gajim +# Copyright (c) 2005, 2008, 2009 Canonical Ltd, and Rosetta Contributors +# This file is distributed under the same license as the gajim package. +# Juraj Michalek <juraj.michalek(a)asinus.org>, 2005. +# Pavol Klačanský <pavol(a)klacansky.com>, 2008, 2009, 2010. +# msgid "" msgstr "" "Project-Id-Version: gajim\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-11-25 22:20+0100\n" -"PO-Revision-Date: 2009-08-20 00:04+0200\n" +"POT-Creation-Date: 2010-03-07 19:14+0100\n" +"PO-Revision-Date: 2010-02-28 20:43+0100\n" "Last-Translator: Pavol Klačanský <pavol(a)klacansky.com>\n" "Language-Team: Slovak <sk-i18n(a)lists.linux.sk>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural= (n==1) ? 1 : (n>=2 && n<=4) ? 2 : 0;\n" +"Plural-Forms: nplurals=3; plural=(n==1) ? 1 : (n>=2 && n<=4) ? 2 : 0;\n" #: ../data/gajim.desktop.in.in.h:1 msgid "A GTK+ Jabber client" @@ -23,2870 +23,31 @@ #: ../data/gajim.desktop.in.in.h:2 msgid "Gajim Instant Messenger" -msgstr "Internetový komunikátor Gajim" +msgstr "Gajim - internetový komunikátor" #: ../data/gajim.desktop.in.in.h:3 msgid "Jabber IM Client" msgstr "Jabber IM klient" -#: ../data/glade/account_context_menu.glade.h:1 -#: ../data/glade/roster_window.glade.h:7 -msgid "Join _Group Chat..." -msgstr "_Pripojiť sa k diskusnej skupine..." - -#: ../data/glade/account_context_menu.glade.h:2 -msgid "_Add Contact..." -msgstr "_Pridať kontakt..." - -#: ../data/glade/account_context_menu.glade.h:3 -#: ../data/glade/roster_window.glade.h:17 -msgid "_Discover Services" -msgstr "_Preskúmať služby" - -#: ../data/glade/account_context_menu.glade.h:4 -msgid "_Execute Command..." -msgstr "_Vykonať príkaz..." - -#: ../data/glade/account_context_menu.glade.h:5 -msgid "_Modify Account" -msgstr "_Upraviť účet" - -#: ../data/glade/account_context_menu.glade.h:6 -msgid "_Open Gmail Inbox" -msgstr "_Otvoriť Gmail Inbox" - -#: ../data/glade/account_context_menu.glade.h:7 -msgid "_Personal Events" -msgstr "_Osobné udalosti" - -#: ../data/glade/account_context_menu.glade.h:8 -#: ../data/glade/roster_window.glade.h:25 -msgid "_Start Chat..." -msgstr "_Začať rozhovor..." - -#: ../data/glade/account_context_menu.glade.h:9 -#: ../data/glade/zeroconf_context_menu.glade.h:2 -msgid "_Status" -msgstr "_Stav" - -#: ../data/glade/account_creation_wizard_window.glade.h:1 -msgid "" -"Connecting to server\n" -"\n" -"Please wait..." -msgstr "" -"Pripája sa k serveru\n" -"\n" -"Prosím počkajte..." -

1 0

gajim: don't traceback when remove a disabled account. Fixes #5647
by Yann Leboulanger 10 Mar '10

10 Mar '10

changeset 0796002940d1 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=0796002940d1 description: don't traceback when remove a disabled account. Fixes #5647 diffstat: src/config.py | 69 +++++++++++++++++++++++++++++++++++----------------------- 1 files changed, 41 insertions(+), 28 deletions(-) diffs (120 lines): diff -r 2a10649a906f -r 0796002940d1 src/config.py --- a/src/config.py Wed Mar 10 13:28:51 2010 +0100 +++ b/src/config.py Wed Mar 10 13:51:55 2010 +0100 @@ -1893,9 +1893,9 @@ return win_opened = False - if gajim.interface.msg_win_mgr.get_controls(acct = account): + if gajim.interface.msg_win_mgr.get_controls(acct=account): win_opened = True - else: + elif account in gajim.interface.instances: for key in gajim.interface.instances[account]: if gajim.interface.instances[account][key] and key != \ 'remove_account': @@ -1903,10 +1903,13 @@ break # Detect if we have opened windows for this account def remove(account): - if 'remove_account' in gajim.interface.instances[account]: + if account in gajim.interface.instances and \ + 'remove_account' in gajim.interface.instances[account]: gajim.interface.instances[account]['remove_account'].window.\ - present() + present() else: + if not account in gajim.interface.instances: + gajim.interface.instances[account] = {} gajim.interface.instances[account]['remove_account'] = \ RemoveAccountWindow(account) if win_opened: @@ -2871,12 +2874,19 @@ def on_remove_button_clicked(self, widget): def remove(): - if gajim.connections[self.account].connected and \ + if self.account in gajim.connections and \ + gajim.connections[self.account].connected and \ not self.remove_and_unregister_radiobutton.get_active(): # change status to offline only if we will not remove this JID from # server gajim.connections[self.account].change_status('offline', 'offline') if self.remove_and_unregister_radiobutton.get_active(): + if not self.account in gajim.connections: + dialogs.ErrorDialog( + _('Account is disabled'), + _('To unregister from a server, account must be ' + 'enabled.')) + return if not gajim.connections[self.account].password: def on_ok(passphrase, checked): if passphrase == -1: @@ -2896,11 +2906,12 @@ else: self._on_remove_success(True) - if gajim.connections[self.account].connected: + if self.account in gajim.connections and \ + gajim.connections[self.account].connected: dialogs.ConfirmationDialog( - _('Account "%s" is connected to the server') % self.account, - _('If you remove it, the connection will be lost.'), - on_response_ok=remove) + _('Account "%s" is connected to the server') % self.account, + _('If you remove it, the connection will be lost.'), + on_response_ok=remove) else: remove() @@ -2920,29 +2931,31 @@ on_response_ok=self.on_remove_responce_ok, is_modal=False) return # Close all opened windows - gajim.interface.roster.close_all(self.account, force = True) - gajim.connections[self.account].disconnect(on_purpose = True) - del gajim.connections[self.account] + gajim.interface.roster.close_all(self.account, force=True) + if self.account in gajim.connections: + gajim.connections[self.account].disconnect(on_purpose=True) + del gajim.connections[self.account] gajim.logger.remove_roster(gajim.get_jid_from_account(self.account)) gajim.config.del_per('accounts', self.account) gajim.interface.save_config() del gajim.interface.instances[self.account] - del gajim.interface.minimized_controls[self.account] - del gajim.nicks[self.account] - del gajim.block_signed_in_notifications[self.account] - del gajim.groups[self.account] - gajim.contacts.remove_account(self.account) - del gajim.gc_connected[self.account] - del gajim.automatic_rooms[self.account] - del gajim.to_be_removed[self.account] - del gajim.newly_added[self.account] - del gajim.sleeper_state[self.account] - del gajim.encrypted_chats[self.account] - del gajim.last_message_time[self.account] - del gajim.status_before_autoaway[self.account] - del gajim.transport_avatar[self.account] - del gajim.gajim_optional_features[self.account] - del gajim.caps_hash[self.account] + if self.account in gajim.nicks: + del gajim.interface.minimized_controls[self.account] + del gajim.nicks[self.account] + del gajim.block_signed_in_notifications[self.account] + del gajim.groups[self.account] + gajim.contacts.remove_account(self.account) + del gajim.gc_connected[self.account] + del gajim.automatic_rooms[self.account] + del gajim.to_be_removed[self.account] + del gajim.newly_added[self.account] + del gajim.sleeper_state[self.account] + del gajim.encrypted_chats[self.account] + del gajim.last_message_time[self.account] + del gajim.status_before_autoaway[self.account] + del gajim.transport_avatar[self.account] + del gajim.gajim_optional_features[self.account] + del gajim.caps_hash[self.account] if len(gajim.connections) >= 2: # Do not merge accounts if only one exists gajim.interface.roster.regroup = gajim.config.get('mergeaccounts') else:

1 0

gajim: never move roster window outside of screen. Fixes #5646
by Yann Leboulanger 10 Mar '10

10 Mar '10

changeset 2a10649a906f in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=2a10649a906f description: never move roster window outside of screen. Fixes #5646 diffstat: src/statusicon.py | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diffs (13 lines): diff -r 61dc88ed5550 -r 2a10649a906f src/statusicon.py --- a/src/statusicon.py Fri Feb 19 13:54:42 2010 +0100 +++ b/src/statusicon.py Wed Mar 10 13:28:51 2010 +0100 @@ -384,7 +384,8 @@ else: if not win.get_property('visible'): win.show_all() - win.move(gajim.config.get('roster_x-position'), + gtkgui_helpers.move_window(win, + gajim.config.get('roster_x-position'), gajim.config.get('roster_y-position')) if not gajim.config.get('roster_window_skip_taskbar'): win.set_property('skip-taskbar-hint', False)

1 0

gajim: don't traceback when we try to draw an account that is no...
by Yann Leboulanger 09 Mar '10

09 Mar '10

changeset 54d34054e0e0 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=54d34054e0e0 description: don't traceback when we try to draw an account that is not contacts._accounts. Fixes #5640 diffstat: src/gtkgui_helpers.py | 3 ++- src/roster_window.py | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diffs (25 lines): diff -r 2c40833f944c -r 54d34054e0e0 src/gtkgui_helpers.py --- a/src/gtkgui_helpers.py Tue Mar 09 21:48:57 2010 +0100 +++ b/src/gtkgui_helpers.py Tue Mar 09 22:37:57 2010 +0100 @@ -627,7 +627,8 @@ # don't show avatar for the transport itself return None - if any(jid in gajim.contacts.get_gc_list(acc) for acc in gajim.connections): + if any(jid in gajim.contacts.get_gc_list(acc) for acc in \ + gajim.contacts.get_accounts()): is_groupchat_contact = True else: is_groupchat_contact = False diff -r 2c40833f944c -r 54d34054e0e0 src/roster_window.py --- a/src/roster_window.py Tue Mar 09 21:48:57 2010 +0100 +++ b/src/roster_window.py Tue Mar 09 22:37:57 2010 +0100 @@ -1398,7 +1398,7 @@ self.on_modelfilter_row_has_child_toggled) self.tree.set_model(self.modelfilter) - for acct in gajim.connections: + for acct in gajim.contacts.get_accounts(): self.add_account(acct) self.add_account_contacts(acct) # Recalculate column width for ellipsizing

1 0

gajim: don't print a second DB error message if a first one is a...
by Yann Leboulanger 09 Mar '10

09 Mar '10

changeset 2c40833f944c in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=2c40833f944c description: don't print a second DB error message if a first one is already shown. Fixes #5637 diffstat: src/common/connection.py | 4 +++- src/common/connection_handlers.py | 17 +++++++++-------- src/gui_interface.py | 11 +++++++++++ 3 files changed, 23 insertions(+), 9 deletions(-) diffs (125 lines): diff -r 152452007c3c -r 2c40833f944c src/common/connection.py --- a/src/common/connection.py Tue Mar 09 20:28:25 2010 +0100 +++ b/src/common/connection.py Tue Mar 09 21:48:57 2010 +0100 @@ -430,13 +430,15 @@ try: gajim.logger.write(kind, jid, log_msg) except exceptions.PysqliteOperationalError, e: - self.dispatch('ERROR', (_('Disk Write Error'), str(e))) + self.dispatch('DB_ERROR', (_('Disk Write Error'), + str(e))) except exceptions.DatabaseMalformed: pritext = _('Database Error') sectext = _('The database file (%s) cannot be read. Try to ' 'repair it (see http://trac.gajim.org/wiki/DatabaseBackup)' ' or remove it (all history will be lost).') % \ common.logger.LOG_DB_PATH + self.dispatch('DB_ERROR', (pritext, sectext)) def ack_subscribed(self, jid): """ diff -r 152452007c3c -r 2c40833f944c src/common/connection_handlers.py --- a/src/common/connection_handlers.py Tue Mar 09 20:28:25 2010 +0100 +++ b/src/common/connection_handlers.py Tue Mar 09 21:48:57 2010 +0100 @@ -1566,13 +1566,13 @@ gajim.logger.write('error', frm, error_msg, tim=tim, subject=subject) except exceptions.PysqliteOperationalError, e: - self.dispatch('ERROR', (_('Disk Write Error'), str(e))) + self.dispatch('DB_ERROR', (_('Disk Write Error'), str(e))) except exceptions.DatabaseMalformed: pritext = _('Database Error') sectext = _('The database file (%s) cannot be read. Try to repair ' 'it (see http://trac.gajim.org/wiki/DatabaseBackup) or remove ' 'it (all history will be lost).') % common.logger.LOG_DB_PATH - self.dispatch('ERROR', (pritext, sectext)) + self.dispatch('DB_ERROR', (pritext, sectext)) self.dispatch('MSGERROR', (frm, msg.getErrorCode(), error_msg, msgtxt, tim, session)) @@ -1617,13 +1617,13 @@ self.last_history_time[jid] = mktime(tim) except exceptions.PysqliteOperationalError, e: - self.dispatch('ERROR', (_('Disk Write Error'), str(e))) + self.dispatch('DB_ERROR', (_('Disk Write Error'), str(e))) except exceptions.DatabaseMalformed: pritext = _('Database Error') sectext = _('The database file (%s) cannot be read. Try to repair ' 'it (see http://trac.gajim.org/wiki/DatabaseBackup) or remove ' 'it (all history will be lost).') % common.logger.LOG_DB_PATH - self.dispatch('ERROR', (pritext, sectext)) + self.dispatch('DB_ERROR', (pritext, sectext)) def dispatch_invite_message(self, invite, frm): item = invite.getTag('invite') @@ -1811,14 +1811,15 @@ try: gajim.logger.write('gcstatus', who, st, show) except exceptions.PysqliteOperationalError, e: - self.dispatch('ERROR', (_('Disk Write Error'), str(e))) + self.dispatch('DB_ERROR', (_('Disk Write Error'), + str(e))) except exceptions.DatabaseMalformed: pritext = _('Database Error') sectext = _('The database file (%s) cannot be read. Try to ' 'repair it (see http://trac.gajim.org/wiki/DatabaseBackup)' ' or remove it (all history will be lost).') % \ common.logger.LOG_DB_PATH - self.dispatch('ERROR', (pritext, sectext)) + self.dispatch('DB_ERROR', (pritext, sectext)) if avatar_sha or avatar_sha == '': if avatar_sha == '': # contact has no avatar @@ -1961,14 +1962,14 @@ try: gajim.logger.write('status', jid_stripped, status, show) except exceptions.PysqliteOperationalError, e: - self.dispatch('ERROR', (_('Disk Write Error'), str(e))) + self.dispatch('DB_ERROR', (_('Disk Write Error'), str(e))) except exceptions.DatabaseMalformed: pritext = _('Database Error') sectext = _('The database file (%s) cannot be read. Try to ' 'repair it (see http://trac.gajim.org/wiki/DatabaseBackup) ' 'or remove it (all history will be lost).') % \ common.logger.LOG_DB_PATH - self.dispatch('ERROR', (pritext, sectext)) + self.dispatch('DB_ERROR', (pritext, sectext)) our_jid = gajim.get_jid_from_account(self.name) if jid_stripped == our_jid and resource == self.server_resource: # We got our own presence diff -r 152452007c3c -r 2c40833f944c src/gui_interface.py --- a/src/gui_interface.py Tue Mar 09 20:28:25 2010 +0100 +++ b/src/gui_interface.py Tue Mar 09 21:48:57 2010 +0100 @@ -119,6 +119,15 @@ #('ERROR', account, (title_text, section_text)) dialogs.ErrorDialog(data[0], data[1]) + def handle_event_db_error(self, unused, data): + #('DB_ERROR', account, (title_text, section_text)) + if self.db_error_dialog: + return + self.db_error_dialog = dialogs.ErrorDialog(data[0], data[1]) + def destroyed(win): + self.db_error_dialog = None + self.db_error_dialog.connect('destroy', destroyed) + def handle_event_information(self, unused, data): #('INFORMATION', account, (title_text, section_text)) dialogs.InformationDialog(data[0], data[1]) @@ -2090,6 +2099,7 @@ 'ROSTER': [self.handle_event_roster], 'WARNING': [self.handle_event_warning], 'ERROR': [self.handle_event_error], + 'DB_ERROR': [self.handle_event_db_error], 'INFORMATION': [self.handle_event_information], 'ERROR_ANSWER': [self.handle_event_error_answer], 'STATUS': [self.handle_event_status], @@ -3281,6 +3291,7 @@ self.status_sent_to_groups = {} self.gpg_passphrase = {} self.pass_dialog = {} + self.db_error_dialog = None self.default_colors = { 'inmsgcolor': gajim.config.get('inmsgcolor'), 'outmsgcolor': gajim.config.get('outmsgcolor'),

1 0

gajim: don't traceback when we get disconnected wile we parse st...
by Yann Leboulanger 09 Mar '10

09 Mar '10

changeset 152452007c3c in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=152452007c3c description: don't traceback when we get disconnected wile we parse stream features. Fixes #5574 diffstat: src/common/xmpp/client_nb.py | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diffs (13 lines): diff -r 91da24371e50 -r 152452007c3c src/common/xmpp/client_nb.py --- a/src/common/xmpp/client_nb.py Tue Mar 09 14:15:54 2010 +0200 +++ b/src/common/xmpp/client_nb.py Tue Mar 09 20:28:25 2010 +0100 @@ -362,6 +362,9 @@ supported and desired. """ self.stream_started = True + if not hasattr(self, 'onreceive'): + # we may already have been disconnected + return self.onreceive(None) if self.connected == 'plain':

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