Commits May 2010

commits@gajim.org

6 participants
37 discussions

gajim: prevent some traceback when receiving an error when we wa...
by Yann Leboulanger 05 May '10

05 May '10

changeset 8954be23e65e in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=8954be23e65e description: prevent some traceback when receiving an error when we want to configure pep. Fixes #5737 diffstat: src/common/connection_handlers.py | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diffs (17 lines): diff -r 4e6e6d7a9489 -r 8954be23e65e src/common/connection_handlers.py --- a/src/common/connection_handlers.py Wed May 05 08:56:36 2010 +0200 +++ b/src/common/connection_handlers.py Wed May 05 19:32:18 2010 +0200 @@ -674,7 +674,13 @@ # Ask metacontacts before roster self.get_metacontacts() elif self.awaiting_answers[id_][0] == PEP_CONFIG: + if iq_obj.getType() == 'error': + return + if not iq_obj.getTag('pubsub'): + return conf = iq_obj.getTag('pubsub').getTag('configure') + if not conf: + return node = conf.getAttr('node') form_tag = conf.getTag('x', namespace=common.xmpp.NS_DATA) if form_tag:

1 0

gajim: fix a bit of indentation
by Yann Leboulanger 05 May '10

05 May '10

changeset 4e6e6d7a9489 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=4e6e6d7a9489 description: fix a bit of indentation diffstat: src/groupchat_control.py | 36 +++++++++++++++++++++--------------- 1 files changed, 21 insertions(+), 15 deletions(-) diffs (73 lines): diff -r f074a657f588 -r 4e6e6d7a9489 src/groupchat_control.py --- a/src/groupchat_control.py Tue May 04 10:46:47 2010 +0200 +++ b/src/groupchat_control.py Wed May 05 08:56:36 2010 +0200 @@ -1319,9 +1319,9 @@ 'reason': _('room configuration changed to members-only') } self.print_conversation(s, 'info', tim=tim, graphics=False) elif '332' in statusCode: - s = _('%(nick)s has been removed from the room (%(reason)s)') % { - 'nick': nick, - 'reason': _('system shutdown') } + s = _('%(nick)s has been removed from the room ' + '(%(reason)s)') % {'nick': nick, + 'reason': _('system shutdown') } self.print_conversation(s, 'info', tim=tim, graphics=False) # Room has been destroyed. elif 'destroyed' in statusCode: @@ -1333,16 +1333,19 @@ self.remove_contact(nick) self.draw_all_roles() else: - c = gajim.contacts.get_gc_contact(self.account, self.room_jid, nick) + c = gajim.contacts.get_gc_contact(self.account, self.room_jid, + nick) c.show = show c.status = status if nick == self.nick and (not statusCode or \ '303' not in statusCode): # We became offline self.got_disconnected() contact = gajim.contacts.\ - get_contact_with_highest_priority(self.account, self.room_jid) + get_contact_with_highest_priority(self.account, + self.room_jid) if contact: - gajim.interface.roster.draw_contact(self.room_jid, self.account) + gajim.interface.roster.draw_contact(self.room_jid, + self.account) if self.parent_win: self.parent_win.redraw_tab(self) else: @@ -1353,21 +1356,24 @@ self.nick = nick s = _('You are now known as %s') % nick self.print_conversation(s, 'info', tim=tim, graphics=False) - iter_ = self.add_contact_to_roster(nick, show, role, affiliation, - status, jid) + iter_ = self.add_contact_to_roster(nick, show, role, + affiliation, status, jid) newly_created = True self.draw_all_roles() - if statusCode and '201' in statusCode: # We just created the room - gajim.connections[self.account].request_gc_config(self.room_jid) + if statusCode and '201' in statusCode: + # We just created the room + gajim.connections[self.account].request_gc_config( + self.room_jid) else: - gc_c = gajim.contacts.get_gc_contact(self.account, self.room_jid, + gc_c = gajim.contacts.get_gc_contact(self.account, + self.room_jid, nick) + if not gc_c: + log.error('%s has an iter, but no gc_contact instance' % \ nick) - if not gc_c: - log.error('%s has an iter, but no gc_contact instance') return # Re-get vcard if avatar has changed - # We do that here because we may request it to the real JID if we - # knows it. connections.py doesn't know it. + # We do that here because we may request it to the real JID if + # we knows it. connections.py doesn't know it. con = gajim.connections[self.account] if gc_c and gc_c.jid: real_jid = gc_c.jid

1 0

gajim: remove fixed TODO
by Yann Leboulanger 04 May '10

04 May '10

changeset f074a657f588 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=f074a657f588 description: remove fixed TODO diffstat: src/common/jingle_rtp.py | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diffs (11 lines): diff -r 69666debb922 -r f074a657f588 src/common/jingle_rtp.py --- a/src/common/jingle_rtp.py Tue May 04 10:32:10 2010 +0200 +++ b/src/common/jingle_rtp.py Tue May 04 10:46:47 2010 +0200 @@ -225,7 +225,6 @@ self.src_bin.get_pad('src').link(sink_pad) self.stream_failed_once = True else: - # TODO: remove content, don't kill session reason = xmpp.Node('reason') reason.setTag('failed-application') self.session.remove_content(self.creator, self.name, reason)

1 0

gajim: Merge local changes
by Thibaut Girka 04 May '10

04 May '10

