Commits July 2010

commits@gajim.org

7 participants
83 discussions

gajim: typo in protocol.py
by Yann Leboulanger 30 Jul '10

30 Jul '10

changeset 759829f89266 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=759829f89266 description: typo in protocol.py diffstat: src/common/xmpp/protocol.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 34d6dcb9b154 -r 759829f89266 src/common/xmpp/protocol.py --- a/src/common/xmpp/protocol.py Fri Jul 30 16:42:51 2010 +0200 +++ b/src/common/xmpp/protocol.py Sat Jul 31 00:54:13 2010 +0200 @@ -717,7 +717,7 @@ if xmllang: dom = NodeBuilder('<body xmlns="%s" xml:lang="%s">%s</body>' % (NS_XHTML, xmllang, val)).getDom() else: - dom = NodeBuilder('<body xmlns="%s">%s</body>, 0' % (NS_XHTM, val)).getDom() + dom = NodeBuilder('<body xmlns="%s">%s</body>, 0' % (NS_XHTML, val)).getDom() if self.getTag('html'): self.getTag('html').addChild(node=dom) else:

1 0

gajim-website: dd missing ;
by Yann Leboulanger 30 Jul '10

30 Jul '10

changeset 6a4356f84a9f in /home/hg/repos/gajim-website details:http://hg.gajim.org/gajim-website?cmd=changeset;node=6a4356f84a9f description: dd missing ; diffstat: dev.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r b83b8a63875a -r 6a4356f84a9f dev.php --- a/dev.php Fri Jul 30 21:14:57 2010 +0200 +++ b/dev.php Fri Jul 30 21:15:42 2010 +0200 @@ -53,7 +53,7 @@ <input type="hidden" name="hosted_button_id" value="ASTY4K884QP26"> <input type="image" src="https://www.paypal.com/en_US/i/btn/btn_donateCC_LG.gif" border="0" name="submit" alt="PayPal - The safer, easier way to pay online!"> <img alt="" border="0" src="https://www.paypal.com/fr_FR/i/scr/pixel.gif" width="1" height="1"> - </form>') + </form>'); print (" </li>\n"); print (" </ul>\n");

1 0

gajim-website: add a paypal donate button. Fixes #5828
by Yann Leboulanger 30 Jul '10

30 Jul '10

changeset b83b8a63875a in /home/hg/repos/gajim-website details:http://hg.gajim.org/gajim-website?cmd=changeset;node=b83b8a63875a description: add a paypal donate button. Fixes #5828 diffstat: dev.php | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diffs (18 lines): diff -r af780975d477 -r b83b8a63875a dev.php --- a/dev.php Wed Jul 21 13:36:53 2010 +0200 +++ b/dev.php Fri Jul 30 21:14:57 2010 +0200 @@ -47,7 +47,13 @@ print _(" Bug reporting: in case you find a bug, do not hesitate to")." <a href=\"http://trac.gajim.org/newticket\">"._("report it")."</a>.\n"; print (" </li>\n"); print (" <li>\n"); -print _(" Donating: contact me on Jabber (asterix(a)jabber.lagaule.org)")."\n"; +print _(" Donating: ")."\n"; +print _('<form action="https://www.paypal.com/cgi-bin/webscr" method="post"> + <input type="hidden" name="cmd" value="_s-xclick"> + <input type="hidden" name="hosted_button_id" value="ASTY4K884QP26"> + <input type="image" src="https://www.paypal.com/en_US/i/btn/btn_donateCC_LG.gif" border="0" name="submit" alt="PayPal - The safer, easier way to pay online!"> + <img alt="" border="0" src="https://www.paypal.com/fr_FR/i/scr/pixel.gif" width="1" height="1"> + </form>') print (" </li>\n"); print (" </ul>\n");

1 0

gajim: fix wrong var name. Fixes #5827
by Yann Leboulanger 30 Jul '10

30 Jul '10

