Commits May 2011

commits@gajim.org

3 participants
119 discussions

gajim: save roster position before hidding it. Fixes #6886
by Yann Leboulanger 25 May '11

25 May '11

changeset 8ad8152fd299 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=8ad8152fd299 description: save roster position before hidding it. Fixes #6886 diffstat: src/roster_window.py | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diffs (16 lines): diff -r a2907a8227e4 -r 8ad8152fd299 src/roster_window.py --- a/src/roster_window.py Tue May 24 18:21:12 2011 +0200 +++ b/src/roster_window.py Tue May 24 19:27:45 2011 +0200 @@ -2296,7 +2296,11 @@ 'quit_on_roster_x_button') and gajim.config.get('trayicon') != \ 'on_event': self.tooltip.hide_tooltip() - self.window.hide() + if gajim.config.get('save-roster-position'): + x, y = self.window.get_position() + gajim.config.set('roster_x-position', x) + gajim.config.set('roster_y-position', y) + self.window.hide() elif gajim.config.get('quit_on_roster_x_button'): self.on_quit_request() else:

1 0

gajim: run xdg-open instead of webbrowser when opening files. Fi...
by Yann Leboulanger 24 May '11

24 May '11

changeset 0ae6238d37ce in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=0ae6238d37ce description: run xdg-open instead of webbrowser when opening files. Fixes #5751 diffstat: src/common/helpers.py | 24 +++++++++++++++++------- 1 files changed, 17 insertions(+), 7 deletions(-) diffs (46 lines): diff -r fd35d10d13c7 -r 0ae6238d37ce src/common/helpers.py --- a/src/common/helpers.py Tue May 24 19:27:45 2011 +0200 +++ b/src/common/helpers.py Tue May 24 22:43:42 2011 +0200 @@ -673,6 +673,9 @@ def launch_browser_mailer(kind, uri): # kind = 'url' or 'mail' + if kind == 'url' and uri.startswith('file://'): + launch_file_manager(uri) + return if kind in ('mail', 'sth_at_sth') and not uri.startswith('mailto:'): uri = 'mailto:' + uri @@ -698,18 +701,25 @@ def launch_file_manager(path_to_open): - uri = 'file://' + path_to_open - if not gajim.config.get('autodetect_browser_mailer'): - command = gajim.config.get('custom_file_manager') - if command == '': # if no app is configured - return + if not path_to_open.startswith('file://'): + uri = 'file://' + path_to_open + if os.name == 'nt': + try: + os.startfile(path_to_open) # if pywin32 is installed we open + except Exception: + pass + else: + if not gajim.config.get('autodetect_browser_mailer'): + command = gajim.config.get('custom_file_manager') + if command == '': # if no app is configured + return + else: + command = 'xdg-open' command = build_command(command, path_to_open) try: exec_command(command) except Exception: pass - else: - webbrowser.open(uri) def play_sound(event): if not gajim.config.get('sounds_on'):

1 0

gajim: save roster position before hidding it. Fixes #6886
by Yann Leboulanger 24 May '11

24 May '11

changeset fd35d10d13c7 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=fd35d10d13c7 description: save roster position before hidding it. Fixes #6886 diffstat: src/roster_window.py | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diffs (16 lines): diff -r 55e700e42c16 -r fd35d10d13c7 src/roster_window.py --- a/src/roster_window.py Tue May 24 18:21:12 2011 +0200 +++ b/src/roster_window.py Tue May 24 19:27:45 2011 +0200 @@ -2318,7 +2318,11 @@ 'quit_on_roster_x_button') and gajim.config.get('trayicon') != \ 'on_event': self.tooltip.hide_tooltip() - self.window.hide() + if gajim.config.get('save-roster-position'): + x, y = self.window.get_position() + gajim.config.set('roster_x-position', x) + gajim.config.set('roster_y-position', y) + self.window.hide() elif gajim.config.get('quit_on_roster_x_button'): self.on_quit_request() else:

1 0

gajim: [alpertekinalp] Fix upper() function for ascii-only strin...
by Yann Leboulanger 24 May '11

24 May '11

