Commits October 2010

commits@gajim.org

2 participants
111 discussions

gajim: prevent traceback when we receive a message archiving neg...
by Yann Leboulanger 31 Oct '10

31 Oct '10

changeset a27c12733243 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=a27c12733243 description: prevent traceback when we receive a message archiving negotiation while our server doesn't support message archiving. Fixes #5859 diffstat: src/common/message_archiving.py | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diffs (15 lines): diff -r 3c829399edfb -r a27c12733243 src/common/message_archiving.py --- a/src/common/message_archiving.py Sun Oct 31 21:38:35 2010 +0100 +++ b/src/common/message_archiving.py Sun Oct 31 22:02:24 2010 +0100 @@ -97,7 +97,10 @@ return self.default def logging_preference(self, jid, initiator_options=None): - otr = self.get_item_pref(jid)['otr'] + otr = self.get_item_pref(jid) + if not otr: + return + otr = otr['otr'] if initiator_options: if ((initiator_options == ['mustnot'] and otr == 'forbid') or (initiator_options == ['may'] and otr == 'require')):

1 0

gajim: don't present roster when joining a groupchat. Fixes #6018
by Yann Leboulanger 31 Oct '10

31 Oct '10

changeset 3c829399edfb in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=3c829399edfb description: don't present roster when joining a groupchat. Fixes #6018 diffstat: src/dialogs.py | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diffs (11 lines): diff -r 2fb3820fae40 -r 3c829399edfb src/dialogs.py --- a/src/dialogs.py Sun Oct 31 18:26:52 2010 +0100 +++ b/src/dialogs.py Sun Oct 31 21:38:35 2010 +0100 @@ -2251,7 +2251,6 @@ if self.account and 'join_gc' in gajim.interface.instances[self.account]: # remove us from open windows del gajim.interface.instances[self.account]['join_gc'] - gajim.interface.roster.window.present() def on_join_groupchat_window_key_press_event(self, widget, event): if event.keyval == gtk.keysyms.Escape: # ESCAPE

1 0

gajim: merge
by Yann Leboulanger 31 Oct '10

31 Oct '10