changeset 69666debb922 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=69666debb922 description: Merge local changes diffstat: po/tr.po | 929 ++++++++++++++++++++------------------------------------------ 1 files changed, 309 insertions(+), 620 deletions(-) diffs (truncated from 2364 to 300 lines): diff -r 0a8f32dc5687 -r 69666debb922 po/tr.po --- a/po/tr.po Tue May 04 10:31:05 2010 +0200 +++ b/po/tr.po Tue May 04 10:32:10 2010 +0200 @@ -2,7 +2,7 @@ # Copyright (C) 2010 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. # Django Shegman <shegman(a)tablatures.de>, 2010. -# +# msgid "" msgstr "" "Project-Id-Version: Gajim - A Jabber Instant Messager 0.13.10.2-dev\n" @@ -85,24 +85,13 @@ msgstr "Yönet..." #: ../data/gui/account_creation_wizard_window.ui.h:18 -#: ../data/gui/accounts_window.ui.h:36 -#: ../data/gui/change_mood_dialog.ui.h:3 -#: ../src/config.py:1256 -#: ../src/config.py:1359 -#: ../src/config.py:1652 -#: ../src/config.py:1657 -#: ../src/config.py:2208 -#: ../src/config.py:2287 -#: ../src/config.py:2300 -#: ../src/config.py:3538 -#: ../src/config.py:3611 -#: ../src/dialogs.py:308 -#: ../src/dialogs.py:310 -#: ../src/dialogs.py:513 -#: ../src/dialogs.py:526 -#: ../src/roster_window.py:2887 -#: ../src/roster_window.py:2893 -#: ../src/roster_window.py:2898 +#: ../data/gui/accounts_window.ui.h:36 ../data/gui/change_mood_dialog.ui.h:3 +#: ../src/config.py:1256 ../src/config.py:1359 ../src/config.py:1652 +#: ../src/config.py:1657 ../src/config.py:2208 ../src/config.py:2287 +#: ../src/config.py:2300 ../src/config.py:3538 ../src/config.py:3611 +#: ../src/dialogs.py:308 ../src/dialogs.py:310 ../src/dialogs.py:513 +#: ../src/dialogs.py:526 ../src/roster_window.py:2887 +#: ../src/roster_window.py:2893 ../src/roster_window.py:2898 msgid "None" msgstr "Hiçbiri" @@ -162,8 +151,7 @@ msgid "_Server:" msgstr "_Sunuc:" -#: ../data/gui/accounts_window.ui.h:1 -#: ../data/gui/preferences_window.ui.h:13 +#: ../data/gui/accounts_window.ui.h:1 ../data/gui/preferences_window.ui.h:13 msgid "Miscellaneous" msgstr "Karışık" @@ -183,8 +171,7 @@ msgid "A_djust to status" msgstr "Durumu a_yarla" -#: ../data/gui/accounts_window.ui.h:6 -#: ../data/gui/join_groupchat_window.ui.h:1 +#: ../data/gui/accounts_window.ui.h:6 ../data/gui/join_groupchat_window.ui.h:1 msgid "Account" msgstr "Hesap" @@ -247,27 +234,20 @@ msgstr "İlk Ad:" #. No configured account -#: ../data/gui/accounts_window.ui.h:21 -#: ../data/gui/roster_window.ui.h:2 -#: ../src/common/helpers.py:1159 -#: ../src/common/helpers.py:1171 -#: ../src/notify.py:558 -#: ../src/notify.py:581 -#: ../src/notify.py:622 +#: ../data/gui/accounts_window.ui.h:21 ../data/gui/roster_window.ui.h:2 +#: ../src/common/helpers.py:1159 ../src/common/helpers.py:1171 +#: ../src/notify.py:558 ../src/notify.py:581 ../src/notify.py:622 #: ../src/notify.py:638 msgid "Gajim" msgstr "Gajim" #. FIXME: Ugly workaround. -#. FIXME: Ugly workaround. Maybe we haven't been in any group (defaults to General) +#. FIXME: Ugly workaround. Maybe we haven't been in any group (defaults to +#. General) #. General group cannot be changed -#: ../data/gui/accounts_window.ui.h:22 -#: ../data/gui/preferences_window.ui.h:61 -#: ../src/common/contacts.py:141 -#: ../src/dialogs.py:111 -#: ../src/dialogs.py:121 -#: ../src/roster_window.py:2829 -#: ../src/roster_window.py:5376 +#: ../data/gui/accounts_window.ui.h:22 ../data/gui/preferences_window.ui.h:61 +#: ../src/common/contacts.py:141 ../src/dialogs.py:111 ../src/dialogs.py:121 +#: ../src/roster_window.py:2829 ../src/roster_window.py:5376 msgid "General" msgstr "Genel" @@ -304,8 +284,7 @@ msgstr "Senin kişimsel informationun, nasıl sunucdaysa" #: ../data/gui/accounts_window.ui.h:32 -#: ../data/gui/zeroconf_information_window.ui.h:4 -#: ../src/config.py:1775 +#: ../data/gui/zeroconf_information_window.ui.h:4 ../src/config.py:1775 #: ../src/dialogs.py:830 msgid "Jabber ID:" msgstr "Jabber kimliği:" @@ -319,14 +298,12 @@ msgid "Mer_ge accounts" msgstr "Hesapları bir_leştir" -#: ../data/gui/accounts_window.ui.h:35 -#: ../src/config.py:1748 +#: ../data/gui/accounts_window.ui.h:35 ../src/config.py:1748 #: ../src/config.py:2301 msgid "No key selected" msgstr "Hiçbir anahtar seçilmedi" -#: ../data/gui/accounts_window.ui.h:37 -#: ../data/gui/profile_window.ui.h:35 +#: ../data/gui/accounts_window.ui.h:37 ../data/gui/profile_window.ui.h:35 msgid "Personal Information" msgstr "Kişisel ilanlar sayfası" @@ -343,8 +320,7 @@ msgstr "Durumuna göre öncelik kendilinden değişir." #. Rename -#: ../data/gui/accounts_window.ui.h:41 -#: ../src/roster_window.py:5326 +#: ../data/gui/accounts_window.ui.h:41 ../src/roster_window.py:5326 msgid "Re_name" msgstr "Adı _değiştir" @@ -398,8 +374,7 @@ msgstr "Kişisel ilanlar sayfayı yazımla" #. XML Console enable checkbutton -#: ../data/gui/accounts_window.ui.h:55 -#: ../data/gui/xml_console_window.ui.h:11 +#: ../data/gui/accounts_window.ui.h:55 ../data/gui/xml_console_window.ui.h:11 msgid "_Enable" msgstr "_Etkinleştir" @@ -435,8 +410,7 @@ msgid "Add New Contact" msgstr "Yeni Kişi Ekle" -#: ../data/gui/add_new_contact_window.ui.h:4 -#: ../src/common/helpers.py:1339 +#: ../data/gui/add_new_contact_window.ui.h:4 ../src/common/helpers.py:1339 msgid "I would like to add you to my contact list." msgstr "Seni kişi listeme eklemek isterdim" @@ -597,8 +571,7 @@ msgstr "Bütün durumlar" #: ../data/gui/advanced_notifications_window.ui.h:8 -#: ../src/common/commands.py:106 -#: ../src/common/helpers.py:233 +#: ../src/common/commands.py:106 ../src/common/helpers.py:233 msgid "Away" msgstr "Uzakta" @@ -757,8 +730,7 @@ msgid "New entry received" msgstr "Yeni kayıt alındı" -#: ../data/gui/atom_entry_window.ui.h:5 -#: ../src/atom_window.py:124 +#: ../data/gui/atom_entry_window.ui.h:5 ../src/atom_window.py:124 msgid "You have received new entry:" msgstr "Yeni bir kayıt alındı:" @@ -802,13 +774,11 @@ msgid "Type your new status message" msgstr "Yeni durum ileti yaz" -#: ../data/gui/change_status_message_dialog.ui.h:2 -#: ../src/tooltips.py:657 +#: ../data/gui/change_status_message_dialog.ui.h:2 ../src/tooltips.py:657 msgid "Activity:" msgstr "Etkinlik:" -#: ../data/gui/change_status_message_dialog.ui.h:3 -#: ../src/tooltips.py:652 +#: ../data/gui/change_status_message_dialog.ui.h:3 ../src/tooltips.py:652 msgid "Mood:" msgstr "Ruh Hali:" @@ -821,8 +791,7 @@ msgstr "Önceden hazırlanmış olarak kaydet:" #. # means number -#: ../data/gui/chat_control.ui.h:1 -#: ../src/dialogs.py:4132 +#: ../data/gui/chat_control.ui.h:1 ../src/dialogs.py:4132 msgid "#" msgstr "#" @@ -830,8 +799,7 @@ msgid "*" msgstr "*" -#: ../data/gui/chat_control.ui.h:3 -#: ../data/gui/single_message_window.ui.h:1 +#: ../data/gui/chat_control.ui.h:3 ../data/gui/single_message_window.ui.h:1 msgid "0" msgstr "0" @@ -879,16 +847,14 @@ msgid "Sound volume:" msgstr "Ses şiddeti:" -#. 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:16 -#: ../data/gui/groupchat_control.ui.h:2 -#: ../data/gui/xml_console_window.ui.h:16 -#: ../src/filetransfers_window.py:266 +#. 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:16 ../data/gui/groupchat_control.ui.h:2 +#: ../data/gui/xml_console_window.ui.h:16 ../src/filetransfers_window.py:266 msgid "_Send" msgstr "_Gönder" -#: ../data/gui/chat_control.ui.h:17 -#: ../data/gui/groupchat_control.ui.h:3 +#: ../data/gui/chat_control.ui.h:17 ../data/gui/groupchat_control.ui.h:3 msgid "label" msgstr "etiket" @@ -936,8 +902,7 @@ #. Invite to #. Invite to Groupchat -#: ../data/gui/contact_context_menu.ui.h:6 -#: ../src/roster_window.py:5281 +#: ../data/gui/contact_context_menu.ui.h:6 ../src/roster_window.py:5281 #: ../src/roster_window.py:5441 msgid "In_vite to" msgstr "Buna davet _et" @@ -950,8 +915,7 @@ msgid "Remo_ve" msgstr "K_aldır" -#: ../data/gui/contact_context_menu.ui.h:9 -#: ../src/roster_window.py:5291 +#: ../data/gui/contact_context_menu.ui.h:9 ../src/roster_window.py:5291 #: ../src/roster_window.py:5530 msgid "Send Cus_tom Status" msgstr "Ö_zel durum gönder" @@ -988,10 +952,8 @@ msgid "_Allow him/her to see my status" msgstr "Ona benim durumu görmeye izin _ver" -#: ../data/gui/contact_context_menu.ui.h:18 -#: ../src/roster_window.py:5353 -#: ../src/roster_window.py:5479 -#: ../src/roster_window.py:5609 +#: ../data/gui/contact_context_menu.ui.h:18 ../src/roster_window.py:5353 +#: ../src/roster_window.py:5479 ../src/roster_window.py:5609 msgid "_Block" msgstr "_Engelle" @@ -999,8 +961,7 @@ msgid "_Forbid him/her to see my status" msgstr "Ona benim durumu görmeye _yasak et" -#: ../data/gui/contact_context_menu.ui.h:20 -#: ../src/roster_window.py:5680 +#: ../data/gui/contact_context_menu.ui.h:20 ../src/roster_window.py:5680 msgid "_History" msgstr "_Geçmiş" @@ -1020,10 +981,8 @@ msgid "_Subscription" msgstr "_Üyelik" -#: ../data/gui/contact_context_menu.ui.h:25 -#: ../src/roster_window.py:5345 -#: ../src/roster_window.py:5473 -#: ../src/roster_window.py:5606 +#: ../data/gui/contact_context_menu.ui.h:25 ../src/roster_window.py:5345 +#: ../src/roster_window.py:5473 ../src/roster_window.py:5606 msgid "_Unblock" msgstr "Engellemeyi _Kaldır" @@ -1108,8 +1067,9 @@ msgstr "" #: ../data/gui/filetransfers.ui.h:13 +#, fuzzy msgid "_Notify me when a file transfer is complete" -msgstr "" +msgstr "_Dosya aktarımı tamamlandığında beni uyar"