changeset a2907a8227e4 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=a2907a8227e4 description: [alpertekinalp] Fix upper() function for ascii-only strings. Fixes #6888 diffstat: src/common/xmpp/protocol.py | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diffs (25 lines): diff -r 4c475fe51f74 -r a2907a8227e4 src/common/xmpp/protocol.py --- a/src/common/xmpp/protocol.py Tue May 24 18:12:48 2011 +0200 +++ b/src/common/xmpp/protocol.py Tue May 24 18:21:12 2011 +0200 @@ -22,6 +22,12 @@ from simplexml import Node, NodeBuilder import time +import string + +def ascii_upper(s): + trans_table = string.maketrans(string.ascii_lowercase, + string.ascii_uppercase) + return s.translate(trans_table) NS_ACTIVITY ='http://jabber.org/protocol/activity' # XEP-0108 NS_ADDRESS ='http://jabber.org/protocol/address' # XEP-0033 @@ -200,7 +206,7 @@ (NS_SASL, 'SASL', sasl_error_conditions)): for err in errpool.split('\n')[1:]: cond, code, typ, text = err.split(' -- ') - name = errname + '_' + cond.upper().replace('-', '_') + name = errname + '_' + ascii_upper(cond).replace('-', '_') locals()[name] = ns + ' ' + cond ERRORS[ns + ' ' + cond] = [code, typ, text] if code:

1 0

gajim: remove subscription dialog when another resource has acce...
by Yann Leboulanger 24 May '11

24 May '11

changeset 4c475fe51f74 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=4c475fe51f74 description: remove subscription dialog when another resource has accepted it. Fixes #6762 diffstat: src/gui_interface.py | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diffs (23 lines): diff -r 78329bf987b5 -r 4c475fe51f74 src/gui_interface.py --- a/src/gui_interface.py Mon May 23 22:35:19 2011 +0200 +++ b/src/gui_interface.py Tue May 24 18:12:48 2011 +0200 @@ -1286,7 +1286,7 @@ if contacts[0].sub != sub or contacts[0].ask != ask\ or old_groups != groups: # c.get_shown_groups() has changed. Reflect that in - # roster_winodow + # roster_window self.roster.remove_contact(jid, account, force=True) for contact in contacts: contact.name = name or '' @@ -1299,6 +1299,10 @@ self.roster.draw_group(group, account) self.roster.draw_contact(jid, account) + if jid in self.instances[account]['sub_request'] and sub in ('from', + 'both'): + self.instances[account]['sub_request'][jid].window.destroy() + if self.remote_ctrl: self.remote_ctrl.raise_signal('RosterInfo', (account, array))

1 0

gajim: don't open twice the same subscription request dialog. se...
by Yann Leboulanger 24 May '11

24 May '11