changeset 2fb3820fae40 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=2fb3820fae40 description: merge diffstat: po/zh_CN.po | 6818 +++++++++++++++++++++++----------------------------------- 1 files changed, 2748 insertions(+), 4070 deletions(-) diffs (truncated from 13251 to 300 lines): diff -r 6f616ca3998a -r 2fb3820fae40 po/zh_CN.po --- a/po/zh_CN.po Sun Oct 31 18:21:33 2010 +0100 +++ b/po/zh_CN.po Sun Oct 31 18:26:52 2010 +0100 @@ -4,6 +4,7 @@ # # wwld <wwld(a)radio.lzusiyu.org>, 2005. # kangkang <kanger(a)gamil.com>, 2005. +# Guanhao Yin <yinguanhao(a)gmail.com>, 2010. # #: ../src/gajim-remote-plugin.py:221 ../src/gajim-remote-plugin.py:228 #: ../src/gajim-remote-plugin.py:254 ../src/gajim-remote-plugin.py:255 @@ -13,22 +14,19 @@ msgstr "" "Project-Id-Version: Gajim\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-10-01 20:39+0200\n" -"PO-Revision-Date: 2009-08-20 00:07+0200\n" -"Last-Translator: kangkang <kanger(a)gmail.com>\n" -"Language-Team: sIyU <jabber(a)lzusiyu.org>\n" -"Language: \n" +"POT-Creation-Date: 2010-10-30 23:53+0800\n" +"PO-Revision-Date: 2010-10-31 17:37+0800\n" +"Last-Translator: Guanhao Yin <yinguanhao(a)gmail.com>\n" +"Language-Team: \n" +"Language: zh_CN\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Poedit-Language: Chinese\n" -"X-Poedit-Country: CHINA\n" "Plural-Forms: nplurals=1; plural=0;\n" #: ../data/gui/account_context_menu.ui.h:1 ../data/gui/roster_window.ui.h:7 -#, fuzzy msgid "Join _Group Chat..." -msgstr "加入群聊(_G)" +msgstr "加入聊天室(_G)" #: ../data/gui/account_context_menu.ui.h:2 msgid "_Add Contact..." @@ -36,28 +34,25 @@ #: ../data/gui/account_context_menu.ui.h:3 ../data/gui/roster_window.ui.h:18 msgid "_Discover Services" -msgstr "发掘服务(_D)" +msgstr "发现服务(_D)" #: ../data/gui/account_context_menu.ui.h:4 msgid "_Execute Command..." msgstr "执行命令(_E)..." #: ../data/gui/account_context_menu.ui.h:5 -#, fuzzy msgid "_Modify Account" -msgstr "修改帐户" +msgstr "修改账户信息(_M)" #: ../data/gui/account_context_menu.ui.h:6 msgid "_Open Gmail Inbox" msgstr "打开 Gmail 收件箱(_O)" #: ../data/gui/account_context_menu.ui.h:7 -#, fuzzy msgid "_Personal Events" -msgstr "个人信息" +msgstr "个人事件" #: ../data/gui/account_context_menu.ui.h:8 ../data/gui/roster_window.ui.h:24 -#, fuzzy msgid "_Start Chat..." msgstr "开始聊天(_S)" @@ -67,61 +62,59 @@ msgstr "状态(_S)" #: ../data/gui/account_creation_wizard_window.ui.h:1 -#, fuzzy msgid "" "Connecting to server\n" "\n" "Please wait..." msgstr "" -"正在创建帐户\n" +"正在连接服务器\n" "\n" "请等待..." #: ../data/gui/account_creation_wizard_window.ui.h:4 msgid "Please choose one of the options below:" -msgstr "请选择一个选项：" +msgstr "请选择一个选项: " #: ../data/gui/account_creation_wizard_window.ui.h:5 -#, fuzzy msgid "Please fill in the data for your existing account" -msgstr "请填写您新同账户的数据" +msgstr "请填写您现有账号的信息" #: ../data/gui/account_creation_wizard_window.ui.h:6 msgid "Please select a server" -msgstr "" +msgstr "请选择一个服务器" #: ../data/gui/account_creation_wizard_window.ui.h:7 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:10 -#, fuzzy msgid "Anon_ymous authentication" -msgstr "使用验证" +msgstr "匿名认证(_Y)" #: ../data/gui/account_creation_wizard_window.ui.h:11 msgid "Connect when I press Finish" -msgstr "当我点击“结束”时连接" +msgstr "当我点击\"结束\"时连接" #: ../data/gui/account_creation_wizard_window.ui.h:12 msgid "Gajim: Account Creation Wizard" -msgstr "Gajim：帐户创建向导" +msgstr "Gajim: 账户创建向导" #: ../data/gui/account_creation_wizard_window.ui.h:13 -#, fuzzy msgid "I already have an account I want to _use" -msgstr "我已经拥有了一个帐户" +msgstr "我已经有想要使用的账户了(_U)" #: ../data/gui/account_creation_wizard_window.ui.h:14 msgid "I want to _register for a new account" -msgstr "我想注册一个新帐户(_R)" +msgstr "我想注册一个新账户(_R)" #: ../data/gui/account_creation_wizard_window.ui.h:15 #: ../data/gui/accounts_window.ui.h:28 msgid "If checked, Gajim will remember the password for this account" -msgstr "如果选定，Gajim 会记录本帐户密码" +msgstr "如果选定, Gajim 会记录本账户的密码" #: ../data/gui/account_creation_wizard_window.ui.h:16 msgid "Manage..." @@ -131,17 +124,16 @@ #: ../data/gui/accounts_window.ui.h:39 ../data/gui/change_mood_dialog.ui.h:3 #: ../src/config.py:1280 ../src/config.py:1383 ../src/config.py:1694 #: ../src/config.py:1699 ../src/config.py:2265 ../src/config.py:2344 -#: ../src/config.py:2357 ../src/config.py:3613 ../src/config.py:3688 -#: ../src/dialogs.py:309 ../src/dialogs.py:311 ../src/dialogs.py:514 -#: ../src/dialogs.py:527 ../src/roster_window.py:2956 -#: ../src/roster_window.py:2962 ../src/roster_window.py:2967 +#: ../src/config.py:2357 ../src/config.py:3612 ../src/config.py:3687 +#: ../src/dialogs.py:309 ../src/dialogs.py:311 ../src/dialogs.py:517 +#: ../src/dialogs.py:530 ../src/roster_window.py:2967 +#: ../src/roster_window.py:2973 ../src/roster_window.py:2978 msgid "None" msgstr "无" #: ../data/gui/account_creation_wizard_window.ui.h:18 -#, fuzzy msgid "Prox_y:" -msgstr "代理服务器：" +msgstr "代理服务器(_Y): " #: ../data/gui/account_creation_wizard_window.ui.h:19 #: ../data/gui/accounts_window.ui.h:48 @@ -150,18 +142,18 @@ #: ../data/gui/account_creation_wizard_window.ui.h:20 msgid "Set my profile when I connect" -msgstr "当连接上时设置我的模版" +msgstr "连接后设置我的名片" #: ../data/gui/account_creation_wizard_window.ui.h:21 msgid "Use custom hostname/port" -msgstr "使用自定义主机名/端口号" +msgstr "使用自定义的主机名/端口" #: ../data/gui/account_creation_wizard_window.ui.h:22 msgid "" "You need to have an account in order to connect\n" "to the Jabber network." msgstr "" -"您需要一个帐户来连接\n" +"您必须拥有一个账户以连接\n" "Jabber 网络" #: ../data/gui/account_creation_wizard_window.ui.h:24 @@ -174,19 +166,18 @@ msgstr "完成(_F)" #: ../data/gui/account_creation_wizard_window.ui.h:26 -#, fuzzy msgid "_Hostname:" -msgstr "主机名：" +msgstr "主机名(_H): " #: ../data/gui/account_creation_wizard_window.ui.h:27 #: ../data/gui/accounts_window.ui.h:62 msgid "_Jabber ID:" -msgstr "Jabber ID(_J)：" +msgstr "_Jabber ID:" #: ../data/gui/account_creation_wizard_window.ui.h:28 #: ../data/gui/accounts_window.ui.h:64 msgid "_Password:" -msgstr "密码(_P)：" +msgstr "密码(_P): " #: ../data/gui/account_creation_wizard_window.ui.h:29 msgid "_Port:" @@ -194,7 +185,7 @@ #: ../data/gui/account_creation_wizard_window.ui.h:30 msgid "_Server:" -msgstr "服务器(_S)：" +msgstr "服务器(_S): " #: ../data/gui/accounts_window.ui.h:1 ../data/gui/preferences_window.ui.h:13 msgid "Miscellaneous" @@ -209,42 +200,36 @@ msgstr "个人信息" #: ../data/gui/accounts_window.ui.h:4 -#, fuzzy msgid "Proxy" -msgstr "属性" +msgstr "代理服务器" #: ../data/gui/accounts_window.ui.h:5 -#, fuzzy msgid "A_djust to status" -msgstr "调整状态(_A)" +msgstr "依据状态调整(_A)" #: ../data/gui/accounts_window.ui.h:6 ../data/gui/join_groupchat_window.ui.h:1 msgid "Account" -msgstr "账户" +msgstr "账号" #: ../data/gui/accounts_window.ui.h:7 msgid "Accounts" -msgstr "帐户" +msgstr "账户" #: ../data/gui/accounts_window.ui.h:8 -#, fuzzy msgid "Administration operations" -msgstr "管理员列表" +msgstr "管理操作" #: ../data/gui/accounts_window.ui.h:9 -#, fuzzy msgid "Anonymous authentication" -msgstr "使用验证" +msgstr "匿名认证" #: ../data/gui/accounts_window.ui.h:10 -#, fuzzy msgid "Auto-reconnect when connection is lost" -msgstr "连接丢失后自动重新连接" +msgstr "连接断开后自动重连" #: ../data/gui/accounts_window.ui.h:11 -#, fuzzy msgid "Browse..." -msgstr "浏览(_B)" +msgstr "浏览..." #: ../data/gui/accounts_window.ui.h:12 msgid "C_onnect on Gajim startup" @@ -252,38 +237,35 @@ #: ../data/gui/accounts_window.ui.h:13 msgid "Chan_ge Password" -msgstr "更换密码(_G)" +msgstr "更改密码(_G)" #: ../data/gui/accounts_window.ui.h:14 msgid "" "Check this so Gajim will ask you before sending your password over an " "insecure connection." -msgstr "" +msgstr "如果选定, Gajim 在通过不安全的网络连接发送密码前会询问您" #: ../data/gui/accounts_window.ui.h:15 -#, fuzzy msgid "Choose Client Cert" -msgstr "选择要发送的文件..." +msgstr "选择客户端证书" #: ../data/gui/accounts_window.ui.h:16 msgid "Choose _Key..." -msgstr "选择您的 OpenPGP 钥匙(_K)..." +msgstr "选择密钥(_K)..." #: ../data/gui/accounts_window.ui.h:17