1 0

gajim: [Jingle] Handle description-info
by Thibaut Girka 04 May '10

04 May '10

changeset 0a8f32dc5687 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=0a8f32dc5687 description: [Jingle] Handle description-info diffstat: src/common/jingle_content.py | 5 +++++ src/common/jingle_rtp.py | 8 +++----- src/common/jingle_session.py | 6 ++++++ 3 files changed, 14 insertions(+), 5 deletions(-) diffs (56 lines): diff -r 71bce5149a12 -r 0a8f32dc5687 src/common/jingle_content.py --- a/src/common/jingle_content.py Tue May 04 10:04:53 2010 +0200 +++ b/src/common/jingle_content.py Tue May 04 10:31:05 2010 +0200 @@ -127,6 +127,11 @@ content.addChild(node=self.transport.make_transport([candidate])) self.session.send_transport_info(content) + def send_description_info(self): + content = self.__content() + self._fill_content(content) + self.session.send_description_info(content) + def __fill_jingle_stanza(self, stanza, content, error, action): """ Add our things to session-initiate stanza diff -r 71bce5149a12 -r 0a8f32dc5687 src/common/jingle_rtp.py --- a/src/common/jingle_rtp.py Tue May 04 10:04:53 2010 +0200 +++ b/src/common/jingle_rtp.py Tue May 04 10:31:05 2010 +0200 @@ -99,8 +99,7 @@ farsight.DIRECTION_RECV, 'nice', params) def is_ready(self): - return (JingleContent.is_ready(self) and self.candidates_ready - and self.p2psession.get_property('codecs-ready')) + return (JingleContent.is_ready(self) and self.candidates_ready) def make_bin_from_config(self, config_key, pipeline, text): pipeline = pipeline % gajim.config.get(config_key) @@ -177,9 +176,8 @@ elif name == 'farsight-recv-codecs-changed': pass elif name == 'farsight-codecs-changed': - if self.is_ready(): - self.session.on_session_state_changed(self) - # TODO: description-info + if self.sent and self.p2psession.get_property('codecs-ready'): + self.send_description_info() elif name == 'farsight-local-candidates-prepared': self.candidates_ready = True if self.is_ready(): diff -r 71bce5149a12 -r 0a8f32dc5687 src/common/jingle_session.py --- a/src/common/jingle_session.py Tue May 04 10:04:53 2010 +0200 +++ b/src/common/jingle_session.py Tue May 04 10:31:05 2010 +0200 @@ -264,6 +264,12 @@ jingle.addChild(node=content) self.connection.connection.send(stanza) + def send_description_info(self, content): + assert self.state != JingleStates.ended + stanza, jingle = self.__make_jingle('description-info') + jingle.addChild(node=content) + self.connection.connection.send(stanza) + def on_stanza(self, stanza): """ A callback for ConnectionJingle. It gets stanza, then tries to send it to