changeset 34d6dcb9b154 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=34d6dcb9b154 description: fix wrong var name. Fixes #5827 diffstat: src/common/connection_handlers.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diffs (19 lines): diff -r 59262f86a491 -r 34d6dcb9b154 src/common/connection_handlers.py --- a/src/common/connection_handlers.py Fri Jul 30 15:16:09 2010 +0200 +++ b/src/common/connection_handlers.py Fri Jul 30 16:42:51 2010 +0200 @@ -2320,7 +2320,7 @@ class HelperEvent: def get_jid_resource(self): if self.id_ in self.conn.groupchat_jids: - who = self.conn.groupchat_jids[self.id_] + self.fjid = self.conn.groupchat_jids[self.id_] del self.conn.groupchat_jids[self.id_] else: self.fjid = helpers.get_full_jid_from_iq(self.iq_obj) @@ -2574,4 +2574,4 @@ self.exchange_items_list[jid].append(name) self.exchange_items_list[jid].append(groups) if exchange_items_list: - return True \ No newline at end of file + return True

1 0

gajim: prevent duplicate bookmarks
by Yann Leboulanger 30 Jul '10

30 Jul '10

changeset 59262f86a491 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=59262f86a491 description: prevent duplicate bookmarks diffstat: src/common/connection_handlers.py | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diffs (13 lines): diff -r 7a8fd81f20de -r 59262f86a491 src/common/connection_handlers.py --- a/src/common/connection_handlers.py Fri Jul 30 14:38:19 2010 +0200 +++ b/src/common/connection_handlers.py Fri Jul 30 15:16:09 2010 +0200 @@ -1128,7 +1128,8 @@ log.warn('Invalid JID: %s, ignoring it' % conf.getAttr('jid')) continue - if bm not in self.bookmarks: + bm_jids = [b['jid'] for b in self.bookmarks] + if bm['jid'] not in bm_jids: self.bookmarks.append(bm) if storage_type == 'xml': # We got a bookmark that was not in pubsub

1 0

gajim: Give focus to message textview when we open a new chat. F...
by Yann Leboulanger 30 Jul '10

30 Jul '10

changeset 7a8fd81f20de in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=7a8fd81f20de description: Give focus to message textview when we open a new chat. Fixes #5740 diffstat: src/message_window.py | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diffs (24 lines): diff -r ed394b2ccf73 -r 7a8fd81f20de src/message_window.py --- a/src/message_window.py Fri Jul 30 01:30:59 2010 +0200 +++ b/src/message_window.py Fri Jul 30 14:38:19 2010 +0200 @@ -298,9 +298,10 @@ self.notebook.show_all() else: self.window.show_all() - # NOTE: we do not call set_control_active(True) since we don't know whether - # the tab is the active one. + # NOTE: we do not call set_control_active(True) since we don't know + # whether the tab is the active one. self.show_title() + gobject.idle_add(control.msg_textview.grab_focus) def on_tab_eventbox_button_press_event(self, widget, event, child): if event.button == 3: # right click @@ -511,6 +512,7 @@ ctrl_page = self.notebook.page_num(ctrl.widget) self.notebook.set_current_page(ctrl_page) self.window.present() + gobject.idle_add(ctrl.msg_textview.grab_focus) def remove_tab(self, ctrl, method, reason = None, force = False): """

1 0

gajim: use a nec Event to dispatch RIE events
by Yann Leboulanger 29 Jul '10

29 Jul '10