1 0

gajim: better handling of block list. Fixes #6005
by Yann Leboulanger 31 Oct '10

31 Oct '10

changeset 6f616ca3998a in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=6f616ca3998a description: better handling of block list. Fixes #6005 diffstat: src/gui_interface.py | 35 +++++++++++++++++++++++------------ 1 files changed, 23 insertions(+), 12 deletions(-) diffs (47 lines): diff -r 269d88563a35 -r 6f616ca3998a src/gui_interface.py --- a/src/gui_interface.py Sun Oct 31 18:21:04 2010 +0100 +++ b/src/gui_interface.py Sun Oct 31 18:21:33 2010 +0100 @@ -1396,20 +1396,31 @@ self.instances[account]['privacy_list_%s' % name].\ privacy_list_received(rules) if name == 'block': - gajim.connections[account].blocked_contacts = [] - gajim.connections[account].blocked_groups = [] - gajim.connections[account].blocked_list = [] + con = gajim.connections[account] + con.blocked_contacts = [] + con.blocked_groups = [] + con.blocked_list = [] gajim.connections[account].blocked_all = False for rule in rules: - if not 'type' in rule: - gajim.connections[account].blocked_all = True - elif rule['type'] == 'jid' and rule['action'] == 'deny': - gajim.connections[account].blocked_contacts.append( - rule['value']) - elif rule['type'] == 'group' and rule['action'] == 'deny': - gajim.connections[account].blocked_groups.append( - rule['value']) - gajim.connections[account].blocked_list.append(rule) + if rule['action'] == 'allow': + if not 'type' in rule: + con.blocked_all = False + elif rule['type'] == 'jid' and rule['value'] in \ + con.blocked_contacts: + con.blocked_contacts.remove(rule['value']) + elif rule['type'] == 'group' and rule['value'] in \ + con.blocked_groups: + con.blocked_groups.remove(rule['value']) + elif rule['action'] == 'deny': + if not 'type' in rule: + con.blocked_all = True + elif rule['type'] == 'jid' and rule['value'] not in \ + con.blocked_contacts: + con.blocked_contacts.append(rule['value']) + elif rule['type'] == 'group' and rule['value'] not in \ + con.blocked_groups: + con.blocked_groups.append(rule['value']) + con.blocked_list.append(rule) if 'blocked_contacts' in self.instances[account]: self.instances[account]['blocked_contacts'].\ privacy_list_received(rules)