1 0

gajim: [Jingle] Don't end the session on a content failure, only...
by Thibaut Girka 04 May '10

04 May '10

changeset 71bce5149a12 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=71bce5149a12 description: [Jingle] Don't end the session on a content failure, only remove the content diffstat: src/common/jingle_rtp.py | 5 +++-- src/common/jingle_session.py | 23 ++++++++++++----------- 2 files changed, 15 insertions(+), 13 deletions(-) diffs (97 lines): diff -r e2d74a74223f -r 71bce5149a12 src/common/jingle_rtp.py --- a/src/common/jingle_rtp.py Mon May 03 21:59:46 2010 +0200 +++ b/src/common/jingle_rtp.py Tue May 04 10:04:53 2010 +0200 @@ -196,7 +196,7 @@ if state == farsight.STREAM_STATE_FAILED: reason = xmpp.Node('reason') reason.setTag('failed-transport') - self.session._session_terminate(reason) + self.session.remove_content(self.creator, self.name, reason) elif name == 'farsight-error': print 'Farsight error #%d!' % message.structure['error-no'] print 'Message: %s' % message.structure['error-msg'] @@ -217,6 +217,7 @@ # Remove old source self.src_bin.get_pad('src').unlink(sink_pad) + self.src_bin.set_state(gst.STATE_NULL) self.pipeline.remove(self.src_bin) if not self.stream_failed_once: @@ -229,7 +230,7 @@ # TODO: remove content, don't kill session reason = xmpp.Node('reason') reason.setTag('failed-application') - self.session._session_terminate(reason) + self.session.remove_content(self.creator, self.name, reason) # Start playing again self.pipeline.set_state(gst.STATE_PLAYING) diff -r e2d74a74223f -r 71bce5149a12 src/common/jingle_session.py --- a/src/common/jingle_session.py Mon May 03 21:59:46 2010 +0200 +++ b/src/common/jingle_session.py Tue May 04 10:04:53 2010 +0200 @@ -184,17 +184,18 @@ # The content is from us, accept it content.accepted = True - def remove_content(self, creator, name): + def remove_content(self, creator, name, reason=None): """ - We do not need this now + Remove the content `name` created by `creator` + by sending content-remove, or by sending session-terminate if + there is no content left. """ - #TODO: if (creator, name) in self.contents: content = self.contents[(creator, name)] if len(self.contents) > 1: - self.__content_remove(content) + self.__content_remove(content, reason) self.contents[(creator, name)].destroy() - if len(self.contents) == 0: + if not self.contents: self.end_session() def modify_content(self, creator, name, *someother): @@ -549,7 +550,7 @@ break return (reason, text) - def __make_jingle(self, action): + def __make_jingle(self, action, reason=None): stanza = xmpp.Iq(typ='set', to=xmpp.JID(self.peerjid)) attrs = {'action': action, 'sid': self.sid} @@ -558,6 +559,8 @@ elif action == 'session-accept': attrs['responder'] = self.responder jingle = stanza.addChild('jingle', attrs=attrs, namespace=xmpp.NS_JINGLE) + if reason is not None: + jingle.addChild(node=reason) return stanza, jingle def __send_error(self, stanza, error, jingle_error=None, text=None, type_=None): @@ -614,9 +617,7 @@ def _session_terminate(self, reason=None): assert self.state != JingleStates.ended - stanza, jingle = self.__make_jingle('session-terminate') - if reason is not None: - jingle.addChild(node=reason) + stanza, jingle = self.__make_jingle('session-terminate', reason=reason) self.__broadcast_all(stanza, jingle, None, 'session-terminate-sent') self.connection.connection.send(stanza) # TODO: Move to GUI? @@ -659,9 +660,9 @@ def __content_modify(self): assert self.state != JingleStates.ended - def __content_remove(self, content): + def __content_remove(self, content, reason=None): assert self.state != JingleStates.ended - stanza, jingle = self.__make_jingle('content-remove') + stanza, jingle = self.__make_jingle('content-remove', reason=reason) self.__append_content(jingle, content) self.connection.connection.send(stanza) # TODO: this will fail if content is not an RTP content

