Commits November 2009

commits@gajim.org

9 participants
288 discussions

gajim: Fixed a typo
by Alexander Cherniuk 24 Nov '09

24 Nov '09

changeset 06a41b7a2ca4 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=06a41b7a2ca4 description: Fixed a typo diffstat: src/common/connection_handlers.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 3baea8f8173d -r 06a41b7a2ca4 src/common/connection_handlers.py --- a/src/common/connection_handlers.py Mon Nov 23 16:08:09 2009 +0200 +++ b/src/common/connection_handlers.py Tue Nov 24 12:20:40 2009 +0200 @@ -1860,7 +1860,7 @@ log.warn('Invalid JID: %s, ignoring it' % item.getAttr('jid')) continue name = item.getAttr('name') - contact = gajim.contact.get_contact(self.name, jid) + contact = gajim.contacts.get_contact(self.name, jid) groups = [] same_groups = True for group in item.getTags('group'):

1 0

gajim: Setting my identity straight
by Alexander Cherniuk 23 Nov '09

23 Nov '09

changeset 3baea8f8173d in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=3baea8f8173d description: Setting my identity straight diffstat: AUTHORS | 2 +- src/command_system/__init__.py | 2 +- src/command_system/dispatching.py | 2 +- src/command_system/errors.py | 2 +- src/command_system/framework.py | 2 +- src/command_system/implementation/__init__.py | 2 +- src/command_system/implementation/custom.py | 2 +- src/command_system/implementation/hosts.py | 2 +- src/command_system/implementation/middleware.py | 2 +- src/command_system/implementation/standard.py | 2 +- src/command_system/mapping.py | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diffs (104 lines): diff -r 02af28f35ad5 -r 3baea8f8173d AUTHORS --- a/AUTHORS Sun Nov 22 20:05:30 2009 +0200 +++ b/AUTHORS Mon Nov 23 16:08:09 2009 +0200 @@ -1,9 +1,9 @@ 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) -red-agent (hell.director AT gmail.com) Jonathan Schleifer (js-gajim AT webkeks.org) Travis Shirk (travis AT pobox.com) Brendan Taylor (whateley AT gmail.com) diff -r 02af28f35ad5 -r 3baea8f8173d src/command_system/__init__.py --- a/src/command_system/__init__.py Sun Nov 22 20:05:30 2009 +0200 +++ b/src/command_system/__init__.py Mon Nov 23 16:08:09 2009 +0200 @@ -1,4 +1,4 @@ -# Copyright (C) 2009 red-agent <hell.director(a)gmail.com> +# Copyright (C) 2009 Alexander Cherniuk <ts33kr(a)gmail.com> # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff -r 02af28f35ad5 -r 3baea8f8173d src/command_system/dispatching.py --- a/src/command_system/dispatching.py Sun Nov 22 20:05:30 2009 +0200 +++ b/src/command_system/dispatching.py Mon Nov 23 16:08:09 2009 +0200 @@ -1,4 +1,4 @@ -# Copyright (C) 2009 red-agent <hell.director(a)gmail.com> +# Copyright (C) 2009 Alexander Cherniuk <ts33kr(a)gmail.com> # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff -r 02af28f35ad5 -r 3baea8f8173d src/command_system/errors.py --- a/src/command_system/errors.py Sun Nov 22 20:05:30 2009 +0200 +++ b/src/command_system/errors.py Mon Nov 23 16:08:09 2009 +0200 @@ -1,4 +1,4 @@ -# Copyright (C) 2009 red-agent <hell.director(a)gmail.com> +# Copyright (C) 2009 Alexander Cherniuk <ts33kr(a)gmail.com> # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff -r 02af28f35ad5 -r 3baea8f8173d src/command_system/framework.py --- a/src/command_system/framework.py Sun Nov 22 20:05:30 2009 +0200 +++ b/src/command_system/framework.py Mon Nov 23 16:08:09 2009 +0200 @@ -1,4 +1,4 @@ -# Copyright (C) 2009 red-agent <hell.director(a)gmail.com> +# Copyright (C) 2009 Alexander Cherniuk <ts33kr(a)gmail.com> # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff -r 02af28f35ad5 -r 3baea8f8173d src/command_system/implementation/__init__.py --- a/src/command_system/implementation/__init__.py Sun Nov 22 20:05:30 2009 +0200 +++ b/src/command_system/implementation/__init__.py Mon Nov 23 16:08:09 2009 +0200 @@ -1,4 +1,4 @@ -# Copyright (C) 2009 red-agent <hell.director(a)gmail.com> +# Copyright (C) 2009 Alexander Cherniuk <ts33kr(a)gmail.com> # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff -r 02af28f35ad5 -r 3baea8f8173d src/command_system/implementation/custom.py --- a/src/command_system/implementation/custom.py Sun Nov 22 20:05:30 2009 +0200 +++ b/src/command_system/implementation/custom.py Mon Nov 23 16:08:09 2009 +0200 @@ -1,4 +1,4 @@ -# Copyright (C) 2009 red-agent <hell.director(a)gmail.com> +# Copyright (C) 2009 Alexander Cherniuk <ts33kr(a)gmail.com> # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff -r 02af28f35ad5 -r 3baea8f8173d src/command_system/implementation/hosts.py --- a/src/command_system/implementation/hosts.py Sun Nov 22 20:05:30 2009 +0200 +++ b/src/command_system/implementation/hosts.py Mon Nov 23 16:08:09 2009 +0200 @@ -1,4 +1,4 @@ -# Copyright (C) 2009 red-agent <hell.director(a)gmail.com> +# Copyright (C) 2009 Alexander Cherniuk <ts33kr(a)gmail.com> # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff -r 02af28f35ad5 -r 3baea8f8173d src/command_system/implementation/middleware.py --- a/src/command_system/implementation/middleware.py Sun Nov 22 20:05:30 2009 +0200 +++ b/src/command_system/implementation/middleware.py Mon Nov 23 16:08:09 2009 +0200 @@ -1,4 +1,4 @@ -# Copyright (C) 2009 red-agent <hell.director(a)gmail.com> +# Copyright (C) 2009 Alexander Cherniuk <ts33kr(a)gmail.com> # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff -r 02af28f35ad5 -r 3baea8f8173d src/command_system/implementation/standard.py --- a/src/command_system/implementation/standard.py Sun Nov 22 20:05:30 2009 +0200 +++ b/src/command_system/implementation/standard.py Mon Nov 23 16:08:09 2009 +0200 @@ -1,4 +1,4 @@ -# Copyright (C) 2009 red-agent <hell.director(a)gmail.com> +# Copyright (C) 2009 Alexander Cherniuk <ts33kr(a)gmail.com> # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff -r 02af28f35ad5 -r 3baea8f8173d src/command_system/mapping.py --- a/src/command_system/mapping.py Sun Nov 22 20:05:30 2009 +0200 +++ b/src/command_system/mapping.py Mon Nov 23 16:08:09 2009 +0200 @@ -1,4 +1,4 @@ -# Copyright (C) 2009 red-agent <hell.director(a)gmail.com> +# Copyright (C) 2009 Alexander Cherniuk <ts33kr(a)gmail.com> # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by