1 0

gajim: we can block / unblock General list. see #6005
by Yann Leboulanger 31 Oct '10

31 Oct '10

changeset 269d88563a35 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=269d88563a35 description: we can block / unblock General list. see #6005 diffstat: src/roster_window.py | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diffs (11 lines): diff -r aa675b5a84e1 -r 269d88563a35 src/roster_window.py --- a/src/roster_window.py Fri Oct 29 22:13:12 2010 +0200 +++ b/src/roster_window.py Sun Oct 31 18:21:04 2010 +0100 @@ -5433,7 +5433,6 @@ # General group cannot be changed if group == _('General'): rename_item.set_sensitive(False) - block_menuitem.set_sensitive(False) remove_item.set_sensitive(False) event_button = gtkgui_helpers.get_possible_button_event(event)

1 0

gajim: add new gui extension point so that plugins can update to...
by Yann Leboulanger 29 Oct '10

29 Oct '10

changeset aa675b5a84e1 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=aa675b5a84e1 description: add new gui extension point so that plugins can update toolbar buttons status. diffstat: src/chat_control.py | 20 +++++++++++++++++--- 1 files changed, 17 insertions(+), 3 deletions(-) diffs (48 lines): diff -r 51027e234f8c -r aa675b5a84e1 src/chat_control.py --- a/src/chat_control.py Fri Oct 29 16:49:53 2010 +0200 +++ b/src/chat_control.py Fri Oct 29 22:13:12 2010 +0200 @@ -159,6 +159,14 @@ gajim.plugin_manager.gui_extension_point('chat_control_base_draw_banner', self) + def update_toolbar(self): + """ + update state of buttons in toolbar + """ + self._update_toolbar() + gajim.plugin_manager.gui_extension_point( + 'chat_control_base_update_toolbar', self) + def draw_banner_text(self): """ Derived types SHOULD implement this @@ -184,8 +192,14 @@ """ pass + def _update_toolbar(self): + """ + Derived types MAY implement this + """ + pass + def handle_message_textview_mykey_press(self, widget, event_keyval, - event_keymod): + event_keymod): """ Derives types SHOULD implement this, rather than connection to the even itself @@ -1533,11 +1547,11 @@ self.restore_conversation() self.msg_textview.grab_focus() - # PluginSystem: adding GUI extension point for this ChatControl + # PluginSystem: adding GUI extension point for this ChatControl # instance object gajim.plugin_manager.gui_extension_point('chat_control', self) - def update_toolbar(self): + def _update_toolbar(self): # Formatting if self.contact.supports(NS_XHTML_IM) and not self.gpg_is_active: self._formattings_button.set_sensitive(True)

1 0

gajim: use NEC to handle jingle-disconnected events
by Yann Leboulanger 29 Oct '10

29 Oct '10

changeset 51027e234f8c in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=51027e234f8c description: use NEC to handle jingle-disconnected events diffstat: src/common/connection_handlers_events.py | 10 ++++++++++ src/common/jingle_session.py | 25 +++++++++++++++---------- src/gui_interface.py | 31 +++++++++++++++---------------- 3 files changed, 40 insertions(+), 26 deletions(-) diffs (142 lines): diff -r 3fbadfe6bb17 -r 51027e234f8c src/common/connection_handlers_events.py --- a/src/common/connection_handlers_events.py Fri Oct 29 11:51:24 2010 +0200 +++ b/src/common/connection_handlers_events.py Fri Oct 29 16:49:53 2010 +0200 @@ -1132,4 +1132,14 @@ self.fjid = self.jingle_session.peerjid self.jid, self.resource = gajim.get_room_and_nick_from_fjid(self.fjid) self.sid = self.jingle_session.sid + return True + +class JingleDisconnectedReceivedEvent(nec.NetworkIncomingEvent): + name = 'jingle-disconnected-received' + base_network_events = [] + + def generate(self): + self.fjid = self.jingle_session.peerjid + self.jid, self.resource = gajim.get_room_and_nick_from_fjid(self.fjid) + self.sid = self.jingle_session.sid return True \ No newline at end of file diff -r 3fbadfe6bb17 -r 51027e234f8c src/common/jingle_session.py --- a/src/common/jingle_session.py Fri Oct 29 11:51:24 2010 +0200 +++ b/src/common/jingle_session.py Fri Oct 29 16:49:53 2010 +0200 @@ -368,8 +368,9 @@ if (creator, name) in self.contents: content = self.contents[(creator, name)] # TODO: this will fail if content is not an RTP content - self.connection.dispatch('JINGLE_DISCONNECTED', - (self.peerjid, self.sid, content.media, 'removed')) + gajim.nec.push_incoming_event(JingleDisconnectedReceivedEvent( + None, conn=self.connection, jingle_session=self, + media=content.media, reason='removed')) content.destroy() if not self.contents: reason = xmpp.Node('reason') @@ -482,8 +483,9 @@ else: # TODO text = reason - self.connection.dispatch('JINGLE_DISCONNECTED', - (self.peerjid, self.sid, None, text)) + gajim.nec.push_incoming_event(JingleDisconnectedReceivedEvent(None, + conn=self.connection, jingle_session=self, media=None, + reason=text)) def __broadcast_all(self, stanza, jingle, error, action): """ @@ -634,8 +636,9 @@ else: text = reason self.connection.delete_jingle_session(self.sid) - self.connection.dispatch('JINGLE_DISCONNECTED', - (self.peerjid, self.sid, None, text)) + gajim.nec.push_incoming_event(JingleDisconnectedReceivedEvent(None, + conn=self.connection, jingle_session=self, media=None, + reason=text)) def __content_add(self, content): # TODO: test @@ -659,8 +662,9 @@ self.__append_content(jingle, content) self.connection.connection.send(stanza) # TODO: this will fail if content is not an RTP content - self.connection.dispatch('JINGLE_DISCONNECTED', - (self.peerjid, self.sid, content.media, 'rejected')) + gajim.nec.push_incoming_event(JingleDisconnectedReceivedEvent(None, + conn=self.connection, jingle_session=self, media=content.media, + reason='rejected')) def __content_modify(self): assert self.state != JingleStates.ended @@ -671,8 +675,9 @@ self.__append_content(jingle, content) self.connection.connection.send(stanza) # TODO: this will fail if content is not an RTP content - self.connection.dispatch('JINGLE_DISCONNECTED', - (self.peerjid, self.sid, content.media, 'removed')) + gajim.nec.push_incoming_event(JingleDisconnectedReceivedEvent(None, + conn=self.connection, jingle_session=self, media=content.media, + reason='removed')) def content_negotiated(self, media): gajim.nec.push_incoming_event(JingleConnectedReceivedEvent(None, diff -r 3fbadfe6bb17 -r 51027e234f8c src/gui_interface.py --- a/src/gui_interface.py Fri Oct 29 11:51:24 2010 +0200 +++ b/src/gui_interface.py Fri Oct 29 16:49:53 2010 +0200 @@ -1555,26 +1555,24 @@ else: ctrl.set_video_state('connected', obj.sid) - def handle_event_jingle_disconnected(self, account, data): + def handle_event_jingle_disconnected(self, obj): # ('JINGLE_DISCONNECTED', account, (peerjid, sid, reason)) - peerjid, sid, media, reason = data - jid = gajim.get_jid_without_resource(peerjid) - resource = gajim.get_resource_from_jid(peerjid) - ctrl = (self.msg_win_mgr.get_control(peerjid, account) - or self.msg_win_mgr.get_control(jid, account)) + account = obj.conn.name + ctrl = (self.msg_win_mgr.get_control(obj.fjid, account) + or self.msg_win_mgr.get_control(obj.jid, account)) if ctrl: - if media is None: - ctrl.stop_jingle(sid=sid, reason=reason) - elif media == 'audio': - ctrl.set_audio_state('stop', sid=sid, reason=reason) - elif media == 'video': - ctrl.set_video_state('stop', sid=sid, reason=reason) - dialog = dialogs.VoIPCallReceivedDialog.get_dialog(peerjid, sid) + if obj.media is None: + ctrl.stop_jingle(sid=obj.sid, reason=obj.reason) + elif obj.media == 'audio': + ctrl.set_audio_state('stop', sid=obj.sid, reason=obj.reason) + elif obj.media == 'video': + ctrl.set_video_state('stop', sid=obj.sid, reason=obj.reason) + dialog = dialogs.VoIPCallReceivedDialog.get_dialog(obj.fjid, obj.sid) if dialog: - if media is None: + if obj.media is None: dialog.dialog.destroy() else: - dialog.remove_contents((media, )) + dialog.remove_contents((obj.media, )) def handle_event_jingle_error(self, account, data): # ('JINGLE_ERROR', account, (peerjid, sid, reason)) @@ -1890,7 +1888,6 @@ 'INSECURE_SSL_CONNECTION': \ [self.handle_event_insecure_ssl_connection], 'INSECURE_PASSWORD': [self.handle_event_insecure_password], - 'JINGLE_DISCONNECTED': [self.handle_event_jingle_disconnected], 'JINGLE_ERROR': [self.handle_event_jingle_error], 'PEP_RECEIVED': [self.handle_event_pep_received], 'CAPS_RECEIVED': [self.handle_event_caps_received], @@ -1903,6 +1900,8 @@ 'http-auth-received': [self.handle_event_http_auth], 'iq-error-received': [self.handle_event_iq_error], 'jingle-connected-received': [self.handle_event_jingle_connected], + 'jingle-disconnected-received': [ + self.handle_event_jingle_disconnected], 'jingle-request-received': [self.handle_event_jingle_incoming], 'last-result-received': [self.handle_event_last_status_time], 'muc-admin-received': [self.handle_event_gc_affiliation],