changeset ed394b2ccf73 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=ed394b2ccf73 description: use a nec Event to dispatch RIE events diffstat: src/common/connection_handlers.py | 94 ++++++++++++++++++++++---------------- src/gui_interface.py | 8 ++- 2 files changed, 59 insertions(+), 43 deletions(-) diffs (149 lines): diff -r b0b37486595d -r ed394b2ccf73 src/common/connection_handlers.py --- a/src/common/connection_handlers.py Thu Jul 29 12:50:54 2010 +0200 +++ b/src/common/connection_handlers.py Fri Jul 30 01:30:59 2010 +0200 @@ -1277,44 +1277,9 @@ """ XEP-0144 Roster Item Echange """ - exchange_items_list = {} - jid_from = helpers.get_full_jid_from_iq(msg) - items_list = msg.getTag('x').getChildren() - if not items_list: - return - action = items_list[0].getAttr('action') - if action == None: - action = 'add' - for item in msg.getTag('x', - namespace=common.xmpp.NS_ROSTERX).getChildren(): - try: - jid = helpers.parse_jid(item.getAttr('jid')) - except common.helpers.InvalidFormat: - log.warn('Invalid JID: %s, ignoring it' % item.getAttr('jid')) - continue - name = item.getAttr('name') - contact = gajim.contacts.get_contact(self.name, jid) - groups = [] - same_groups = True - for group in item.getTags('group'): - groups.append(group.getData()) - # check that all suggested groups are in the groups we have for this - # contact - if not contact or group not in contact.groups: - same_groups = False - if contact: - # check that all groups we have for this contact are in the - # suggested groups - for group in contact.groups: - if group not in groups: - same_groups = False - if contact.sub in ('both', 'to') and same_groups: - continue - exchange_items_list[jid] = [] - exchange_items_list[jid].append(name) - exchange_items_list[jid].append(groups) - if exchange_items_list: - self.dispatch('ROSTERX', (action, exchange_items_list, jid_from)) + log.debug('rosterItemExchangeCB') + gajim.nec.push_incoming_event(RosterItemExchangeEvent(None, + conn=self, iq_obj=msg)) raise common.xmpp.NodeProcessed def _messageCB(self, con, msg): @@ -2357,8 +2322,8 @@ who = self.conn.groupchat_jids[self.id_] del self.conn.groupchat_jids[self.id_] else: - who = helpers.get_full_jid_from_iq(self.iq_obj) - self.jid, self.resource = gajim.get_room_and_nick_from_fjid(who) + self.fjid = helpers.get_full_jid_from_iq(self.iq_obj) + self.jid, self.resource = gajim.get_room_and_nick_from_fjid(self.fjid) def get_id(self): self.id_ = self.iq_obj.getID() @@ -2560,3 +2525,52 @@ log.debug(('You have %s new gmail e-mails on %s.') % (self.newmsgs, self.jid)) return True + +class RosterItemExchangeEvent(nec.NetworkIncomingEvent, HelperEvent): + name = 'roster-item-exchange-received' + base_network_events = [] + + def generate(self): + if not self.conn: + self.conn = self.base_event.conn + if not self.iq_obj: + self.iq_obj = self.base_event.xmpp_iq + + self.get_jid_resource() + self.exchange_items_list = {} + items_list = msg.getTag('x').getChildren() + if not items_list: + return + self.action = items_list[0].getAttr('action') + if self.action is None: + self.action = 'add' + for item in msg.getTag('x', namespace=common.xmpp.NS_ROSTERX).\ + getChildren(): + try: + jid = helpers.parse_jid(item.getAttr('jid')) + except common.helpers.InvalidFormat: + log.warn('Invalid JID: %s, ignoring it' % item.getAttr('jid')) + continue + name = item.getAttr('name') + contact = gajim.contacts.get_contact(self.conn.name, jid) + groups = [] + same_groups = True + for group in item.getTags('group'): + groups.append(group.getData()) + # check that all suggested groups are in the groups we have for this + # contact + if not contact or group not in contact.groups: + same_groups = False + if contact: + # check that all groups we have for this contact are in the + # suggested groups + for group in contact.groups: + if group not in groups: + same_groups = False + if contact.sub in ('both', 'to') and same_groups: + continue + self.exchange_items_list[jid] = [] + self.exchange_items_list[jid].append(name) + self.exchange_items_list[jid].append(groups) + if exchange_items_list: + return True \ No newline at end of file diff -r b0b37486595d -r ed394b2ccf73 src/gui_interface.py --- a/src/gui_interface.py Thu Jul 29 12:50:54 2010 +0200 +++ b/src/gui_interface.py Fri Jul 30 01:30:59 2010 +0200 @@ -1835,9 +1835,10 @@ if 'pep_services' in self.instances[account]: self.instances[account]['pep_services'].config(data[0], data[1]) - def handle_event_roster_item_exchange(self, account, data): + def handle_event_roster_item_exchange(self, obj): # data = (action in [add, delete, modify], exchange_list, jid_from) - dialogs.RosterItemExchangeWindow(account, data[0], data[1], data[2]) + dialogs.RosterItemExchangeWindow(obj.conn.name, obj.action, + obj.exchange_items_list, obj.fjid) def handle_event_unique_room_id_supported(self, account, data): """ @@ -2126,7 +2127,6 @@ 'SEARCH_FORM': [self.handle_event_search_form], 'SEARCH_RESULT': [self.handle_event_search_result], 'RESOURCE_CONFLICT': [self.handle_event_resource_conflict], - 'ROSTERX': [self.handle_event_roster_item_exchange], 'PEP_CONFIG': [self.handle_event_pep_config], 'UNIQUE_ROOM_ID_UNSUPPORTED': \ [self.handle_event_unique_room_id_unsupported], @@ -2150,6 +2150,8 @@ 'gmail-notify': [self.handle_event_gmail_notify], 'http-auth-received': [self.handle_event_http_auth], 'last-result-received': [self.handle_event_last_status_time], + 'roster-item-exchange-received': \ + [self.handle_event_roster_item_exchange], } def register_core_handlers(self):