1 0

gajim: Fixed refactoring artifact
by red-agent 22 Nov '09

22 Nov '09

changeset 02af28f35ad5 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=02af28f35ad5 description: Fixed refactoring artifact diffstat: src/profile_window.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r cf2388ff89fd -r 02af28f35ad5 src/profile_window.py --- a/src/profile_window.py Sun Nov 22 13:33:19 2009 +0200 +++ b/src/profile_window.py Sun Nov 22 20:05:30 2009 +0200 @@ -322,7 +322,7 @@ nick = '' if 'NICKNAME' in vcard_: nick = vcard_['NICKNAME'] - gajim.connections[self.account].send_nickname(self.account, nick) + gajim.connections[self.account].send_nickname(nick) if nick == '': nick = gajim.config.get_per('accounts', self.account, 'name') gajim.nicks[self.account] = nick

1 0

gajim: Fixed broken resource setting
by red-agent 22 Nov '09

22 Nov '09

changeset cf2388ff89fd in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=cf2388ff89fd description: Fixed broken resource setting diffstat: src/common/connection.py | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (11 lines): diff -r 3319f8995757 -r cf2388ff89fd src/common/connection.py --- a/src/common/connection.py Sat Nov 21 11:31:49 2009 +0200 +++ b/src/common/connection.py Sun Nov 22 13:33:19 2009 +0200 @@ -159,6 +159,7 @@ resource = Template(resource).safe_substitute({ 'hostname': socket.gethostname() }) + return resource def dispatch(self, event, data): '''always passes account name as first param'''