1 0

gajim: fix call to set_restart_command for gnome session handling
by Yann Leboulanger 29 Oct '10

29 Oct '10

changeset 3fbadfe6bb17 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=3fbadfe6bb17 description: fix call to set_restart_command for gnome session handling diffstat: src/gajim.py | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diffs (22 lines): diff -r 50980325f73d -r 3fbadfe6bb17 src/gajim.py --- a/src/gajim.py Fri Oct 29 11:41:38 2010 +0200 +++ b/src/gajim.py Fri Oct 29 11:51:24 2010 +0200 @@ -413,11 +413,16 @@ cli.connect('die', die_cb) path_to_gajim_script = gtkgui_helpers.get_abspath_for_script( - 'gajim') + 'gajim') if path_to_gajim_script: argv = [path_to_gajim_script] - cli.set_restart_command(len(argv), argv) + try: + cli.set_restart_command(argv) + except TypeError: + # Fedora systems have a broken gnome-python wrapper for this + # function. + cli.set_restart_command(len(argv), argv) check_paths.check_and_possibly_create_paths()

1 0

gajim: handle read event before close event in case pipe sends u...
by Yann Leboulanger 29 Oct '10

29 Oct '10

changeset 50980325f73d in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=50980325f73d description: handle read event before close event in case pipe sends us something and close pipe in the same time. diffstat: src/common/xmpp/idlequeue.py | 19 +++++++++++-------- 1 files changed, 11 insertions(+), 8 deletions(-) diffs (37 lines): diff -r 56dcfc87d01e -r 50980325f73d src/common/xmpp/idlequeue.py --- a/src/common/xmpp/idlequeue.py Fri Oct 29 11:37:07 2010 +0200 +++ b/src/common/xmpp/idlequeue.py Fri Oct 29 11:41:38 2010 +0200 @@ -388,6 +388,16 @@ self.unplug_idle(fd) return False + read_write = False + if flags & PENDING_READ: + #print 'waiting read on %d, flags are %d' % (fd, flags) + obj.pollin() + read_write = True + + elif flags & PENDING_WRITE and not flags & IS_CLOSED: + obj.pollout() + read_write = True + if flags & IS_CLOSED: # io error, don't expect more events self.remove_timeout(obj.fd) @@ -395,15 +405,8 @@ obj.pollend() return False - if flags & PENDING_READ: - #print 'waiting read on %d, flags are %d' % (fd, flags) - obj.pollin() + if read_write: return True - - if flags & PENDING_WRITE: - obj.pollout() - return True - return False def process(self):