1 0

gajim: updated Serbian translation
by Yann Leboulanger 29 Jul '10

29 Jul '10

changeset cea532975923 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=cea532975923 description: updated Serbian translation diffstat: po/sr.po | 555 +++++++++++++++++++++++++-------------------------------- po/sr(a)Latn.po | 556 +++++++++++++++++++++++++-------------------------------- 2 files changed, 482 insertions(+), 629 deletions(-) diffs (truncated from 3374 to 300 lines): diff -r 79d4787f14bc -r cea532975923 po/sr.po --- a/po/sr.po Thu Jul 29 09:49:00 2010 +0200 +++ b/po/sr.po Fri Jul 30 01:04:04 2010 +0200 @@ -4,13 +4,13 @@ # This file is distributed under the same license as the gajim package. # # B. Kokanovic <branko.kokanovic(a)gmail.com>, 2007. -# Branko Kokanovic <branko.kokanovic(a)gmail.com>, 2008, 2009. +# Branko Kokanovic <branko.kokanovic(a)gmail.com>, 2008, 2009, 2010. msgid "" msgstr "" "Project-Id-Version: sr\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-07-27 11:28+0200\n" -"PO-Revision-Date: 2009-10-29 23:50+0100\n" +"POT-Creation-Date: 2010-07-27 16:16+0200\n" +"PO-Revision-Date: 2010-07-29 20:25+0200\n" "Last-Translator: Branko Kokanovic <branko.kokanovic(a)gmail.com>\n" "Language-Team: <sr(a)li.org>\n" "Language: \n" @@ -229,9 +229,8 @@ msgstr "Аутоматско повезивање када се веза изгуби" #: ../data/gui/accounts_window.ui.h:11 -#, fuzzy msgid "Browse..." -msgstr "_Преглед" +msgstr "_Разгледај" #: ../data/gui/accounts_window.ui.h:12 msgid "C_onnect on Gajim startup" @@ -250,9 +249,8 @@ "везе." #: ../data/gui/accounts_window.ui.h:15 -#, fuzzy msgid "Choose Client Cert" -msgstr "Одаберите датотеку за слање..." +msgstr "Одаберите сертификат клијента" #: ../data/gui/accounts_window.ui.h:16 msgid "Choose _Key..." @@ -267,9 +265,8 @@ msgstr "Кликните да затражите ауторизацију свим контактима другог налога" #: ../data/gui/accounts_window.ui.h:19 -#, fuzzy msgid "Client certificate" -msgstr "Самопотписани сертификат" +msgstr "Сертификат клијента" #: ../data/gui/accounts_window.ui.h:20 msgid "Co_nnect on Gajim startup" @@ -445,7 +442,7 @@ #: ../data/gui/accounts_window.ui.h:53 msgid "The path to the client certificate and key in PKCS#12 format" -msgstr "" +msgstr "Путања до сертификата клијента и кључ у PKCS#12 формату" #: ../data/gui/accounts_window.ui.h:54 msgid "Use G_PG Agent" @@ -465,7 +462,7 @@ #: ../data/gui/accounts_window.ui.h:58 msgid "_Client Cert File:" -msgstr "" +msgstr "Датотека сертификата _клијента:" #: ../data/gui/accounts_window.ui.h:59 msgid "_Edit Personal Information..." @@ -549,9 +546,8 @@ msgstr "_Регистрација" #: ../data/gui/add_new_contact_window.ui.h:15 -#, fuzzy msgid "_Save subscription message" -msgstr "_Претплата" +msgstr "_Сачувај поруку претплате" #: ../data/gui/add_new_contact_window.ui.h:16 msgid "_User ID:" @@ -578,9 +574,8 @@ msgstr "Опис грешке" #: ../data/gui/adhoc_commands_window.ui.h:6 -#, fuzzy msgid "F_inish" -msgstr "_Заврши" +msgstr "Заврш_и" #: ../data/gui/adhoc_commands_window.ui.h:7 msgid "Please wait while retrieving command list..." @@ -701,43 +696,36 @@ msgstr "Запослен" #: ../data/gui/advanced_notifications_window.ui.h:10 -#, fuzzy msgid "Contact Change Status " -msgstr "Контакт променио статус" +msgstr "Контакт променио статус " #: ../data/gui/advanced_notifications_window.ui.h:11 -#, fuzzy msgid "Contact Disconnected " -msgstr "Контакт Отишао Са Везе" +msgstr "Контакт Отишао Са Везе " #: ../data/gui/advanced_notifications_window.ui.h:12 msgid "Don't have " msgstr "Немам " #: ../data/gui/advanced_notifications_window.ui.h:13 -#, fuzzy msgid "File Transfer Finished" -msgstr "Преноси датотека" +msgstr "Пренос датотеке завршен" #: ../data/gui/advanced_notifications_window.ui.h:14 -#, fuzzy msgid "File Transfer Request " -msgstr "Захтев за преносом датотеке" +msgstr "Захтев за преносом датотеке " #: ../data/gui/advanced_notifications_window.ui.h:15 -#, fuzzy msgid "File Transfer Started " -msgstr "Пренос датотеке заустављен" +msgstr "Пренос датотеке започет " #: ../data/gui/advanced_notifications_window.ui.h:16 -#, fuzzy msgid "Group Chat Message Highlight " -msgstr "Бојење Порука Са Групног Разговора" +msgstr "Обојена Порука Са Групног Разговора " #: ../data/gui/advanced_notifications_window.ui.h:17 -#, fuzzy msgid "Group Chat Message Received " -msgstr "Примљена Порука Са Групног Разговора" +msgstr "Примљена Порука Са Групног Разговора " #: ../data/gui/advanced_notifications_window.ui.h:18 msgid "Have " @@ -770,9 +758,8 @@ msgstr "Пуштање звукове" #: ../data/gui/advanced_notifications_window.ui.h:25 -#, fuzzy msgid "Receive a Message" -msgstr "Нова Приватна Порука" +msgstr "Примљена Порука" #: ../data/gui/advanced_notifications_window.ui.h:26 msgid "When " @@ -824,22 +811,20 @@ msgstr "и ја " #: ../data/gui/advanced_notifications_window.ui.h:38 -#, fuzzy msgid "contact(s)" -msgstr "Контакти" +msgstr "контакт(и)" #: ../data/gui/advanced_notifications_window.ui.h:39 msgid "everybody" -msgstr "" +msgstr "сви" #: ../data/gui/advanced_notifications_window.ui.h:40 msgid "for " msgstr "за" #: ../data/gui/advanced_notifications_window.ui.h:41 -#, fuzzy msgid "group(s)" -msgstr "Групе" +msgstr "група(е)" #: ../data/gui/advanced_notifications_window.ui.h:42 msgid "when I'm in" @@ -966,47 +951,47 @@ #: ../data/gui/chat_control.ui.h:2 msgid "*" -msgstr "" +msgstr "*" #: ../data/gui/chat_control.ui.h:3 ../data/gui/single_message_window.ui.h:1 msgid "0" -msgstr "О" +msgstr "0" #: ../data/gui/chat_control.ui.h:4 msgid "1" -msgstr "" +msgstr "1" #: ../data/gui/chat_control.ui.h:5 msgid "2" -msgstr "" +msgstr "2" #: ../data/gui/chat_control.ui.h:6 msgid "3" -msgstr "" +msgstr "3" #: ../data/gui/chat_control.ui.h:7 msgid "4" -msgstr "" +msgstr "4" #: ../data/gui/chat_control.ui.h:8 msgid "5" -msgstr "" +msgstr "5" #: ../data/gui/chat_control.ui.h:9 msgid "6" -msgstr "" +msgstr "6" #: ../data/gui/chat_control.ui.h:10 msgid "7" -msgstr "" +msgstr "7" #: ../data/gui/chat_control.ui.h:11 msgid "8" -msgstr "" +msgstr "8" #: ../data/gui/chat_control.ui.h:12 msgid "9" -msgstr "" +msgstr "9" #. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector) #: ../data/gui/chat_control.ui.h:14 ../data/gui/groupchat_control.ui.h:2 @@ -1016,7 +1001,7 @@ #: ../data/gui/chat_control.ui.h:15 ../data/gui/groupchat_control.ui.h:3 msgid "label" -msgstr "" +msgstr "ознака" #: ../data/gui/chat_to_muc_window.ui.h:1 msgid "In_vite" @@ -1252,9 +1237,8 @@ msgstr "<b>Боје језичака статуса разговора</b>" #: ../data/gui/gajim_themes_window.ui.h:2 -#, fuzzy msgid "Account row" -msgstr "Налог" +msgstr "Ред са налогом" #: ../data/gui/gajim_themes_window.ui.h:3 ../src/chat_control.py:925 msgid "Bold" @@ -1262,16 +1246,15 @@ #: ../data/gui/gajim_themes_window.ui.h:4 msgid "Chat Banner" -msgstr "" +msgstr "Барјак разговора" #: ../data/gui/gajim_themes_window.ui.h:5 msgid "Composing" msgstr "Састављање" #: ../data/gui/gajim_themes_window.ui.h:6 -#, fuzzy msgid "Contact row" -msgstr "Контакт" +msgstr "Ред са контактима" #: ../data/gui/gajim_themes_window.ui.h:7 msgid "Font style:" @@ -1286,9 +1269,8 @@ msgstr "Отишао" #: ../data/gui/gajim_themes_window.ui.h:10 -#, fuzzy msgid "Group row" -msgstr "Група" +msgstr "Ред са групама" #: ../data/gui/gajim_themes_window.ui.h:11 ../src/common/pep.py:150 msgid "Inactive" @@ -1344,7 +1326,7 @@ #: ../data/gui/gc_control_popup_menu.ui.h:4 ../src/disco.py:1782 msgid "_Bookmark" -msgstr "_Маркирај ову со_бу" +msgstr "Обележи ову со_бу" #: ../data/gui/gc_control_popup_menu.ui.h:5 msgid "_Destroy Room" @@ -1463,23 +1445,20 @@