1 0

gajim: Added myself into the annals of history
by red-agent 21 Nov '09

21 Nov '09

changeset 3319f8995757 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=3319f8995757 description: Added myself into the annals of history Sorry for not disclosing my real name to the wide audience. I'm just that paranoid... diffstat: AUTHORS | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (11 lines): diff -r 190d65f8d94b -r 3319f8995757 AUTHORS --- a/AUTHORS Fri Nov 20 22:09:05 2009 +0100 +++ b/AUTHORS Sat Nov 21 11:31:49 2009 +0200 @@ -3,6 +3,7 @@ Nikos Kouremenos (kourem AT gmail.com) Yann Leboulanger (asterix AT lagaule.org) Julien Pivotto (roidelapluie AT gmail.com) +red-agent (hell.director AT gmail.com) Jonathan Schleifer (js-gajim AT webkeks.org) Travis Shirk (travis AT pobox.com) Brendan Taylor (whateley AT gmail.com)

1 0

gajim: fix resizing of the MUC occupant treeview when we resize ...
by Yann Leboulanger 20 Nov '09

20 Nov '09

changeset 190d65f8d94b in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=190d65f8d94b description: fix resizing of the MUC occupant treeview when we resize chat window. Fixes #5433 diffstat: src/groupchat_control.py | 17 +++++++++++++++-- 1 files changed, 15 insertions(+), 2 deletions(-) diffs (43 lines): diff -r dbdc410611bb -r 190d65f8d94b src/groupchat_control.py --- a/src/groupchat_control.py Fri Nov 20 13:49:56 2009 +0100 +++ b/src/groupchat_control.py Fri Nov 20 22:09:05 2009 +0100 @@ -317,6 +317,7 @@ id_ = self.list_treeview.connect('style-set', self.on_list_treeview_style_set) self.handlers[id_] = self.list_treeview + self.resize_from_another_muc = False # we want to know when the the widget resizes, because that is # an indication that the hpaned has moved... # FIXME: Find a better indicator that the hpaned has moved. @@ -446,17 +447,29 @@ menu.show_all() + def resize_occupant_treeview(self, position): + self.resize_from_another_muc = True + self.hpaned.set_position(position) + def reset_flag(): + self.resize_from_another_muc = False + # Reset the flag when everything will be redrawn, and in particular when + # on_treeview_size_allocate will have been called. + gobject.idle_add(reset_flag) + def on_treeview_size_allocate(self, widget, allocation): '''The MUC treeview has resized. Move the hpaned in all tabs to match''' + if self.resize_from_another_muc: + # Don't send the event to other MUC + return hpaned_position = self.hpaned.get_position() for account in gajim.gc_connected: for room_jid in [i for i in gajim.gc_connected[account] if \ - gajim.gc_connected[account][i]]: + gajim.gc_connected[account][i] and i != self.room_jid]: ctrl = gajim.interface.msg_win_mgr.get_gc_control(room_jid, account) if not ctrl: ctrl = gajim.interface.minimized_controls[account][room_jid] if ctrl: - ctrl.hpaned.set_position(hpaned_position) + ctrl.resize_occupant_treeview(hpaned_position) def iter_contact_rows(self): '''iterate over all contact rows in the tree model'''

1 0

gajim: updated en_GB translation
by Yann Leboulanger 20 Nov '09

20 Nov '09