1 0

gajim: improve connection to server that have an IPv6 but jabber...
by Yann Leboulanger 29 Oct '10

29 Oct '10

changeset 56dcfc87d01e in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=56dcfc87d01e description: improve connection to server that have an IPv6 but jabber server don't listen on that IP. diffstat: src/common/xmpp/client_nb.py | 3 +++ src/common/xmpp/dispatcher_nb.py | 1 + 2 files changed, 4 insertions(+), 0 deletions(-) diffs (24 lines): diff -r abfc35a37d0c -r 56dcfc87d01e src/common/xmpp/client_nb.py --- a/src/common/xmpp/client_nb.py Thu Oct 28 21:00:48 2010 +0200 +++ b/src/common/xmpp/client_nb.py Fri Oct 29 11:37:07 2010 +0200 @@ -76,6 +76,9 @@ the client. """ # to avoid recursive calls + if self.ip_addresses: + self._try_next_ip() + return if self.disconnecting: return log.info('Disconnecting NBClient: %s' % message) diff -r abfc35a37d0c -r 56dcfc87d01e src/common/xmpp/dispatcher_nb.py --- a/src/common/xmpp/dispatcher_nb.py Thu Oct 28 21:00:48 2010 +0200 +++ b/src/common/xmpp/dispatcher_nb.py Fri Oct 29 11:37:07 2010 +0200 @@ -154,6 +154,7 @@ """ Send an initial stream header """ + self._owner.Connection.sendqueue = [] self.Stream = simplexml.NodeBuilder() self.Stream.dispatch = self.dispatch self.Stream._dispatch_depth = 2

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits October 2010