1 0

gajim: [Jingle] Introduce RTP stream fallback
by Thibaut Girka 04 May '10

04 May '10

changeset e2d74a74223f in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=e2d74a74223f description: [Jingle] Introduce RTP stream fallback diffstat: src/common/jingle_rtp.py | 55 +++++++++++++++++++++++++++++++++++++++++------ 1 files changed, 48 insertions(+), 7 deletions(-) diffs (110 lines): diff -r 46c7d5227501 -r e2d74a74223f src/common/jingle_rtp.py --- a/src/common/jingle_rtp.py Mon May 03 18:09:55 2010 +0200 +++ b/src/common/jingle_rtp.py Mon May 03 21:59:46 2010 +0200 @@ -44,6 +44,10 @@ self.farsight_media = {'audio': farsight.MEDIA_TYPE_AUDIO, 'video': farsight.MEDIA_TYPE_VIDEO}[media] + self.pipeline = None + self.src_bin = None + self.stream_failed_once = False + self.candidates_ready = False # True when local candidates are prepared self.callbacks['session-initiate'] += [self.__on_remote_codecs] @@ -199,6 +203,39 @@ print 'Debug: %s' % message.structure['debug-msg'] else: print name + elif message.type == gst.MESSAGE_ERROR: + # TODO: Fix it to fallback to videotestsrc anytime an error occur, + # or raise an error, Jingle way + # or maybe one-sided stream? + if not self.stream_failed_once: + self.session.connection.dispatch('ERROR', + (_("GStreamer error"), + _("Error: %s\nDebug: %s" % (message.structure['gerror'], + message.structure['debug'])))) + + sink_pad = self.p2psession.get_property('sink-pad') + + # Remove old source + self.src_bin.get_pad('src').unlink(sink_pad) + self.pipeline.remove(self.src_bin) + + if not self.stream_failed_once: + # Add fallback source + self.src_bin = self.get_fallback_src() + self.pipeline.add(self.src_bin) + self.src_bin.get_pad('src').link(sink_pad) + self.stream_failed_once = True + else: + # TODO: remove content, don't kill session + reason = xmpp.Node('reason') + reason.setTag('failed-application') + self.session._session_terminate(reason) + + # Start playing again + self.pipeline.set_state(gst.STATE_PLAYING) + + def get_fallback_src(self): + return gst.element_factory_make('fakesrc') def __on_content_accept(self, stanza, content, error, action): if self.accepted: @@ -298,19 +335,19 @@ # the local parts # TODO: Add queues? - src_bin = self.make_bin_from_config('audio_input_device', + self.src_bin = self.make_bin_from_config('audio_input_device', '%s ! audioconvert', _("audio input")) self.sink = self.make_bin_from_config('audio_output_device', 'audioconvert ! volume name=gajim_out_vol ! %s', _("audio output")) - self.mic_volume = src_bin.get_by_name('gajim_vol') + self.mic_volume = self.src_bin.get_by_name('gajim_vol') self.out_volume = self.sink.get_by_name('gajim_out_vol') # link gst elements - self.pipeline.add(self.sink, src_bin) + self.pipeline.add(self.sink, self.src_bin) - src_bin.get_pad('src').link(self.p2psession.get_property( + self.src_bin.get_pad('src').link(self.p2psession.get_property( 'sink-pad')) self.p2pstream.connect('src-pad-added', self._on_src_pad_added) @@ -330,24 +367,28 @@ JingleRTPContent.setup_stream(self) # the local parts - src_bin = self.make_bin_from_config('video_input_device', + self.src_bin = self.make_bin_from_config('video_input_device', '%s ! videoscale ! ffmpegcolorspace', _("video input")) #caps = gst.element_factory_make('capsfilter') #caps.set_property('caps', gst.caps_from_string('video/x-raw-yuv, width=320, height=240')) - self.pipeline.add(src_bin)#, caps) + self.pipeline.add(self.src_bin)#, caps) #src_bin.link(caps) self.sink = self.make_bin_from_config('video_output_device', 'videoscale ! ffmpegcolorspace ! %s', _("video output")) self.pipeline.add(self.sink) - src_bin.get_pad('src').link(self.p2psession.get_property('sink-pad')) + self.src_bin.get_pad('src').link(self.p2psession.get_property('sink-pad')) self.p2pstream.connect('src-pad-added', self._on_src_pad_added) # The following is needed for farsight to process ICE requests: self.pipeline.set_state(gst.STATE_PLAYING) + def get_fallback_src(self): + # TODO: Use avatar? + pipeline = 'videotestsrc is-live=true ! video/x-raw-yuv,framerate=10/1 ! ffmpegcolorspace' + return gst.parse_bin_from_description(pipeline, True) def get_content(desc): if desc['media'] == 'audio':