changeset 78329bf987b5 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=78329bf987b5 description: don't open twice the same subscription request dialog. see #6762 diffstat: data/gui/subscription_request_window.ui | 1 + src/config.py | 8 +++++--- src/dialogs.py | 8 ++++++++ src/gui_interface.py | 7 +++++-- test/lib/gajim_mocks.py | 2 +- 5 files changed, 20 insertions(+), 6 deletions(-) diffs (97 lines): diff -r 70efaf361698 -r 78329bf987b5 data/gui/subscription_request_window.ui --- a/data/gui/subscription_request_window.ui Mon May 23 19:03:50 2011 +0200 +++ b/data/gui/subscription_request_window.ui Mon May 23 22:35:19 2011 +0200 @@ -6,6 +6,7 @@ <property name="border_width">12</property> <property name="title" translatable="yes">Subscription Request</property> <property name="type_hint">dialog</property> + <signal name="destroy" handler="on_subscription_request_window_destroy"/> <child> <object class="GtkVBox" id="vbox10"> <property name="visible">True</property> diff -r 70efaf361698 -r 78329bf987b5 src/config.py --- a/src/config.py Mon May 23 19:03:50 2011 +0200 +++ b/src/config.py Mon May 23 22:35:19 2011 +0200 @@ -2041,7 +2041,7 @@ gajim.interface.msg_win_mgr.change_account_name(old_name, new_name) # upgrade account variable in opened windows for kind in ('infos', 'disco', 'gc_config', 'search', - 'online_dialog'): + 'online_dialog', 'sub_request'): for j in gajim.interface.instances[new_name][kind]: gajim.interface.instances[new_name][kind][j].account = \ new_name @@ -2478,7 +2478,8 @@ self.init_account_gpg() # update variables gajim.interface.instances[account] = {'infos': {}, - 'disco': {}, 'gc_config': {}, 'search': {}, 'online_dialog': {}} + 'disco': {}, 'gc_config': {}, 'search': {}, 'online_dialog': {}, + 'sub_request': {}} gajim.interface.minimized_controls[account] = {} gajim.connections[account].connected = 0 gajim.groups[account] = {} @@ -3914,7 +3915,8 @@ # update variables gajim.interface.instances[self.account] = {'infos': {}, 'disco': {}, - 'gc_config': {}, 'search': {}, 'online_dialog': {}} + 'gc_config': {}, 'search': {}, 'online_dialog': {}, + 'sub_request': {}} gajim.interface.minimized_controls[self.account] = {} gajim.connections[self.account].connected = 0 gajim.connections[self.account].keepalives = gajim.config.get_per( diff -r 70efaf361698 -r 78329bf987b5 src/dialogs.py --- a/src/dialogs.py Mon May 23 19:03:50 2011 +0200 +++ b/src/dialogs.py Mon May 23 22:35:19 2011 +0200 @@ -2061,6 +2061,14 @@ xml.connect_signals(self) self.window.show_all() + def on_subscription_request_window_destroy(self, widget): + """ + Close window + """ + if self.jid in gajim.interface.instances[self.account]['sub_request']: + # remove us from open windows + del gajim.interface.instances[self.account]['sub_request'][self.jid] + def prepare_popup_menu(self): xml = gtkgui_helpers.get_gtk_builder('subscription_request_popup_menu.ui') menu = xml.get_object('subscription_request_popup_menu') diff -r 70efaf361698 -r 78329bf987b5 src/gui_interface.py --- a/src/gui_interface.py Mon May 23 19:03:50 2011 +0200 +++ b/src/gui_interface.py Mon May 23 22:35:19 2011 +0200 @@ -652,7 +652,10 @@ text = array[1] nick = array[2] if helpers.allow_popup_window(account) or not self.systray_enabled: - dialogs.SubscriptionRequestWindow(jid, text, account, nick) + if jid in self.instances[account]['sub_request']: + self.instances[account]['sub_request'][jid].window.destroy() + self.instances[account]['sub_request'][jid] = \ + dialogs.SubscriptionRequestWindow(jid, text, account, nick) return self.add_event(account, jid, 'subscription_request', (text, nick)) @@ -3448,7 +3451,7 @@ for a in gajim.connections: self.instances[a] = {'infos': {}, 'disco': {}, 'gc_config': {}, - 'search': {}, 'online_dialog': {}} + 'search': {}, 'online_dialog': {}, 'sub_request': {}} # online_dialog contains all dialogs that have a meaning only when # we are not disconnected self.minimized_controls[a] = {} diff -r 70efaf361698 -r 78329bf987b5 test/lib/gajim_mocks.py --- a/test/lib/gajim_mocks.py Mon May 23 19:03:50 2011 +0200 +++ b/test/lib/gajim_mocks.py Mon May 23 22:35:19 2011 +0200 @@ -20,7 +20,7 @@ self.sessions = {} gajim.interface.instances[account] = {'infos': {}, 'disco': {}, - 'gc_config': {}, 'search': {}} + 'gc_config': {}, 'search': {}, 'sub_request': {}} gajim.interface.minimized_controls[account] = {} gajim.contacts.add_account(account) gajim.groups[account] = {}

1 0

gajim: [Mako] Updated japanese translation
by Yann Leboulanger 24 May '11

24 May '11