changeset 80c991b8d9b9 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=80c991b8d9b9 description: updated en_GB translation diffstat: po/en_GB.po | 980 ++++++++++++++++++++++++++++++++--------------------------------- 1 files changed, 483 insertions(+), 497 deletions(-) diffs (truncated from 2792 to 300 lines): diff -r d824969ef13a -r 80c991b8d9b9 po/en_GB.po --- a/po/en_GB.po Wed Nov 18 11:12:06 2009 +0100 +++ b/po/en_GB.po Fri Nov 20 19:46:54 2009 +0100 @@ -5,10 +5,10 @@ # Jeff Bailes <thepizzaking(a)gmail.com>, 2006, 2009. msgid "" msgstr "" -"Project-Id-Version: Gajim - A Jabber Instant Messager 0.11.1\n" +"Project-Id-Version: Gajim - A Jabber Instant Messager 0.13\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-10-28 22:17+0100\n" -"PO-Revision-Date: 2009-10-29 18:52+1100\n" +"POT-Creation-Date: 2009-11-15 17:09+0100\n" +"PO-Revision-Date: 2009-11-20 20:49+1100\n" "Last-Translator: Jeff Bailes <thepizzaking(a)gmail.com>\n" "Language-Team: English <en_gb(a)li.org>\n" "MIME-Version: 1.0\n" @@ -290,8 +290,8 @@ #: ../data/glade/account_modification_window.glade.h:17 #: ../data/glade/accounts_window.glade.h:22 #: ../data/glade/preferences_window.glade.h:50 ../src/common/contacts.py:98 -#: ../src/dialogs.py:103 ../src/dialogs.py:111 ../src/roster_window.py:2753 -#: ../src/roster_window.py:5351 +#: ../src/dialogs.py:103 ../src/dialogs.py:111 ../src/roster_window.py:2770 +#: ../src/roster_window.py:5368 msgid "General" msgstr "General" @@ -364,8 +364,8 @@ #: ../src/config.py:2038 ../src/config.py:2117 ../src/config.py:2130 #: ../src/config.py:3317 ../src/config.py:3390 ../src/dialogs.py:293 #: ../src/dialogs.py:295 ../src/dialogs.py:498 ../src/dialogs.py:511 -#: ../src/roster_window.py:2807 ../src/roster_window.py:2813 -#: ../src/roster_window.py:2818 +#: ../src/roster_window.py:2824 ../src/roster_window.py:2830 +#: ../src/roster_window.py:2835 msgid "None" msgstr "None" @@ -534,7 +534,7 @@ msgstr "Mer_ge accounts" #. Rename -#: ../data/glade/accounts_window.glade.h:42 ../src/roster_window.py:5302 +#: ../data/glade/accounts_window.glade.h:42 ../src/roster_window.py:5319 msgid "Re_name" msgstr "Re_name" @@ -1057,9 +1057,8 @@ msgstr "Assign Open_PGP Key..." #: ../data/glade/contact_context_menu.glade.h:4 -#, fuzzy msgid "E_xecute Command..." -msgstr "Execute Command..." +msgstr "E_xecute Command..." #: ../data/glade/contact_context_menu.glade.h:5 msgid "Edit _Groups..." @@ -1067,8 +1066,8 @@ #. Invite to #. Invite to Groupchat -#: ../data/glade/contact_context_menu.glade.h:6 ../src/roster_window.py:5257 -#: ../src/roster_window.py:5412 +#: ../data/glade/contact_context_menu.glade.h:6 ../src/roster_window.py:5274 +#: ../src/roster_window.py:5429 msgid "In_vite to" msgstr "In_vite to" @@ -1081,8 +1080,8 @@ msgstr "Remo_ve" #. Send Custom Status -#: ../data/glade/contact_context_menu.glade.h:9 ../src/roster_window.py:5267 -#: ../src/roster_window.py:5497 +#: ../data/glade/contact_context_menu.glade.h:9 ../src/roster_window.py:5284 +#: ../src/roster_window.py:5514 msgid "Send Cus_tom Status" msgstr "Send Cus_tom Status" @@ -1115,8 +1114,8 @@ msgstr "_Allow him/her to see my status" #: ../data/glade/contact_context_menu.glade.h:18 -#: ../data/glade/gc_occupants_menu.glade.h:7 ../src/roster_window.py:5330 -#: ../src/roster_window.py:5449 ../src/roster_window.py:5578 +#: ../data/glade/gc_occupants_menu.glade.h:7 ../src/roster_window.py:5347 +#: ../src/roster_window.py:5466 ../src/roster_window.py:5595 msgid "_Block" msgstr "_Block" @@ -1127,7 +1126,7 @@ #: ../data/glade/contact_context_menu.glade.h:20 #: ../data/glade/gc_control_popup_menu.glade.h:6 #: ../data/glade/gc_occupants_menu.glade.h:8 -#: ../data/glade/roster_window.glade.h:21 ../src/roster_window.py:5647 +#: ../data/glade/roster_window.glade.h:21 ../src/roster_window.py:5664 msgid "_History" msgstr "_History" @@ -1148,8 +1147,8 @@ msgstr "_Subscription" #: ../data/glade/contact_context_menu.glade.h:25 -#: ../data/glade/gc_occupants_menu.glade.h:13 ../src/roster_window.py:5324 -#: ../src/roster_window.py:5443 ../src/roster_window.py:5575 +#: ../data/glade/gc_occupants_menu.glade.h:13 ../src/roster_window.py:5341 +#: ../src/roster_window.py:5460 ../src/roster_window.py:5592 msgid "_Unblock" msgstr "_Unblock" @@ -1433,8 +1432,9 @@ msgid "<big>Welcome to Gajim History Logs Manager</big>" msgstr "<big>Welcome to Gajim History Logs Manager</big>" +#. Change label for accept_button to action name instead of 'OK'. #: ../data/glade/history_manager.glade.h:4 ../src/dialogs.py:2884 -#: ../src/dialogs.py:2987 +#: ../src/dialogs.py:2981 msgid "Delete" msgstr "Delete" @@ -1488,9 +1488,8 @@ msgstr "_Log conversation history" #: ../data/glade/join_groupchat_window.glade.h:2 -#, fuzzy msgid "Bookmark this room" -msgstr "Bookmark this room (Ctrl+B)" +msgstr "Bookmark this room" #: ../data/glade/join_groupchat_window.glade.h:3 ../src/dialogs.py:1972 msgid "Join Group Chat" @@ -2249,9 +2248,8 @@ msgstr "All" #: ../data/glade/privacy_list_window.glade.h:7 -#, fuzzy msgid "All (including subscription)" -msgstr "all by subscription" +msgstr "All (including subscription)" #: ../data/glade/privacy_list_window.glade.h:8 msgid "Allow" @@ -2269,7 +2267,7 @@ msgid "Order:" msgstr "Order:" -#: ../data/glade/privacy_list_window.glade.h:12 ../src/dialogs.py:3114 +#: ../data/glade/privacy_list_window.glade.h:12 ../src/dialogs.py:3108 msgid "Privacy List" msgstr "Privacy List" @@ -2413,7 +2411,7 @@ msgstr "Prefix:" #: ../data/glade/profile_window.glade.h:25 -#: ../data/glade/vcard_information_window.glade.h:30 ../src/vcard.py:327 +#: ../data/glade/vcard_information_window.glade.h:30 ../src/vcard.py:325 msgid "Role:" msgstr "Role:" @@ -2473,8 +2471,8 @@ #. Remove group #. Remove -#: ../data/glade/remove_account_window.glade.h:4 ../src/roster_window.py:5339 -#: ../src/roster_window.py:5459 ../src/roster_window.py:5588 +#: ../data/glade/remove_account_window.glade.h:4 ../src/roster_window.py:5356 +#: ../src/roster_window.py:5476 ../src/roster_window.py:5605 msgid "_Remove" msgstr "_Remove" @@ -2495,13 +2493,14 @@ msgstr "Roster Item Exchange" #: ../data/glade/roster_item_exchange_window.glade.h:4 +#: ../data/glade/service_registration_window.glade.h:3 +msgid "_OK" +msgstr "_OK" + +#: ../data/glade/roster_item_exchange_window.glade.h:5 msgid "gtk-cancel" msgstr "gtk-cancel" -#: ../data/glade/roster_item_exchange_window.glade.h:5 -msgid "gtk-ok" -msgstr "gtk-ok" - #: ../data/glade/roster_window.glade.h:1 msgid "Add _Contact..." msgstr "Add _Contact..." @@ -2598,7 +2597,7 @@ msgstr "_Add contact" #. Information -#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5600 +#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5617 msgid "_Information" msgstr "_Information" @@ -2622,10 +2621,6 @@ msgid "_Cancel" msgstr "_Cancel" -#: ../data/glade/service_registration_window.glade.h:3 -msgid "_OK" -msgstr "_OK" - #: ../data/glade/single_message_window.glade.h:1 msgid "0" msgstr "0" @@ -3049,45 +3044,45 @@ msgid "If you send a file to %s, he/she will know your real Jabber ID." msgstr "If you send a file to %s, he/she will know your real Jabber ID." -#: ../src/chat_control.py:1317 ../src/chat_control.py:1718 +#: ../src/chat_control.py:1316 ../src/chat_control.py:1713 msgid "GPG encryption enabled" msgstr "GPG encryption enabled" #. Add to roster -#: ../src/chat_control.py:1346 ../src/common/contacts.py:113 +#: ../src/chat_control.py:1343 ../src/common/contacts.py:113 #: ../src/common/helpers.py:55 ../src/common/helpers.py:231 #: ../src/conversation_textview.py:903 ../src/dialogs.py:1031 -#: ../src/dialogs.py:1882 ../src/dialogs.py:1907 ../src/gajim.py:999 -#: ../src/gajim.py:1750 ../src/gui_menu_builder.py:243 -#: ../src/gui_menu_builder.py:385 ../src/roster_window.py:988 -#: ../src/roster_window.py:1622 ../src/roster_window.py:1624 -#: ../src/roster_window.py:1926 ../src/roster_window.py:3187 -#: ../src/roster_window.py:3213 +#: ../src/dialogs.py:1882 ../src/dialogs.py:1907 ../src/gajim.py:1007 +#: ../src/gajim.py:1758 ../src/gui_menu_builder.py:249 +#: ../src/gui_menu_builder.py:395 ../src/roster_window.py:1002 +#: ../src/roster_window.py:1639 ../src/roster_window.py:1641 +#: ../src/roster_window.py:1943 ../src/roster_window.py:3204 +#: ../src/roster_window.py:3230 msgid "Not in Roster" msgstr "Not in Roster" -#: ../src/chat_control.py:1359 +#: ../src/chat_control.py:1356 msgid "This contact does not support file transfer." msgstr "This contact does not support file transfer." -#: ../src/chat_control.py:1362 +#: ../src/chat_control.py:1359 msgid "You need to know the real JID of the contact to send him or her a file." msgstr "" "You need to know the real JID of the contact to send him or her a file." -#: ../src/chat_control.py:1469 ../src/tooltips.py:626 +#: ../src/chat_control.py:1466 ../src/tooltips.py:626 msgid "Unknown Artist" msgstr "Unknown Artist" -#: ../src/chat_control.py:1471 ../src/tooltips.py:631 +#: ../src/chat_control.py:1468 ../src/tooltips.py:631 msgid "Unknown Title" msgstr "Unknown Title" -#: ../src/chat_control.py:1473 ../src/tooltips.py:636 +#: ../src/chat_control.py:1470 ../src/tooltips.py:636 msgid "Unknown Source" msgstr "Unknown Source" -#: ../src/chat_control.py:1476 ../src/tooltips.py:638 +#: ../src/chat_control.py:1473 ../src/tooltips.py:638 #, python-format msgid "" "\"%(title)s\" by %(artist)s\n" @@ -3096,17 +3091,17 @@ "\"%(title)s\" by %(artist)s\n" "from %(source)s" -#: ../src/chat_control.py:1613 +#: ../src/chat_control.py:1609 #, python-format msgid "%(nickname)s from group chat %(room_name)s" msgstr "%(nickname)s from group chat %(room_name)s" #. No key assigned nor a key is used by remote contact -#: ../src/chat_control.py:1698 ../src/dialogs.py:4484 +#: ../src/chat_control.py:1693 ../src/dialogs.py:4478 msgid "No GPG key assigned" msgstr "No GPG key assigned" -#: ../src/chat_control.py:1699 +#: ../src/chat_control.py:1694 msgid "" "No GPG key is assigned to this contact. So you cannot encrypt messages with " "GPG." @@ -3114,50 +3109,50 @@ "No GPG key is assigned to this contact. So you cannot encrypt messages with " "GPG." -#: ../src/chat_control.py:1708 +#: ../src/chat_control.py:1703