1 0

gajim: wrap IO operations on SSL.Connection objects in try, catc...
by fantasticsid＠lagaule.org 29 Jul '10

29 Jul '10

changeset e13bfb6f30c7 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=e13bfb6f30c7 description: wrap IO operations on SSL.Connection objects in try, catch SSL exceptions caused by SSL rehandshake request and simply ignore, retrying the IO should succeed. diffstat: src/common/jingle_xtls.py | 9 ++- src/common/socks5.py | 117 ++++++++++++++++++++++++++++++--------------- 2 files changed, 84 insertions(+), 42 deletions(-) diffs (219 lines): diff -r faa3e134ebf2 -r e13bfb6f30c7 src/common/jingle_xtls.py --- a/src/common/jingle_xtls.py Tue Jul 27 21:29:12 2010 +0800 +++ b/src/common/jingle_xtls.py Thu Jul 29 21:40:40 2010 +0800 @@ -39,13 +39,16 @@ constructs and returns the context objects """ ctx = SSL.Context(SSL.TLSv1_METHOD) - ctx.set_verify(SSL.VERIFY_PEER|SSL.VERIFY_FAIL_IF_NO_PEER_CERT, verify_cb or default_callback) - # TODO: set private key, set certificate, set verification path + if fingerprint == 'server': # for testing purposes only + ctx.set_verify(SSL.VERIFY_PEER|SSL.VERIFY_FAIL_IF_NO_PEER_CERT, verify_cb or default_callback) + ctx.use_privatekey_file (os.path.expanduser('~/certs/server.pkey')) ctx.use_certificate_file(os.path.expanduser('~/certs/server.cert')) ctx.load_verify_locations(os.path.expanduser('~/certs/CA.cert')) - elif fingerprint == 'client': + elif fingerprint == 'client': + ctx.set_verify(SSL.VERIFY_PEER, verify_cb or default_callback) + ctx.use_privatekey_file (os.path.expanduser('~/certs/client.pkey')) ctx.use_certificate_file(os.path.expanduser('~/certs/client.cert')) ctx.load_verify_locations(os.path.expanduser('~/certs/CA.cert')) diff -r faa3e134ebf2 -r e13bfb6f30c7 src/common/socks5.py --- a/src/common/socks5.py Tue Jul 27 21:29:12 2010 +0800 +++ b/src/common/socks5.py Thu Jul 29 21:40:40 2010 +0800 @@ -317,7 +317,7 @@ sock_hash = sock.__hash__() if sock_hash not in self.senders: self.senders[sock_hash] = Socks5Sender(self.idlequeue, sock_hash, self, - sock[0], sock[1][0], sock[1][1]) + sock[0], sock[1][0], sock[1][1], fingerprint='server') self.connected += 1 def process_result(self, result, actor): @@ -453,6 +453,10 @@ received = '' try: add = self._recv(64) + except (OpenSSL.SSL.WantReadError, OpenSSL.SSL.WantWriteError, + OpenSSL.SSL.WantX509LookupError), e: + log.info('SSL rehandshake request : ' + repr(e)) + raise e except Exception: add = '' received += add @@ -466,7 +470,11 @@ """ try: self._send(raw_data) - except Exception: + except (OpenSSL.SSL.WantReadError, OpenSSL.SSL.WantWriteError, + OpenSSL.SSL.WantX509LookupError), e: + log.info('SSL rehandshake request :' + repr(e)) + raise e + except Exception, e: self.disconnect() return len(raw_data) @@ -487,6 +495,10 @@ lenn = 0 try: lenn = self._send(buff) + except (OpenSSL.SSL.WantReadError, OpenSSL.SSL.WantWriteError, + OpenSSL.SSL.WantX509LookupError), e: + log.info('SSL rehandshake request :' + repr(e)) + raise e except Exception, e: if e.args[0] not in (EINTR, ENOBUFS, EWOULDBLOCK): # peer stopped reading @@ -557,6 +569,10 @@ return 0 try: buff = self._recv(MAX_BUFF_LEN) + except (OpenSSL.SSL.WantReadError, OpenSSL.SSL.WantWriteError, + OpenSSL.SSL.WantX509LookupError), e: + log.info('SSL rehandshake request :' + repr(e)) + raise e except Exception: buff = '' current_time = self.idlequeue.current_time() @@ -682,7 +698,12 @@ """ Connect response: version, auth method """ - buff = self._recv() + try: + buff = self._recv() + except (SSL.WantReadError, SSL.WantWriteError, + SSL.WantX509LookupError), e: + log.info("SSL rehandshake request : " + repr(e)) + raise e try: version, method = struct.unpack('!BB', buff) except Exception: @@ -716,11 +737,15 @@ """ def __init__(self, idlequeue, sock_hash, parent, _sock, host=None, - port=None): + port=None, fingerprint = None): + self.fingerprint = fingerprint self.queue_idx = sock_hash self.queue = parent Socks5.__init__(self, idlequeue, host, port, None, None, None) self._sock = _sock + if not self.fingerprint is None: + self._sock = OpenSSL.SSL.Connection( + jingle_xtls.get_context('server'), self._sock) self._sock.setblocking(False) self.fd = _sock.fileno() self._recv = _sock.recv @@ -782,17 +807,21 @@ def pollin(self): if self.connected: - if self.state < 5: - result = self.main() - if self.state == 4: - self.queue.result_sha(self.sha_msg, self.queue_idx) - if result == -1: - self.disconnect() - - elif self.state == 5: - if self.file_props is not None and self.file_props['type'] == 'r': - result = self.get_file_contents(0) - self.queue.process_result(result, self) + try: + if self.state < 5: + result = self.main() + if self.state == 4: + self.queue.result_sha(self.sha_msg, self.queue_idx) + if result == -1: + self.disconnect() + + elif self.state == 5: + if self.file_props is not None and self.file_props['type'] == 'r': + result = self.get_file_contents(0) + self.queue.process_result(result, self) + except (OpenSSL.SSL.WantReadError, OpenSSL.SSL.WantWriteError, + OpenSSL.SSL.WantX509LookupError), e: + log.info('caught SSL exception, ignored') else: self.disconnect() @@ -1028,19 +1057,24 @@ def pollout(self): self.idlequeue.remove_timeout(self.fd) - if self.state == 0: - self.do_connect() - return - elif self.state == 1: # send initially: version and auth types - self.send_raw(self._get_auth_buff()) - elif self.state == 3: # send 'connect' request - self.send_raw(self._get_request_buff(self._get_sha1_auth())) - elif self.file_props['type'] != 'r': - if self.file_props['paused']: - self.idlequeue.plug_idle(self, False, False) + try: + if self.state == 0: + self.do_connect() return - result = self.write_next() - self.queue.process_result(result, self) + elif self.state == 1: # send initially: version and auth types + self.send_raw(self._get_auth_buff()) + elif self.state == 3: # send 'connect' request + self.send_raw(self._get_request_buff(self._get_sha1_auth())) + elif self.file_props['type'] != 'r': + if self.file_props['paused']: + self.idlequeue.plug_idle(self, False, False) + return + result = self.write_next() + self.queue.process_result(result, self) + return + except (OpenSSL.SSL.WantReadError, OpenSSL.SSL.WantWriteError, + OpenSSL.SSL.WantX509LookupError), e: + log.info('caught SSL exception, ignored') return self.state += 1 # unplug and plug for reading @@ -1059,19 +1093,24 @@ def pollin(self): self.idlequeue.remove_timeout(self.fd) if self.connected: - if self.file_props['paused']: - self.idlequeue.plug_idle(self, False, False) + try: + if self.file_props['paused']: + self.idlequeue.plug_idle(self, False, False) + return + if self.state < 5: + self.idlequeue.set_read_timeout(self.fd, CONNECT_TIMEOUT) + result = self.main(0) + self.queue.process_result(result, self) + elif self.state == 5: # wait for proxy reply + pass + elif self.file_props['type'] == 'r': + self.idlequeue.set_read_timeout(self.fd, STALLED_TIMEOUT) + result = self.get_file_contents(0) + self.queue.process_result(result, self) + except (OpenSSL.SSL.WantReadError, OpenSSL.SSL.WantWriteError, + OpenSSL.SSL.WantX509LookupError), e: + log.info('caught SSL exception, ignored') return - if self.state < 5: - self.idlequeue.set_read_timeout(self.fd, CONNECT_TIMEOUT) - result = self.main(0) - self.queue.process_result(result, self) - elif self.state == 5: # wait for proxy reply - pass - elif self.file_props['type'] == 'r': - self.idlequeue.set_read_timeout(self.fd, STALLED_TIMEOUT) - result = self.get_file_contents(0) - self.queue.process_result(result, self) else: self.disconnect()

1 0

gajim: add missing plugins/Makefile.am
by Yann Leboulanger 29 Jul '10

29 Jul '10

changeset b0b37486595d in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=b0b37486595d description: add missing plugins/Makefile.am diffstat: plugins/Makefile.am | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diffs (14 lines): diff -r 3c8664e9becb -r b0b37486595d plugins/Makefile.am --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/plugins/Makefile.am Thu Jul 29 12:50:54 2010 +0200 @@ -0,0 +1,10 @@ +INCLUDES = \ + $(PYTHON_INCLUDES) + +gajimpluginsdir = $(gajim_pluginsdir) +nobase_dist_gajimplugins_PYTHON = \ + $(srcdir)/*.py \ + $(srcdir)/*/*.py \ + $(srcdir)/*/*.ui + +MAINTAINERCLEANFILES = Makefile.in

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits July 2010