changeset 70efaf361698 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=70efaf361698 description: [Mako] Updated japanese translation diffstat: po/ja.po | 1461 +++++++++++++++++++++++++++++-------------------------------- 1 files changed, 690 insertions(+), 771 deletions(-) diffs (truncated from 3967 to 300 lines): diff -r a74f1ba1574a -r 70efaf361698 po/ja.po --- a/po/ja.po Sat Nov 27 00:43:13 2010 +0300 +++ b/po/ja.po Mon May 23 19:03:50 2011 +0200 @@ -1,16 +1,16 @@ -# 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. -# +# 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.14 ja\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-07-27 16:16+0200\n" -"PO-Revision-Date: 2010-07-29 15:49+0900\n" +"POT-Creation-Date: 2011-05-23 08:33+0200\n" +"PO-Revision-Date: 2011-05-22 20:08+0900\n" "Last-Translator: Mako N <mako(a)pasero.net>\n" "Language-Team: Japanese\n" -"Language: \n" +"Language: ja\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -118,12 +118,12 @@ #: ../data/gui/account_creation_wizard_window.ui.h:18 #: ../data/gui/accounts_window.ui.h:39 ../data/gui/change_mood_dialog.ui.h:3 -#: ../src/config.py:1280 ../src/config.py:1383 ../src/config.py:1694 -#: ../src/config.py:1699 ../src/config.py:2263 ../src/config.py:2342 -#: ../src/config.py:2355 ../src/config.py:3596 ../src/config.py:3671 -#: ../src/dialogs.py:308 ../src/dialogs.py:310 ../src/dialogs.py:513 -#: ../src/dialogs.py:526 ../src/roster_window.py:2890 -#: ../src/roster_window.py:2896 ../src/roster_window.py:2901 +#: ../src/config.py:1293 ../src/config.py:1396 ../src/config.py:1707 +#: ../src/config.py:1712 ../src/config.py:2278 ../src/config.py:2357 +#: ../src/config.py:2370 ../src/config.py:3622 ../src/config.py:3697 +#: ../src/dialogs.py:308 ../src/dialogs.py:310 ../src/dialogs.py:516 +#: ../src/dialogs.py:529 ../src/roster_window.py:2909 +#: ../src/roster_window.py:2915 ../src/roster_window.py:2920 msgid "None" msgstr "なし" @@ -282,8 +282,8 @@ #. No configured account #: ../data/gui/accounts_window.ui.h:24 ../data/gui/roster_window.ui.h:5 #: ../src/common/helpers.py:1159 ../src/common/helpers.py:1171 -#: ../src/notify.py:528 ../src/notify.py:551 ../src/notify.py:592 -#: ../src/notify.py:608 +#: ../src/notify.py:528 ../src/notify.py:551 ../src/notify.py:600 +#: ../src/notify.py:616 msgid "Gajim" msgstr "Gajim" @@ -292,11 +292,11 @@ #. General group cannot be changed #: ../data/gui/accounts_window.ui.h:25 ../data/gui/preferences_window.ui.h:61 #: ../src/common/contacts.py:141 ../src/dialogs.py:111 ../src/dialogs.py:121 -#: ../src/roster_window.py:2832 ../src/roster_window.py:5379 +#: ../src/roster_window.py:2851 ../src/roster_window.py:5402 msgid "General" msgstr "全般" -# (Mako)broadcast 困った。ここは「同報」で +# (Mako)broadcast 困った。ここは「同報」で #: ../data/gui/accounts_window.ui.h:26 msgid "" "If checked, Gajim will also broadcast some more IPs except from just your " @@ -351,8 +351,8 @@ msgstr "サーバに格納する、あなたに関する情報です" #: ../data/gui/accounts_window.ui.h:35 -#: ../data/gui/zeroconf_information_window.ui.h:4 ../src/config.py:1817 -#: ../src/dialogs.py:830 +#: ../data/gui/zeroconf_information_window.ui.h:4 ../src/config.py:1830 +#: ../src/dialogs.py:832 msgid "Jabber ID:" msgstr "Jabber ID:" @@ -365,8 +365,8 @@ msgid "Mer_ge accounts" msgstr "アカウントの統合 (_g)" -#: ../data/gui/accounts_window.ui.h:38 ../src/config.py:1790 -#: ../src/config.py:2356 +#: ../data/gui/accounts_window.ui.h:38 ../src/config.py:1803 +#: ../src/config.py:2371 msgid "No key selected" msgstr "鍵が選択されていません" @@ -393,7 +393,7 @@ msgstr "優先順位は、在席状況に応じて自動的に変わります。" #. Rename -#: ../data/gui/accounts_window.ui.h:44 ../src/roster_window.py:5329 +#: ../data/gui/accounts_window.ui.h:44 ../src/roster_window.py:5352 msgid "Re_name" msgstr "名前の変更 (_n)" @@ -583,7 +583,7 @@ msgid "Please wait..." msgstr "しばらくお待ちください..." -# (Mako)entity はしかたなくカタカナで +# (Mako)entity はしかたなくカタカナで #: ../data/gui/adhoc_commands_window.ui.h:10 msgid "This jabber entity does not expose any commands." msgstr "このエンティティはコマンドを受け付けません。" @@ -649,7 +649,7 @@ msgid "_Send Server Message..." msgstr "サーバーメッセージを送信 (_S)..." -# (Mako) 日本語の語順にするため、ここは空白にして、「and I 」のほうに含める +# (Mako) 日本語の語順にするため、ここは空白にして、「and I 」のほうに含める #: ../data/gui/advanced_notifications_window.ui.h:1 msgid " a window/tab opened with that contact " msgstr " " @@ -780,7 +780,7 @@ #: ../data/gui/advanced_notifications_window.ui.h:31 msgid "_Disable showing event in roster" -msgstr "名簿へのイベントの表示をしない (_D)" +msgstr "イベントを名簿に表示しない (_D)" #: ../data/gui/advanced_notifications_window.ui.h:32 msgid "_Disable showing event in systray" @@ -802,7 +802,7 @@ msgid "_Show event in systray" msgstr "イベントをシステムトレイに表示する (_S)" -# (Mako)日本語の言順に合わせるため、ここに「a window/tab opened with that contact」を含める +# (Mako)日本語の言順に合わせるため、ここに「a window/tab opened with that contact」を含める #: ../data/gui/advanced_notifications_window.ui.h:37 msgid "and I " msgstr "かつ、その相手先とのウィンドウ/タブを " @@ -853,8 +853,8 @@ #: ../data/gui/blocked_contacts_window.ui.h:2 #: ../data/gui/contact_context_menu.ui.h:25 -#: ../data/gui/gc_occupants_menu.ui.h:13 ../src/roster_window.py:5348 -#: ../src/roster_window.py:5476 ../src/roster_window.py:5609 +#: ../data/gui/gc_occupants_menu.ui.h:13 ../src/roster_window.py:5371 +#: ../src/roster_window.py:5499 ../src/roster_window.py:5632 msgid "_Unblock" msgstr "遮断の解除 (_U)" @@ -942,7 +942,7 @@ msgstr "チャットの開始 (_S)" #. # means number -#: ../data/gui/chat_control.ui.h:1 ../src/dialogs.py:4184 +#: ../data/gui/chat_control.ui.h:1 ../src/dialogs.py:4186 msgid "#" msgstr "#" @@ -1046,8 +1046,8 @@ #. Invite to #. Invite to Groupchat -#: ../data/gui/contact_context_menu.ui.h:6 ../src/roster_window.py:5284 -#: ../src/roster_window.py:5444 +#: ../data/gui/contact_context_menu.ui.h:6 ../src/roster_window.py:5307 +#: ../src/roster_window.py:5467 msgid "In_vite to" msgstr "招待 (_v)" @@ -1059,8 +1059,8 @@ msgid "Remo_ve" msgstr "削除 (_v)" -#: ../data/gui/contact_context_menu.ui.h:9 ../src/roster_window.py:5294 -#: ../src/roster_window.py:5533 +#: ../data/gui/contact_context_menu.ui.h:9 ../src/roster_window.py:5317 +#: ../src/roster_window.py:5556 msgid "Send Cus_tom Status" msgstr "個別の在席状況の送信 (_t)" @@ -1093,8 +1093,8 @@ msgstr "自分の在席状況を見られることを許可する (_A)" #: ../data/gui/contact_context_menu.ui.h:18 -#: ../data/gui/gc_occupants_menu.ui.h:7 ../src/roster_window.py:5356 -#: ../src/roster_window.py:5482 ../src/roster_window.py:5612 +#: ../data/gui/gc_occupants_menu.ui.h:7 ../src/roster_window.py:5379 +#: ../src/roster_window.py:5505 ../src/roster_window.py:5635 msgid "_Block" msgstr "遮断 (_B)" @@ -1105,7 +1105,7 @@ #: ../data/gui/contact_context_menu.ui.h:20 #: ../data/gui/gc_control_popup_menu.ui.h:6 #: ../data/gui/gc_occupants_menu.ui.h:8 ../data/gui/roster_window.ui.h:21 -#: ../src/roster_window.py:5683 +#: ../src/roster_window.py:5706 msgid "_History" msgstr "履歴 (_H)" @@ -1181,7 +1181,7 @@ msgid "File Transfers" msgstr "ファイルの転送" -# (Mako)この場合は「閉じる」 +# (Mako)この場合は「閉じる」 #: ../data/gui/filetransfers.ui.h:7 msgid "Hides the window" msgstr "ウィンドウを閉じる" @@ -1218,7 +1218,7 @@ msgid "_Notify me when a file transfer is complete" msgstr "ファイル転送が完了したら知らせる (_N)" -# #(Mako)Containing をどうする +# #(Mako)Containing をどうする #: ../data/gui/filetransfers.ui.h:15 ../src/filetransfers_window.py:205 msgid "_Open Containing Folder" msgstr "フォルダを開く (_O)" @@ -1265,7 +1265,7 @@ #: ../data/gui/gajim_themes_window.ui.h:9 msgid "Gone" -msgstr "不在" +msgstr "終了" #: ../data/gui/gajim_themes_window.ui.h:10 msgid "Group row" @@ -1273,7 +1273,7 @@ #: ../data/gui/gajim_themes_window.ui.h:11 ../src/common/pep.py:150 msgid "Inactive" -msgstr "活動停止中" +msgstr "停止中" #: ../data/gui/gajim_themes_window.ui.h:12 ../src/chat_control.py:926 msgid "Italic" @@ -1297,7 +1297,7 @@ #: ../data/gui/gajim_themes_window.ui.h:17 msgid "Paused" -msgstr "一時停止中" +msgstr "休止中" #: ../data/gui/gajim_themes_window.ui.h:18 msgid "Text _color:" @@ -1379,7 +1379,7 @@ msgid "_Send Private Message" msgstr "私信を送る (_S)" -# (Mako)moderated room での発言する権利 +# (Mako)moderated room での発言する権利 #: ../data/gui/gc_occupants_menu.ui.h:14 msgid "_Voice" msgstr "発言権 (_V)" @@ -1388,9 +1388,9 @@ msgid "Create new post" msgstr "新しい投稿を作成" -# (Mako)groups_post_window.ui は、メールの「差出人」に相当 -# helpers.pyは、 -# 相手先の情報で、subscriptionの有無なので、「こちらが承認」としたい +# (Mako)groups_post_window.ui は、メールの「差出人」に相当 +# helpers.pyは、 +# 相手先の情報で、subscriptionの有無なので、「こちらが承認」としたい #: ../data/gui/groups_post_window.ui.h:2 ../src/common/helpers.py:258 msgid "From" msgstr "こちらが承認" @@ -1416,8 +1416,8 @@ msgstr "<big><b>Gajim 履歴記録マネージャ</b></big>" #. Change label for accept_button to action name instead of 'OK'. -#: ../data/gui/history_manager.ui.h:4 ../src/dialogs.py:3208 -#: ../src/dialogs.py:3305 +#: ../data/gui/history_manager.ui.h:4 ../src/dialogs.py:3210 +#: ../src/dialogs.py:3307 msgid "Delete" msgstr "削除" @@ -1476,7 +1476,7 @@ msgid "Bro_wse Rooms" msgstr "談話室を一覧 (_w)" -#: ../data/gui/join_groupchat_window.ui.h:3 ../src/dialogs.py:2180 +#: ../data/gui/join_groupchat_window.ui.h:3 ../src/dialogs.py:2182 msgid "Join Group Chat" msgstr "グループチャットに参加" @@ -1504,7 +1504,7 @@ msgstr "談話室:" #: ../data/gui/join_groupchat_window.ui.h:9 -#: ../data/gui/manage_bookmarks_window.ui.h:9 ../src/config.py:1807 +#: ../data/gui/manage_bookmarks_window.ui.h:9 ../src/config.py:1820 msgid "Server:" msgstr "サーバー:" @@ -1541,7 +1541,7 @@ msgid "Title:" msgstr "タイトル:"