1 0

gajim: l10n: Updated Turkish (tr) translation to 47%
by Ceyhan Molla 03 May '10

03 May '10

changeset 4169e995e560 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=4169e995e560 description: l10n: Updated Turkish (tr) translation to 47% New status: 977 messages complete with 537 fuzzies and 529 untranslated. Transmitted-via: Transifex (www.transifex.net). diffstat: po/tr.po | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diffs (48 lines): diff -r 92cd80d2b86d -r 4169e995e560 po/tr.po --- a/po/tr.po Mon May 03 21:09:06 2010 +0000 +++ b/po/tr.po Mon May 03 21:17:30 2010 +0000 @@ -1218,7 +1218,7 @@ #: ../data/gui/history_manager.ui.h:3 msgid "<big>Welcome to Gajim History Logs Manager</big>" -msgstr "" +msgstr "<big>Gajim Kayıt Tarihleri Yöneticisine Hoşgeldiniz</big>" #: ../data/gui/history_manager.ui.h:4 msgid "Export" @@ -1226,7 +1226,7 @@ #: ../data/gui/history_manager.ui.h:5 msgid "Gajim History Logs Manager" -msgstr "" +msgstr "Kayıt Tarihleri Yöneticisi" #: ../data/gui/history_manager.ui.h:6 msgid "" @@ -1517,7 +1517,7 @@ #: ../data/gui/preferences_window.ui.h:31 msgid "Always use GNOME default applications" -msgstr "" +msgstr "Daima Gnome varsayılan programlarını kullan" #: ../data/gui/preferences_window.ui.h:32 msgid "Always use KDE default applications" @@ -1525,7 +1525,7 @@ #: ../data/gui/preferences_window.ui.h:33 msgid "Always use Xfce default applications" -msgstr "" +msgstr "Daima Xfce varsayılan programlarını kullan" #: ../data/gui/preferences_window.ui.h:34 msgid "Ask status message when I:" @@ -1639,7 +1639,7 @@ #: ../data/gui/preferences_window.ui.h:62 msgid "Hide all buttons in chat windows" -msgstr "" +msgstr "Konuşma penceresinde tüm düğmeleri gizle" #: ../data/gui/preferences_window.ui.h:63 msgid "If checked, Gajim will allow others to detect the operation system you are using"

1 0

gajim: l10n: Updated Turkish (tr) translation to 47%
by Ceyhan Molla 03 May '10

03 May '10