1 0

gajim: fix http message parsing, it may contain \n\n!
by Yann Leboulanger 20 Nov '09

20 Nov '09

changeset d824969ef13a in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=d824969ef13a description: fix http message parsing, it may contain \n\n! diffstat: src/common/xmpp/transports_nb.py | 18 +++++++++++------- 1 files changed, 11 insertions(+), 7 deletions(-) diffs (59 lines): diff -r 48080bc9e93d -r d824969ef13a src/common/xmpp/transports_nb.py --- a/src/common/xmpp/transports_nb.py Mon Nov 16 16:42:40 2009 +0100 +++ b/src/common/xmpp/transports_nb.py Wed Nov 18 11:12:06 2009 +0100 @@ -655,7 +655,7 @@ self.recvbuff = '%s%s' % (self.recvbuff or '', data) statusline, headers, httpbody, buffer_rest = self.parse_http_message( self.recvbuff) - + if not (statusline and headers and httpbody): log.debug('Received incomplete HTTP response') return @@ -667,12 +667,12 @@ self.expected_length = int(headers['Content-Length']) if 'Connection' in headers and headers['Connection'].strip()=='close': self.close_current_connection = True - + if self.expected_length > len(httpbody): # If we haven't received the whole HTTP mess yet, let's end the thread. # It will be finnished from one of following recvs on plugged socket. - log.info('not enough bytes in HTTP response - %d expected, %d got' % - (self.expected_length, len(self.recvbuff))) + log.info('not enough bytes in HTTP response - %d expected, got %d' % + (self.expected_length, len(httpbody))) else: # First part of buffer has been extraced and is going to be handled, # remove it from buffer @@ -724,6 +724,7 @@ http_rest - what is left in the message after a full HTTP header + body ''' message = message.replace('\r','') + message = message.lstrip('\n') splitted = message.split('\n\n') if len(splitted) < 2: # no complete http message. Keep filling the buffer until we find one @@ -731,9 +732,6 @@ return ('', '', '', buffer_rest) else: (header, httpbody) = splitted[:2] - if httpbody.endswith('\n'): - httpbody = httpbody[:-1] - buffer_rest = "\n\n".join(splitted[2:]) header = header.split('\n') statusline = header[0].split(' ', 2) header = header[1:] @@ -741,6 +739,12 @@ for dummy in header: row = dummy.split(' ', 1) headers[row[0][:-1]] = row[1] + body_size = headers['Content-Length'] + rest_splitted = splitted[2:] + while (len(httpbody) < body_size) and rest_splitted: + # Complete httpbody until it has the announced size + httpbody = '\n\n'.join([httpbody, rest_splitted.pop(0)]) + buffer_rest = "\n\n".join(rest_splitted) return (statusline, headers, httpbody, buffer_rest)