1 0

gajim: [alpertekinalp] Fix upper() function for ascii-only strin...
by Yann Leboulanger 24 May '11

24 May '11

changeset 55e700e42c16 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=55e700e42c16 description: [alpertekinalp] Fix upper() function for ascii-only strings. Fixes #6888 diffstat: src/common/xmpp/protocol.py | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diffs (25 lines): diff -r d30b92fc3fc5 -r 55e700e42c16 src/common/xmpp/protocol.py --- a/src/common/xmpp/protocol.py Tue May 24 18:12:48 2011 +0200 +++ b/src/common/xmpp/protocol.py Tue May 24 18:21:12 2011 +0200 @@ -22,6 +22,12 @@ from simplexml import Node, NodeBuilder import time +import string + +def ascii_upper(s): + trans_table = string.maketrans(string.ascii_lowercase, + string.ascii_uppercase) + return s.translate(trans_table) NS_ACTIVITY = 'http://jabber.org/protocol/activity' # XEP-0108 NS_ADDRESS = 'http://jabber.org/protocol/address' # XEP-0033 @@ -209,7 +215,7 @@ (NS_SASL, 'SASL', sasl_error_conditions)): for err in errpool.split('\n')[1:]: cond, code, typ, text = err.split(' -- ') - name = errname + '_' + cond.upper().replace('-', '_') + name = errname + '_' + ascii_upper(cond).replace('-', '_') locals()[name] = ns + ' ' + cond ERRORS[ns + ' ' + cond] = [code, typ, text] if code:

1 0

gajim: remove subscription dialog when another resource has acce...
by Yann Leboulanger 24 May '11

24 May '11

changeset d30b92fc3fc5 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=d30b92fc3fc5 description: remove subscription dialog when another resource has accepted it. Fixes #6762 diffstat: src/gui_interface.py | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diffs (22 lines): diff -r 1aece07e41a9 -r d30b92fc3fc5 src/gui_interface.py --- a/src/gui_interface.py Mon May 23 22:35:19 2011 +0200 +++ b/src/gui_interface.py Tue May 24 18:12:48 2011 +0200 @@ -754,7 +754,7 @@ if contacts[0].sub != obj.sub or contacts[0].ask != obj.ask\ or old_groups != obj.groups: # c.get_shown_groups() has changed. Reflect that in - # roster_winodow + # roster_window self.roster.remove_contact(obj.jid, account, force=True) for contact in contacts: contact.name = obj.nickname or '' @@ -766,6 +766,9 @@ for group in old_groups: self.roster.draw_group(group, account) self.roster.draw_contact(obj.jid, account) + if obj.jid in self.instances[account]['sub_request'] and obj.sub in ( + 'from', 'both'): + self.instances[account]['sub_request'][obj.jid].window.destroy() def handle_event_bookmarks(self, obj): # ('BOOKMARKS', account, [{name,jid,autojoin,password,nick}, {}])