changeset 92cd80d2b86d in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=92cd80d2b86d description: l10n: Updated Turkish (tr) translation to 47% New status: 972 messages complete with 537 fuzzies and 534 untranslated. Transmitted-via: Transifex (www.transifex.net). diffstat: po/tr.po | 919 ++++++++++++++++++++------------------------------------------ 1 files changed, 304 insertions(+), 615 deletions(-) diffs (truncated from 2321 to 300 lines): diff -r 46c7d5227501 -r 92cd80d2b86d po/tr.po --- a/po/tr.po Mon May 03 18:09:55 2010 +0200 +++ b/po/tr.po Mon May 03 21:09:06 2010 +0000 @@ -2,7 +2,7 @@ # Copyright (C) 2010 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. # Django Shegman <shegman(a)tablatures.de>, 2010. -# +# msgid "" msgstr "" "Project-Id-Version: Gajim - A Jabber Instant Messager 0.13.10.2-dev\n" @@ -85,24 +85,13 @@ msgstr "Yönet..." #: ../data/gui/account_creation_wizard_window.ui.h:18 -#: ../data/gui/accounts_window.ui.h:36 -#: ../data/gui/change_mood_dialog.ui.h:3 -#: ../src/config.py:1256 -#: ../src/config.py:1359 -#: ../src/config.py:1652 -#: ../src/config.py:1657 -#: ../src/config.py:2208 -#: ../src/config.py:2287 -#: ../src/config.py:2300 -#: ../src/config.py:3538 -#: ../src/config.py:3611 -#: ../src/dialogs.py:308 -#: ../src/dialogs.py:310 -#: ../src/dialogs.py:513 -#: ../src/dialogs.py:526 -#: ../src/roster_window.py:2887 -#: ../src/roster_window.py:2893 -#: ../src/roster_window.py:2898 +#: ../data/gui/accounts_window.ui.h:36 ../data/gui/change_mood_dialog.ui.h:3 +#: ../src/config.py:1256 ../src/config.py:1359 ../src/config.py:1652 +#: ../src/config.py:1657 ../src/config.py:2208 ../src/config.py:2287 +#: ../src/config.py:2300 ../src/config.py:3538 ../src/config.py:3611 +#: ../src/dialogs.py:308 ../src/dialogs.py:310 ../src/dialogs.py:513 +#: ../src/dialogs.py:526 ../src/roster_window.py:2887 +#: ../src/roster_window.py:2893 ../src/roster_window.py:2898 msgid "None" msgstr "Hiçbiri" @@ -162,8 +151,7 @@ msgid "_Server:" msgstr "_Sunuc:" -#: ../data/gui/accounts_window.ui.h:1 -#: ../data/gui/preferences_window.ui.h:13 +#: ../data/gui/accounts_window.ui.h:1 ../data/gui/preferences_window.ui.h:13 msgid "Miscellaneous" msgstr "Karışık" @@ -183,8 +171,7 @@ msgid "A_djust to status" msgstr "Durumu a_yarla" -#: ../data/gui/accounts_window.ui.h:6 -#: ../data/gui/join_groupchat_window.ui.h:1 +#: ../data/gui/accounts_window.ui.h:6 ../data/gui/join_groupchat_window.ui.h:1 msgid "Account" msgstr "Hesap" @@ -247,27 +234,20 @@ msgstr "İlk Ad:" #. No configured account -#: ../data/gui/accounts_window.ui.h:21 -#: ../data/gui/roster_window.ui.h:2 -#: ../src/common/helpers.py:1159 -#: ../src/common/helpers.py:1171 -#: ../src/notify.py:558 -#: ../src/notify.py:581 -#: ../src/notify.py:622 +#: ../data/gui/accounts_window.ui.h:21 ../data/gui/roster_window.ui.h:2 +#: ../src/common/helpers.py:1159 ../src/common/helpers.py:1171 +#: ../src/notify.py:558 ../src/notify.py:581 ../src/notify.py:622 #: ../src/notify.py:638 msgid "Gajim" msgstr "Gajim" #. FIXME: Ugly workaround. -#. FIXME: Ugly workaround. Maybe we haven't been in any group (defaults to General) +#. FIXME: Ugly workaround. Maybe we haven't been in any group (defaults to +#. General) #. General group cannot be changed -#: ../data/gui/accounts_window.ui.h:22 -#: ../data/gui/preferences_window.ui.h:61 -#: ../src/common/contacts.py:141 -#: ../src/dialogs.py:111 -#: ../src/dialogs.py:121 -#: ../src/roster_window.py:2829 -#: ../src/roster_window.py:5376 +#: ../data/gui/accounts_window.ui.h:22 ../data/gui/preferences_window.ui.h:61 +#: ../src/common/contacts.py:141 ../src/dialogs.py:111 ../src/dialogs.py:121 +#: ../src/roster_window.py:2829 ../src/roster_window.py:5376 msgid "General" msgstr "Genel" @@ -304,8 +284,7 @@ msgstr "Senin kişimsel informationun, nasıl sunucdaysa" #: ../data/gui/accounts_window.ui.h:32 -#: ../data/gui/zeroconf_information_window.ui.h:4 -#: ../src/config.py:1775 +#: ../data/gui/zeroconf_information_window.ui.h:4 ../src/config.py:1775 #: ../src/dialogs.py:830 msgid "Jabber ID:" msgstr "Jabber kimliği:" @@ -319,14 +298,12 @@ msgid "Mer_ge accounts" msgstr "Hesapları bir_leştir" -#: ../data/gui/accounts_window.ui.h:35 -#: ../src/config.py:1748 +#: ../data/gui/accounts_window.ui.h:35 ../src/config.py:1748 #: ../src/config.py:2301 msgid "No key selected" msgstr "Hiçbir anahtar seçilmedi" -#: ../data/gui/accounts_window.ui.h:37 -#: ../data/gui/profile_window.ui.h:35 +#: ../data/gui/accounts_window.ui.h:37 ../data/gui/profile_window.ui.h:35 msgid "Personal Information" msgstr "Kişisel ilanlar sayfası" @@ -343,8 +320,7 @@ msgstr "Durumuna göre öncelik kendilinden değişir." #. Rename -#: ../data/gui/accounts_window.ui.h:41 -#: ../src/roster_window.py:5326 +#: ../data/gui/accounts_window.ui.h:41 ../src/roster_window.py:5326 msgid "Re_name" msgstr "Adı _değiştir" @@ -398,8 +374,7 @@ msgstr "Kişisel ilanlar sayfayı yazımla" #. XML Console enable checkbutton -#: ../data/gui/accounts_window.ui.h:55 -#: ../data/gui/xml_console_window.ui.h:11 +#: ../data/gui/accounts_window.ui.h:55 ../data/gui/xml_console_window.ui.h:11 msgid "_Enable" msgstr "_Etkinleştir" @@ -435,8 +410,7 @@ msgid "Add New Contact" msgstr "Yeni Kişi Ekle" -#: ../data/gui/add_new_contact_window.ui.h:4 -#: ../src/common/helpers.py:1339 +#: ../data/gui/add_new_contact_window.ui.h:4 ../src/common/helpers.py:1339 msgid "I would like to add you to my contact list." msgstr "Seni kişi listeme eklemek isterdim" @@ -597,8 +571,7 @@ msgstr "Bütün durumlar" #: ../data/gui/advanced_notifications_window.ui.h:8 -#: ../src/common/commands.py:106 -#: ../src/common/helpers.py:233 +#: ../src/common/commands.py:106 ../src/common/helpers.py:233 msgid "Away" msgstr "Uzakta" @@ -757,8 +730,7 @@ msgid "New entry received" msgstr "Yeni kayıt alındı" -#: ../data/gui/atom_entry_window.ui.h:5 -#: ../src/atom_window.py:124 +#: ../data/gui/atom_entry_window.ui.h:5 ../src/atom_window.py:124 msgid "You have received new entry:" msgstr "Yeni bir kayıt alındı:" @@ -802,13 +774,11 @@ msgid "Type your new status message" msgstr "Yeni durum ileti yaz" -#: ../data/gui/change_status_message_dialog.ui.h:2 -#: ../src/tooltips.py:657 +#: ../data/gui/change_status_message_dialog.ui.h:2 ../src/tooltips.py:657 msgid "Activity:" msgstr "Etkinlik:" -#: ../data/gui/change_status_message_dialog.ui.h:3 -#: ../src/tooltips.py:652 +#: ../data/gui/change_status_message_dialog.ui.h:3 ../src/tooltips.py:652 msgid "Mood:" msgstr "Ruh Hali:" @@ -821,8 +791,7 @@ msgstr "Önceden hazırlanmış olarak kaydet:" #. # means number -#: ../data/gui/chat_control.ui.h:1 -#: ../src/dialogs.py:4132 +#: ../data/gui/chat_control.ui.h:1 ../src/dialogs.py:4132 msgid "#" msgstr "#" @@ -830,8 +799,7 @@ msgid "*" msgstr "*" -#: ../data/gui/chat_control.ui.h:3 -#: ../data/gui/single_message_window.ui.h:1 +#: ../data/gui/chat_control.ui.h:3 ../data/gui/single_message_window.ui.h:1 msgid "0" msgstr "0" @@ -879,16 +847,14 @@ msgid "Sound volume:" msgstr "Ses şiddeti:" -#. 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:16 -#: ../data/gui/groupchat_control.ui.h:2 -#: ../data/gui/xml_console_window.ui.h:16 -#: ../src/filetransfers_window.py:266 +#. 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:16 ../data/gui/groupchat_control.ui.h:2 +#: ../data/gui/xml_console_window.ui.h:16 ../src/filetransfers_window.py:266 msgid "_Send" msgstr "_Gönder" -#: ../data/gui/chat_control.ui.h:17 -#: ../data/gui/groupchat_control.ui.h:3 +#: ../data/gui/chat_control.ui.h:17 ../data/gui/groupchat_control.ui.h:3 msgid "label" msgstr "etiket" @@ -936,8 +902,7 @@ #. Invite to #. Invite to Groupchat -#: ../data/gui/contact_context_menu.ui.h:6 -#: ../src/roster_window.py:5281 +#: ../data/gui/contact_context_menu.ui.h:6 ../src/roster_window.py:5281 #: ../src/roster_window.py:5441 msgid "In_vite to" msgstr "Buna davet _et" @@ -950,8 +915,7 @@ msgid "Remo_ve" msgstr "K_aldır" -#: ../data/gui/contact_context_menu.ui.h:9 -#: ../src/roster_window.py:5291 +#: ../data/gui/contact_context_menu.ui.h:9 ../src/roster_window.py:5291 #: ../src/roster_window.py:5530 msgid "Send Cus_tom Status" msgstr "Ö_zel durum gönder" @@ -988,10 +952,8 @@ msgid "_Allow him/her to see my status" msgstr "Ona benim durumu görmeye izin _ver" -#: ../data/gui/contact_context_menu.ui.h:18 -#: ../src/roster_window.py:5353 -#: ../src/roster_window.py:5479 -#: ../src/roster_window.py:5609 +#: ../data/gui/contact_context_menu.ui.h:18 ../src/roster_window.py:5353 +#: ../src/roster_window.py:5479 ../src/roster_window.py:5609 msgid "_Block" msgstr "_Engelle" @@ -999,8 +961,7 @@ msgid "_Forbid him/her to see my status" msgstr "Ona benim durumu görmeye _yasak et" -#: ../data/gui/contact_context_menu.ui.h:20 -#: ../src/roster_window.py:5680 +#: ../data/gui/contact_context_menu.ui.h:20 ../src/roster_window.py:5680 msgid "_History" msgstr "_Geçmiş" @@ -1020,10 +981,8 @@ msgid "_Subscription" msgstr "_Üyelik" -#: ../data/gui/contact_context_menu.ui.h:25 -#: ../src/roster_window.py:5345 -#: ../src/roster_window.py:5473 -#: ../src/roster_window.py:5606 +#: ../data/gui/contact_context_menu.ui.h:25 ../src/roster_window.py:5345 +#: ../src/roster_window.py:5473 ../src/roster_window.py:5606 msgid "_Unblock" msgstr "Engellemeyi _Kaldır" @@ -1108,8 +1067,9 @@ msgstr "" #: ../data/gui/filetransfers.ui.h:13 +#, fuzzy msgid "_Notify me when a file transfer is complete" -msgstr "" +msgstr "_Dosya aktarımı tamamlandığında beni uyar"

1 0

gajim: [Jingle] Reduce CPU and bandwidth usage with videotestsrc...
by Thibaut Girka 03 May '10

03 May '10

changeset 46c7d5227501 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=46c7d5227501 description: [Jingle] Reduce CPU and bandwidth usage with videotestsrc by fixing framerate diffstat: src/common/multimedia_helpers.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r a6dc2c1a0604 -r 46c7d5227501 src/common/multimedia_helpers.py --- a/src/common/multimedia_helpers.py Mon May 03 17:23:06 2010 +0200 +++ b/src/common/multimedia_helpers.py Mon May 03 18:09:55 2010 +0200 @@ -79,7 +79,7 @@ self.devices = {} # Test src self.detect_element('videotestsrc', _('Video test'), - '%s is-live=true') + '%s is-live=true ! video/x-raw-yuv,framerate=10/1') # Auto src self.detect_element('autovideosrc', _('Autodetect')) # V4L2 src

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 2010