1 0

gajim: properly decode string in history manager. Fixes #5430
by Yann Leboulanger 20 Nov '09

20 Nov '09

changeset 48080bc9e93d in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=48080bc9e93d description: properly decode string in history manager. Fixes #5430 diffstat: src/history_manager.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diffs (14 lines): diff -r 1f9113798039 -r 48080bc9e93d src/history_manager.py --- a/src/history_manager.py Thu Nov 12 22:13:11 2009 +0100 +++ b/src/history_manager.py Mon Nov 16 16:42:40 2009 +0100 @@ -610,8 +610,8 @@ liststore, list_of_paths)) def on_search_db_button_clicked(self, widget): - text = self.search_entry.get_text() - if text == '': + text = self.search_entry.get_text().decode('utf-8') + if not text: return self.welcome_vbox.hide()

1 0

gajim: fix receiving long messages in several parts with BOSH. s...
by Yann Leboulanger 20 Nov '09

20 Nov '09

changeset 1f9113798039 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=1f9113798039 description: fix receiving long messages in several parts with BOSH. see #5401 diffstat: src/common/xmpp/transports_nb.py | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diffs (32 lines): diff -r 25f6fbcbf106 -r 1f9113798039 src/common/xmpp/transports_nb.py --- a/src/common/xmpp/transports_nb.py Thu Nov 12 21:42:20 2009 +0100 +++ b/src/common/xmpp/transports_nb.py Thu Nov 12 22:13:11 2009 +0100 @@ -653,7 +653,8 @@ # append currently received data to HTTP msg in buffer self.recvbuff = '%s%s' % (self.recvbuff or '', data) - statusline, headers, httpbody, self.recvbuff = self.parse_http_message(self.recvbuff) + statusline, headers, httpbody, buffer_rest = self.parse_http_message( + self.recvbuff) if not (statusline and headers and httpbody): log.debug('Received incomplete HTTP response') @@ -673,6 +674,10 @@ log.info('not enough bytes in HTTP response - %d expected, %d got' % (self.expected_length, len(self.recvbuff))) else: + # First part of buffer has been extraced and is going to be handled, + # remove it from buffer + self.recvbuff = buffer_rest + # everything was received self.expected_length = 0 @@ -716,6 +721,7 @@ headers - dictionary of headers e.g. {'Content-Length': '604', 'Content-Type': 'text/xml; charset=utf-8'}, httpbody - string with http body) + http_rest - what is left in the message after a full HTTP header + body ''' message = message.replace('\r','') splitted = message.split('\n\n')

1 0

← Newer
1
...
8
9
10
11
12
13
14
...
29
Older →

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits November 2009