1 0

gajim: don't open twice the same subscription request dialog. se...
by Yann Leboulanger 23 May '11

23 May '11

changeset 1aece07e41a9 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=1aece07e41a9 description: don't open twice the same subscription request dialog. see #6762 diffstat: data/gui/subscription_request_window.ui | 1 + src/config.py | 8 +++++--- src/dialogs.py | 8 ++++++++ src/gui_interface.py | 7 +++++-- test/lib/gajim_mocks.py | 2 +- 5 files changed, 20 insertions(+), 6 deletions(-) diffs (97 lines): diff -r d84fab330dc2 -r 1aece07e41a9 data/gui/subscription_request_window.ui --- a/data/gui/subscription_request_window.ui Sun May 22 13:05:39 2011 +0200 +++ b/data/gui/subscription_request_window.ui Mon May 23 22:35:19 2011 +0200 @@ -6,6 +6,7 @@ <property name="border_width">12</property> <property name="title" translatable="yes">Subscription Request</property> <property name="type_hint">dialog</property> + <signal name="destroy" handler="on_subscription_request_window_destroy"/> <child> <object class="GtkVBox" id="vbox10"> <property name="visible">True</property> diff -r d84fab330dc2 -r 1aece07e41a9 src/config.py --- a/src/config.py Sun May 22 13:05:39 2011 +0200 +++ b/src/config.py Mon May 23 22:35:19 2011 +0200 @@ -2040,7 +2040,7 @@ gajim.interface.msg_win_mgr.change_account_name(old_name, new_name) # upgrade account variable in opened windows for kind in ('infos', 'disco', 'gc_config', 'search', - 'online_dialog'): + 'online_dialog', 'sub_request'): for j in gajim.interface.instances[new_name][kind]: gajim.interface.instances[new_name][kind][j].account = \ new_name @@ -2477,7 +2477,8 @@ self.init_account_gpg() # update variables gajim.interface.instances[account] = {'infos': {}, - 'disco': {}, 'gc_config': {}, 'search': {}, 'online_dialog': {}} + 'disco': {}, 'gc_config': {}, 'search': {}, 'online_dialog': {}, + 'sub_request': {}} gajim.interface.minimized_controls[account] = {} gajim.connections[account].connected = 0 gajim.groups[account] = {} @@ -3926,7 +3927,8 @@ # update variables gajim.interface.instances[self.account] = {'infos': {}, 'disco': {}, - 'gc_config': {}, 'search': {}, 'online_dialog': {}} + 'gc_config': {}, 'search': {}, 'online_dialog': {}, + 'sub_request': {}} gajim.interface.minimized_controls[self.account] = {} gajim.connections[self.account].connected = 0 gajim.connections[self.account].keepalives = gajim.config.get_per( diff -r d84fab330dc2 -r 1aece07e41a9 src/dialogs.py --- a/src/dialogs.py Sun May 22 13:05:39 2011 +0200 +++ b/src/dialogs.py Mon May 23 22:35:19 2011 +0200 @@ -2165,6 +2165,14 @@ xml.connect_signals(self) self.window.show_all() + def on_subscription_request_window_destroy(self, widget): + """ + Close window + """ + if self.jid in gajim.interface.instances[self.account]['sub_request']: + # remove us from open windows + del gajim.interface.instances[self.account]['sub_request'][self.jid] + def prepare_popup_menu(self): xml = gtkgui_helpers.get_gtk_builder('subscription_request_popup_menu.ui') menu = xml.get_object('subscription_request_popup_menu') diff -r d84fab330dc2 -r 1aece07e41a9 src/gui_interface.py --- a/src/gui_interface.py Sun May 22 13:05:39 2011 +0200 +++ b/src/gui_interface.py Mon May 23 22:35:19 2011 +0200 @@ -478,7 +478,10 @@ #('SUBSCRIBE', account, (jid, text, user_nick)) user_nick is JEP-0172 account = obj.conn.name if helpers.allow_popup_window(account) or not self.systray_enabled: - dialogs.SubscriptionRequestWindow(obj.jid, obj.status, account, + if obj.jid in self.instances[account]['sub_request']: + self.instances[account]['sub_request'][obj.jid].window.destroy() + self.instances[account]['sub_request'][obj.jid] = \ + dialogs.SubscriptionRequestWindow(obj.jid, obj.status, account, obj.user_nick) return @@ -2700,7 +2703,7 @@ for a in gajim.connections: self.instances[a] = {'infos': {}, 'disco': {}, 'gc_config': {}, - 'search': {}, 'online_dialog': {}} + 'search': {}, 'online_dialog': {}, 'sub_request': {}} # online_dialog contains all dialogs that have a meaning only when # we are not disconnected self.minimized_controls[a] = {} diff -r d84fab330dc2 -r 1aece07e41a9 test/lib/gajim_mocks.py --- a/test/lib/gajim_mocks.py Sun May 22 13:05:39 2011 +0200 +++ b/test/lib/gajim_mocks.py Mon May 23 22:35:19 2011 +0200 @@ -21,7 +21,7 @@ self.sessions = {} gajim.interface.instances[account] = {'infos': {}, 'disco': {}, - 'gc_config': {}, 'search': {}} + 'gc_config': {}, 'search': {}, 'sub_request': {}} gajim.interface.minimized_controls[account] = {} gajim.contacts.add_account(account) gajim.groups[account] = {}

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits May 2011