Commits February 2013

commits@gajim.org

3 participants
86 discussions

gajim: backout bbc44ddb319b. Make import of gnome keyring work
by Yann Leboulanger 16 Feb '13

16 Feb '13

changeset 77e6e5283302 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=77e6e5283302 description: backout bbc44ddb319b. Make import of gnome keyring work diffstat: src/common/passwords.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r d1dbc3898df2 -r 77e6e5283302 src/common/passwords.py --- a/src/common/passwords.py Sat Feb 16 20:00:07 2013 +0100 +++ b/src/common/passwords.py Sat Feb 16 20:31:38 2013 +0100 @@ -200,7 +200,7 @@ global GnomeKeyring try: gir = __import__('gi.repository', globals(), locals(), - ['GnomeKeyring'], 1) + ['GnomeKeyring'], 0) GnomeKeyring = gir.GnomeKeyring except ImportError: pass

1 0

gajim: fix get_visible_range() can return None
by Yann Leboulanger 16 Feb '13

16 Feb '13

changeset d1dbc3898df2 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=d1dbc3898df2 description: fix get_visible_range() can return None diffstat: src/disco.py | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diffs (16 lines): diff -r 801ab2afcee1 -r d1dbc3898df2 src/disco.py --- a/src/disco.py Sun Jan 20 19:56:18 2013 +0100 +++ b/src/disco.py Sat Feb 16 20:00:07 2013 +0100 @@ -1905,8 +1905,10 @@ # Prevent a silly warning, try again in a bit. self._fetch_source = GObject.timeout_add(100, self._start_info_query) return - # We have to do this in a pygtk <2.8 compatible way :/ - start, end = view.get_visible_range() + range_ = view.get_visible_range() + if not range_: + return + start, end = range_ iter_ = self.model.get_iter(start) while iter_: if not self.model.get_value(iter_, 6):

1 0

gajim: add OOB url in message. Fixes #4325
by Yann Leboulanger 16 Feb '13

16 Feb '13

changeset 801ab2afcee1 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=801ab2afcee1 description: add OOB url in message. Fixes #4325 diffstat: src/common/connection_handlers_events.py | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diffs (25 lines): diff -r 634847315a0e -r 801ab2afcee1 src/common/connection_handlers_events.py --- a/src/common/connection_handlers_events.py Sat Jan 19 21:40:19 2013 -0400 +++ b/src/common/connection_handlers_events.py Sun Jan 20 19:56:18 2013 +0100 @@ -1276,6 +1276,21 @@ self.user_nick = self.stanza.getTagData('nick') or '' self.get_chatstate() + + oob_node = self.stanza.getTag('x', namespace=nbxmpp.NS_X_OOB) + self.oob_url = None + self.oob_desc = None + if oob_node: + self.oob_url = oob_node.getTagData('url') + self.oob_desc = oob_node.getTagData('desc') + if self.oob_url: + self.msgtxt += '\n' + if self.oob_desc: + self.msgtxt += self.oob_desc + else: + self.msgtxt += _('URL:') + self.msgtxt += ' ' + self.oob_url + return True class ChatstateReceivedEvent(nec.NetworkIncomingEvent):

1 0

gajim: Also cancel the jingle session when initiator for IBB tra...
by Jefry Lagrange 16 Feb '13

16 Feb '13

changeset 634847315a0e in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=634847315a0e description: Also cancel the jingle session when initiator for IBB transfer cancellation diffstat: src/common/file_props.py | 1 + src/common/protocol/bytestream.py | 8 ++++++++ 2 files changed, 9 insertions(+), 0 deletions(-) diffs (29 lines): diff -r 1583583111ff -r 634847315a0e src/common/file_props.py --- a/src/common/file_props.py Sun Jan 06 15:21:23 2013 +0400 +++ b/src/common/file_props.py Sat Jan 19 21:40:19 2013 -0400 @@ -135,6 +135,7 @@ self.hash_ = None self.fd = None self.startexmpp = None + # Type of the session, if it is 'jingle' or 'si' self.session_type = None self.request_id = None self.proxyhosts = None diff -r 1583583111ff -r 634847315a0e src/common/protocol/bytestream.py --- a/src/common/protocol/bytestream.py Sun Jan 06 15:21:23 2013 +0400 +++ b/src/common/protocol/bytestream.py Sat Jan 19 21:40:19 2013 -0400 @@ -812,6 +812,14 @@ file_props.direction[1:], 'set', payload=[nbxmpp.Node(nbxmpp.NS_IBB + ' close', {'sid':file_props.sid})])) + if file_props.session_type == 'jingle': + peerjid = \ + file_props.receiver if file_props.type_ == 's' else file_props.sender + session = self.get_jingle_session(peerjid, file_props.sid, 'file') + # According to the xep, the initiator also cancels the jingle session + # if there are no more files to send using IBB + if session.weinitiate: + session.cancel_session() def OpenStream(self, sid, to, fp, blocksize=4096): """

1 0

gajim: [Darlan] Update Hebrew translation
by Denis Fomin 16 Feb '13

16 Feb '13

changeset 1583583111ff in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=1583583111ff description: [Darlan] Update Hebrew translation diffstat: po/he.po | 2881 ++++++++++++++++++++++++++++++++++--------------------------- 1 files changed, 1619 insertions(+), 1262 deletions(-) diffs (truncated from 6415 to 300 lines): diff -r 915fe938fb8e -r 1583583111ff po/he.po --- a/po/he.po Sun Dec 30 19:47:48 2012 +0100 +++ b/po/he.po Sun Jan 06 15:21:23 2013 +0400 @@ -8,15 +8,15 @@ "Project-Id-Version: gajim 0.15\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2012-11-15 14:27+0400\n" -"PO-Revision-Date: 2012-12-09 10:07+0200\n" +"PO-Revision-Date: 2013-01-06 13:21+0200\n" "Last-Translator: Isratine Citizen <genghiskhan(a)gmx.ca>\n" "Language-Team: Rahut\n" "Language: he\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Poedit-Language: Hebrew\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" +"X-Generator: Poedit 1.5.4\n" #: ../data/gui/account_context_menu.ui.h:1 #: ../data/gui/zeroconf_context_menu.ui.h:1 @@ -27,8 +27,7 @@ msgid "_Personal Events" msgstr "_אירועים אישיים" -#: ../data/gui/account_context_menu.ui.h:3 -#: ../data/gui/roster_window.ui.h:3 +#: ../data/gui/account_context_menu.ui.h:3 ../data/gui/roster_window.ui.h:3 msgid "_Start Chat..." msgstr "התחל _שיחה..." @@ -36,18 +35,16 @@ # שיחה מרובת משתתפים # שיחה קבוצתית # קבוצת שיחה -#: ../data/gui/account_context_menu.ui.h:4 -#: ../data/gui/roster_window.ui.h:5 +#: ../data/gui/account_context_menu.ui.h:4 ../data/gui/roster_window.ui.h:5 msgid "Join _Group Chat..." -msgstr "הצטרף אל שיחת _קבוצה..." +msgstr "שיחת _קבוצה..." #: ../data/gui/account_context_menu.ui.h:5 msgid "_Add Contact..." msgstr "הוסף _איש קשר..." # איתור -#: ../data/gui/account_context_menu.ui.h:6 -#: ../data/gui/roster_window.ui.h:7 +#: ../data/gui/account_context_menu.ui.h:6 ../data/gui/roster_window.ui.h:7 msgid "_Discover Services" msgstr "מצא _שירותים" @@ -90,12 +87,12 @@ #: ../data/gui/account_creation_wizard_window.ui.h:6 msgid "Please choose one of the options below:" -msgstr "נא לבחור באחת מן האפשרויות מטה:" +msgstr "אנא בחר באחת מן האפשרויות מטה:" # credentials #: ../data/gui/account_creation_wizard_window.ui.h:7 msgid "Please fill in the data for your existing account" -msgstr "נא להזין את נתוני ההתחברות עבור חשבונך הקיים" +msgstr "אנא מלא את נתוני ההתחברות עבור חשבונך הקיים" #: ../data/gui/account_creation_wizard_window.ui.h:8 #: ../data/gui/accounts_window.ui.h:22 @@ -198,27 +195,14 @@ msgstr "_סיום" #: ../data/gui/account_creation_wizard_window.ui.h:30 -#: ../data/gui/accounts_window.ui.h:1 -#: ../data/gui/change_mood_dialog.ui.h:1 -#: ../src/config.py:1254 -#: ../src/config.py:1268 -#: ../src/config.py:1273 -#: ../src/config.py:1321 -#: ../src/config.py:1424 -#: ../src/config.py:1739 -#: ../src/config.py:1744 -#: ../src/config.py:2320 -#: ../src/config.py:2399 -#: ../src/config.py:2412 -#: ../src/config.py:3698 -#: ../src/config.py:3773 -#: ../src/dialogs.py:313 -#: ../src/dialogs.py:315 -#: ../src/dialogs.py:521 -#: ../src/dialogs.py:534 -#: ../src/roster_window.py:3214 -#: ../src/roster_window.py:3220 -#: ../src/roster_window.py:3225 +#: ../data/gui/accounts_window.ui.h:1 ../data/gui/change_mood_dialog.ui.h:1 +#: ../src/config.py:1254 ../src/config.py:1268 ../src/config.py:1273 +#: ../src/config.py:1321 ../src/config.py:1424 ../src/config.py:1739 +#: ../src/config.py:1744 ../src/config.py:2320 ../src/config.py:2399 +#: ../src/config.py:2412 ../src/config.py:3698 ../src/config.py:3773 +#: ../src/dialogs.py:313 ../src/dialogs.py:315 ../src/dialogs.py:521 +#: ../src/dialogs.py:534 ../src/roster_window.py:3214 +#: ../src/roster_window.py:3220 ../src/roster_window.py:3225 msgid "None" msgstr "ללא" @@ -227,28 +211,24 @@ msgstr "חשבונות" #. Change label for accept_button to action name instead of 'OK'. -#: ../data/gui/accounts_window.ui.h:3 -#: ../src/dialogs.py:3426 +#: ../data/gui/accounts_window.ui.h:3 ../src/dialogs.py:3426 #: ../src/dialogs.py:3472 msgid "Add" msgstr "הוספה" #. Change label for accept_button to action name instead of 'OK'. -#: ../data/gui/accounts_window.ui.h:4 -#: ../src/dialogs.py:3430 +#: ../data/gui/accounts_window.ui.h:4 ../src/dialogs.py:3430 #: ../src/dialogs.py:3527 msgid "Delete" msgstr "מחיקה" #. Rename -#: ../data/gui/accounts_window.ui.h:5 -#: ../src/roster_window.py:5844 +#: ../data/gui/accounts_window.ui.h:5 ../src/roster_window.py:5844 msgid "Re_name" msgstr "_שנה שם" #. XML Console enable checkbutton -#: ../data/gui/accounts_window.ui.h:6 -#: ../data/gui/xml_console_window.ui.h:3 +#: ../data/gui/accounts_window.ui.h:6 ../data/gui/xml_console_window.ui.h:3 msgid "_Enable" msgstr "א_פשר" @@ -258,20 +238,24 @@ msgstr "התאמתות אלמונית" #: ../data/gui/accounts_window.ui.h:8 -msgid "Resource is sent to the Jabber server in order to separate the same JID in two or more parts depending on the number of the clients connected in the same server with the same account. So you might be connected in the same account with resource 'Home' and 'Work' at the same time. The resource which has the highest priority will get the events. (see below)" -msgstr "משאב נשלח אל שרת Jabber בכדי להפריד את אותה כתובת JID בשני חלקים או יותר, בהסתמך על מספר הלקוחות שמחוברים אל אותו השרת עם אותו החשבון. כך שייתכן שתהיה מחובר אל אותו החשבון עם משאב 'בית' וגם 'עבודה' בו זמנית. המשאב לו נתונה העדיפות הגבוהה ביותר יקבל את האירועים. (ראו למטה)" +msgid "" +"Resource is sent to the Jabber server in order to separate the same JID in " +"two or more parts depending on the number of the clients connected in the " +"same server with the same account. So you might be connected in the same " +"account with resource 'Home' and 'Work' at the same time. The resource which " +"has the highest priority will get the events. (see below)" +msgstr "" +"משאב נשלח אל שרת Jabber בכדי להפריד את אותה כתובת JID בשני חלקים או יותר, " +"בהסתמך על מספר הלקוחות שמחוברים אל אותו השרת עם אותו החשבון. כך שייתכן שתהיה " +"מחובר אל אותו החשבון עם משאב 'בית' וגם 'עבודה' בו זמנית. המשאב לו נתונה " +"העדיפות הגבוהה ביותר יקבל את האירועים. (ראו למטה)" # In Hebrew: גאג'ים #. No configured account -#: ../data/gui/accounts_window.ui.h:9 -#: ../data/gui/roster_window.ui.h:1 -#: ../data/gajim.desktop.in.in.h:1 -#: ../src/common/helpers.py:1168 -#: ../src/common/helpers.py:1180 -#: ../src/notify.py:316 -#: ../src/notify.py:339 -#: ../src/notify.py:389 -#: ../src/notify.py:405 +#: ../data/gui/accounts_window.ui.h:9 ../data/gui/roster_window.ui.h:1 +#: ../data/gajim.desktop.in.in.h:1 ../src/common/helpers.py:1168 +#: ../src/common/helpers.py:1180 ../src/notify.py:316 ../src/notify.py:339 +#: ../src/notify.py:389 ../src/notify.py:405 msgid "Gajim" msgstr "‫Gajim" @@ -283,7 +267,7 @@ #: ../data/gui/accounts_window.ui.h:11 msgid "Click to request authorization to all contacts of another account" -msgstr "לחץ בכדי לבקש הרשאות עבור כל אנשי קשר של בחשבון אחר" +msgstr "לחץ בכדי לבקש הרשאות עבור כל אנשי קשר של חשבון אחר" #: ../data/gui/accounts_window.ui.h:12 msgid "Chan_ge Password" @@ -302,8 +286,14 @@ # BUG: from a jabber "the" # שני לקוחות ומעלה #: ../data/gui/accounts_window.ui.h:15 -msgid "Priority is used in Jabber to determine who gets the events from the jabber server when two or more clients are connected using the same account; The client with the highest priority gets the events" -msgstr "עדיפת משמשת אצל Jabber כדי לקבוע מי מקבל את האירועים מן שרת jabber כאשר שני לקוחות או יותר מחוברים באמצעות אותו החשבון; הלקוח בעל העדיפות הגבוהה ביותר יקבל את האירועים" +msgid "" +"Priority is used in Jabber to determine who gets the events from the jabber " +"server when two or more clients are connected using the same account; The " +"client with the highest priority gets the events" +msgstr "" +"עדיפת משמשת אצל Jabber כדי לקבוע מי מקבל את האירועים מן שרת jabber כאשר שני " +"לקוחות או יותר מחוברים באמצעות אותו החשבון; הלקוח בעל העדיפות הגבוהה ביותר " +"יקבל את האירועים" #: ../data/gui/accounts_window.ui.h:16 msgid "A_djust to status" @@ -351,8 +341,12 @@ # BUG: a dot at the end # כאשר ישוגר #: ../data/gui/accounts_window.ui.h:30 -msgid "If checked, Gajim, when launched, will automatically connect to jabber using this account" -msgstr "במידה ואפשרות זו מסומנת, Gajim, בעת שיגור, יתחבר אוטומטית אל jabber באמצעות חשבון זה" +msgid "" +"If checked, Gajim, when launched, will automatically connect to jabber using " +"this account" +msgstr "" +"במידה ואפשרות זו מסומנת, Gajim, בעת שיגור, יתחבר אוטומטית אל jabber באמצעות " +"חשבון זה" # BUG: _underline # במידה והחיבור @@ -377,8 +371,13 @@ # תיבת קומבינה (קומבינציה) # תיבת שיח #: ../data/gui/accounts_window.ui.h:34 -msgid "If checked, any change to the global status (handled by the combobox at the bottom of the roster window) will change the status of this account accordingly" -msgstr "במידה ואפשרות זו מסומנת, כל שינוי אל מצב־החיבור הגלובלי (מטופל על ידי תיבת־הבחירה שמצויה בתחתית חלון הרשימה) ישנה את המצב של חשבון זה בהתאמה" +msgid "" +"If checked, any change to the global status (handled by the combobox at the " +"bottom of the roster window) will change the status of this account " +"accordingly" +msgstr "" +"במידה ואפשרות זו מסומנת, כל שינוי אל מצב החיבור הגלובלי (מטופל על ידי תיבת־" +"הבחירה שמצויה בתחתית חלון הרשימה) ישנה את המצב של חשבון זה בהתאמה" # BUG: _underline #: ../data/gui/accounts_window.ui.h:35 @@ -387,21 +386,21 @@ # שיהיו סיכויים גדולים יותר להעברת קובץ לעבוד #: ../data/gui/accounts_window.ui.h:36 -msgid "If checked, Gajim will also broadcast some more IPs except from just your IP, so file transfer has higher chances of working." -msgstr "במידה ואפשרות זו מסומנת, Gajim ישדר, בנוסף לכתובת פרוטוקול המרשתת (IP) שלך, מספר כתובות IP נוספות, כך שלהעברת קובץ יהיו סיכויים גדולים יותר לעבוד." +msgid "" +"If checked, Gajim will also broadcast some more IPs except from just your " +"IP, so file transfer has higher chances of working." +msgstr "" +"במידה ואפשרות זו מסומנת, Gajim ישדר, בנוסף לכתובת פרוטוקול המרשתת (IP) שלך, " +"מספר כתובות IP נוספות, כך שלהעברת קובץ יהיו סיכויים גדולים יותר לעבוד." # אכן, זוהי קבוצה כללית. נא לא להפוך זאת באופן שרירותי ל"רישום" כללי או לכל מילה אחר שלא קשורה אל התוכנית #. FIXME: Ugly workaround. #. 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:37 -#: ../data/gui/preferences_window.ui.h:46 -#: ../src/common/contacts.py:135 -#: ../src/dialogs.py:113 -#: ../src/dialogs.py:125 -#: ../src/roster_window.py:3156 -#: ../src/roster_window.py:4284 +#: ../data/gui/accounts_window.ui.h:37 ../data/gui/preferences_window.ui.h:46 +#: ../src/common/contacts.py:135 ../src/dialogs.py:113 ../src/dialogs.py:125 +#: ../src/roster_window.py:3156 ../src/roster_window.py:4284 #: ../src/roster_window.py:5894 msgid "General" msgstr "כללית" @@ -410,10 +409,9 @@ msgid "_use HTTP__PROXY environment variable" msgstr "השתמש במשת_ני סביבת HTTP__PROXY" -#: ../data/gui/accounts_window.ui.h:39 -#: ../data/gui/preferences_window.ui.h:137 +#: ../data/gui/accounts_window.ui.h:39 ../data/gui/preferences_window.ui.h:137 msgid "_Manage..." -msgstr " ניהו_ל... " +msgstr " נה_ל... " #: ../data/gui/accounts_window.ui.h:40 msgid "Proxy" @@ -424,8 +422,12 @@ msgstr "ה_זהר אותי לפני שימוש בחיבור לא מאובטח" #: ../data/gui/accounts_window.ui.h:42 -msgid "Check this so Gajim will ask you before sending your password over an insecure connection." -msgstr "סמנו את אפשרות זו כדי ש־Gajim ישאל אותך טרם שליחת סיסמתך על פני חיבור לא מאובטח." +msgid "" +"Check this so Gajim will ask you before sending your password over an " +"insecure connection." +msgstr "" +"סמן את אפשרות זו כדי ש־Gajim ישאל אותך טרם שליחת סיסמתך על פני חיבור לא " +"מאובטח." # חבילות נתונים מסוג #: ../data/gui/accounts_window.ui.h:43 @@ -434,13 +436,17 @@ # BUG: a dot at the end #: ../data/gui/accounts_window.ui.h:44 -msgid "If checked, Gajim will send keep-alive packets to prevent connection timeout which results in disconnection" -msgstr "במידה ואפשרות זו מסומנת, Gajim ישלח חבילות keep-alive כדי למנוע פקיעת זמן של חיבור (connection timeout) המביאה לידי ניתוק" - -# התאמה של שם +msgid "" +"If checked, Gajim will send keep-alive packets to prevent connection timeout " +"which results in disconnection"

1 0

gajim: ability to see out own video in the same time we send it ...
by Yann Leboulanger 16 Feb '13

16 Feb '13

changeset 882d1ab5b759 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=882d1ab5b759 description: ability to see out own video in the same time we send it and show both outging and incoming videos inside chat control diffstat: src/chat_control.py | 19 ++++++++++++++++++- src/common/config.py | 1 + src/common/jingle.py | 8 +++++--- src/common/multimedia_helpers.py | 2 +- src/config.py | 5 +++++ 5 files changed, 30 insertions(+), 5 deletions(-) diffs (102 lines): diff -r 9668f600f1f1 -r 882d1ab5b759 src/chat_control.py --- a/src/chat_control.py Sun Dec 30 16:20:57 2012 +0100 +++ b/src/chat_control.py Sun Dec 30 18:59:48 2012 +0100 @@ -2192,10 +2192,27 @@ if widget.get_active(): if getattr(self, jingle_type + '_state') == \ self.JINGLE_STATE_NULL: - sid = getattr(gajim.connections[self.account], + if jingle_type == 'video': + video_hbox = self.xml.get_object('video_hbox') + video_hbox.set_no_show_all(False) + if gajim.config.get('video_see_self'): + fixed = self.xml.get_object('outgoing_fixed') + fixed.set_no_show_all(False) + video_hbox.show_all() + in_xid = self.xml.get_object('incoming_drawingarea').window.xid + out_xid = self.xml.get_object('outgoing_drawingarea').window.xid + sid = gajim.connections[self.account].start_video( + self.contact.get_full_jid(), in_xid, out_xid) + else: + sid = getattr(gajim.connections[self.account], 'start_' + jingle_type)(self.contact.get_full_jid()) getattr(self, 'set_' + jingle_type + '_state')('connecting', sid) else: + video_hbox = self.xml.get_object('video_hbox') + video_hbox.set_no_show_all(True) + video_hbox.hide() + fixed = self.xml.get_object('outgoing_fixed') + fixed.set_no_show_all(True) self.close_jingle_content(jingle_type) img = getattr(self, '_' + jingle_type + '_button').get_property('image') diff -r 9668f600f1f1 -r 882d1ab5b759 src/common/config.py --- a/src/common/config.py Sun Dec 30 16:20:57 2012 +0100 +++ b/src/common/config.py Sun Dec 30 18:59:48 2012 +0100 @@ -305,6 +305,7 @@ 'video_output_device': [opt_str, 'autovideosink'], 'video_framerate': [opt_str, '', _('Optionally fix jingle output video framerate. Example: 10/1 or 25/2')], 'video_size': [opt_str, '', _('Optionally resize jingle output video. Example: 320x240')], + 'video_see_self': [opt_bool, True, _('If True, You will also see your webcam')], 'audio_input_volume': [opt_int, 50], 'audio_output_volume': [opt_int, 50], 'use_stun_server': [opt_bool, False, _('If True, Gajim will try to use a STUN server when using jingle. The one in "stun_server" option, or the one given by the jabber server.')], diff -r 9668f600f1f1 -r 882d1ab5b759 src/common/jingle.py --- a/src/common/jingle.py Sun Dec 30 16:20:57 2012 +0100 +++ b/src/common/jingle.py Sun Dec 30 18:59:48 2012 +0100 @@ -120,16 +120,18 @@ jingle.start_session() return jingle.sid - def start_video(self, jid): + def start_video(self, jid, in_xid, out_xid): if self.get_jingle_session(jid, media='video'): return self.get_jingle_session(jid, media='video').sid jingle = self.get_jingle_session(jid, media='audio') if jingle: - jingle.add_content('video', JingleVideo(jingle)) + jingle.add_content('video', JingleVideo(jingle, in_xid=in_xid, + out_xid=out_xid)) else: jingle = JingleSession(self, weinitiate=True, jid=jid) self._sessions[jingle.sid] = jingle - jingle.add_content('video', JingleVideo(jingle)) + jingle.add_content('video', JingleVideo(jingle, in_xid=in_xid, + out_xid=out_xid)) jingle.start_session() return jingle.sid diff -r 9668f600f1f1 -r 882d1ab5b759 src/common/multimedia_helpers.py --- a/src/common/multimedia_helpers.py Sun Dec 30 16:20:57 2012 +0100 +++ b/src/common/multimedia_helpers.py Sun Dec 30 18:59:48 2012 +0100 @@ -102,7 +102,7 @@ def detect(self): self.devices = {} # Fake video output - self.detect_element('fakesink', _('Fake audio output')) + self.detect_element('fakesink', _('Fake video output')) # Auto sink self.detect_element('xvimagesink', _('X Window System (X11/XShm/Xv): %s')) diff -r 9668f600f1f1 -r 882d1ab5b759 src/config.py --- a/src/config.py Sun Dec 30 16:20:57 2012 +0100 +++ b/src/config.py Sun Dec 30 18:59:48 2012 +0100 @@ -480,6 +480,8 @@ '800x600': '800x600', '640x480': '640x480', '320x240': '320x240'}, 'video_size', key=lambda x: -1 if \ not x[1] else int(x[0][:3])) + st = gajim.config.get('video_see_self') + self.xml.get_object('video_see_self_checkbutton').set_active(st) else: for opt_name in ('audio_input', 'audio_output', 'video_input', @@ -1133,6 +1135,9 @@ def on_video_size_combobox_changed(self, widget): self.on_av_combobox_changed(widget, 'video_size') + def on_video_see_self_checkbutton_toggled(self, widget): + self.on_checkbutton_toggled(widget, 'video_see_self') + def on_stun_checkbutton_toggled(self, widget): self.on_checkbutton_toggled(widget, 'use_stun_server', [self.xml.get_object('stun_server_entry')])

1 0

gajim: [Daniel] fix typo in nb translation
by Yann Leboulanger 16 Feb '13

16 Feb '13

changeset 915fe938fb8e in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=915fe938fb8e description: [Daniel] fix typo in nb translation diffstat: po/nb.po | 9335 +++++++++++++++++++++++++++++++++---------------------------- 1 files changed, 5067 insertions(+), 4268 deletions(-) diffs (truncated from 14752 to 300 lines): diff -r 882d1ab5b759 -r 915fe938fb8e po/nb.po --- a/po/nb.po Sun Dec 30 18:59:48 2012 +0100 +++ b/po/nb.po Sun Dec 30 19:47:48 2012 +0100 @@ -2,15 +2,11 @@ # This file is distributed under the same license as the Gajim package. # Stian B. Barmen <stian(a)jabber.no>, 2005. # -#: ../src/gajim-remote-plugin.py:221 ../src/gajim-remote-plugin.py:228 -#: ../src/gajim-remote-plugin.py:254 ../src/gajim-remote-plugin.py:255 -#: ../src/gajim-remote-plugin.py:261 ../src/gajim-remote-plugin.py:262 -#: ../src/gajim-remote-plugin.py:263 ../src/gajim-remote-plugin.py:264 msgid "" msgstr "" "Project-Id-Version: Gajim 0.11\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-10-01 20:39+0200\n" +"POT-Creation-Date: 2012-12-30 19:46+0100\n" "PO-Revision-Date: 2009-11-18 15:50+0100\n" "Last-Translator: Stian B. Barmen <stian(a)barmen.nu>\n" "Language-Team: <>\n" @@ -21,44 +17,139 @@ "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Poedit-Bookmarks: -1,775,-1,-1,-1,-1,-1,-1,-1,-1\n" -#: ../data/gui/account_context_menu.ui.h:1 ../data/gui/roster_window.ui.h:7 +#: ../data/gui/account_context_menu.ui.h:1 +#: ../data/gui/zeroconf_context_menu.ui.h:1 +msgid "_Status" +msgstr "_Status" + +#: ../data/gui/account_context_menu.ui.h:2 +msgid "_Personal Events" +msgstr "_Personlige Hendelser" + +#: ../data/gui/account_context_menu.ui.h:3 ../data/gui/roster_window.ui.h:3 +msgid "_Start Chat..." +msgstr "_Start Samtale..." + +#: ../data/gui/account_context_menu.ui.h:4 ../data/gui/roster_window.ui.h:5 msgid "Join _Group Chat..." msgstr "Bli med i _Gruppe Samtale..." -#: ../data/gui/account_context_menu.ui.h:2 +#: ../data/gui/account_context_menu.ui.h:5 msgid "_Add Contact..." msgstr "_Legg til Kontakt..." -#: ../data/gui/account_context_menu.ui.h:3 ../data/gui/roster_window.ui.h:18 +#: ../data/gui/account_context_menu.ui.h:6 ../data/gui/roster_window.ui.h:7 msgid "_Discover Services" msgstr "_Oppdag Tjenester" -#: ../data/gui/account_context_menu.ui.h:4 +#: ../data/gui/account_context_menu.ui.h:7 msgid "_Execute Command..." msgstr "_Kjør Kommando" -#: ../data/gui/account_context_menu.ui.h:5 +#: ../data/gui/account_context_menu.ui.h:8 +msgid "_Open Gmail Inbox" +msgstr "_Åpne Gmail Innboks" + +#: ../data/gui/account_context_menu.ui.h:9 msgid "_Modify Account" msgstr "_Rediger Konto" -#: ../data/gui/account_context_menu.ui.h:6 -msgid "_Open Gmail Inbox" -msgstr "_Åpne Gmail Innboks" - -#: ../data/gui/account_context_menu.ui.h:7 -msgid "_Personal Events" -msgstr "_Personlige Hendelser" - -#: ../data/gui/account_context_menu.ui.h:8 ../data/gui/roster_window.ui.h:24 -msgid "_Start Chat..." -msgstr "_Start Samtale..." - -#: ../data/gui/account_context_menu.ui.h:9 -#: ../data/gui/zeroconf_context_menu.ui.h:2 -msgid "_Status" -msgstr "_Status" - #: ../data/gui/account_creation_wizard_window.ui.h:1 +msgid "Gajim: Account Creation Wizard" +msgstr "Gajim: Konto Opprettings Veiviser" + +#: ../data/gui/account_creation_wizard_window.ui.h:2 +msgid "" +"You need to have an account in order to connect\n" +"to the Jabber network." +msgstr "" +"Du trenger en konto før du kan koble\n" +"til Jabber nettverket." + +#: ../data/gui/account_creation_wizard_window.ui.h:4 +msgid "I already have an account I want to _use" +msgstr "Jeg har allerede en konto jeg ønsker å _bruke" + +#: ../data/gui/account_creation_wizard_window.ui.h:5 +msgid "I want to _register for a new account" +msgstr "Jeg ønsker å _registrere en ny konto" + +#: ../data/gui/account_creation_wizard_window.ui.h:6 +msgid "Please choose one of the options below:" +msgstr "Vennligst velg ett av valgene under:" + +#: ../data/gui/account_creation_wizard_window.ui.h:7 +msgid "Please fill in the data for your existing account" +msgstr "Vennligst fyll in data for din eksisterende konto" + +#: ../data/gui/account_creation_wizard_window.ui.h:8 +#: ../data/gui/accounts_window.ui.h:22 +#: ../data/gui/manage_bookmarks_window.ui.h:2 +msgid "_Password:" +msgstr "_Passord:" + +#: ../data/gui/account_creation_wizard_window.ui.h:9 +#: ../data/gui/accounts_window.ui.h:20 +msgid "Save pass_word" +msgstr "Lagre pass_ord" + +#: ../data/gui/account_creation_wizard_window.ui.h:10 +#: ../data/gui/accounts_window.ui.h:21 +msgid "If checked, Gajim will remember the password for this account" +msgstr "Dersom valgt vil Gajim huske passordet for kontoen" + +#: ../data/gui/account_creation_wizard_window.ui.h:11 +#: ../data/gui/accounts_window.ui.h:23 +msgid "_Jabber ID:" +msgstr "_Jabber ID:" + +#: ../data/gui/account_creation_wizard_window.ui.h:12 +msgid "Anon_ymous authentication" +msgstr "Anon_ym autentisering" + +#: ../data/gui/account_creation_wizard_window.ui.h:13 +msgid "Please select a server" +msgstr "Vennligst velg en server" + +#: ../data/gui/account_creation_wizard_window.ui.h:14 +#: ../data/gui/manage_bookmarks_window.ui.h:3 +msgid "_Server:" +msgstr "_Server:" + +#: ../data/gui/account_creation_wizard_window.ui.h:15 +msgid "Prox_y:" +msgstr "Prox_y:" + +#: ../data/gui/account_creation_wizard_window.ui.h:16 +msgid "Manage..." +msgstr "Behandle..." + +#: ../data/gui/account_creation_wizard_window.ui.h:17 +msgid "Use custom hostname/port" +msgstr "Bruk egendefinert maskinnavn/port" + +#: ../data/gui/account_creation_wizard_window.ui.h:18 +msgid "_Hostname:" +msgstr "_Maskinnavn:" + +#: ../data/gui/account_creation_wizard_window.ui.h:19 +msgid "_Port:" +msgstr "_Port:" + +#: ../data/gui/account_creation_wizard_window.ui.h:20 +#: ../data/gui/roster_window.ui.h:8 +msgid "_Advanced" +msgstr "_Avansert" + +#: ../data/gui/account_creation_wizard_window.ui.h:21 +msgid "" +"Add this certificate to the list of trusted certificates.\n" +"SHA1 fingerprint of the certificate:\n" +msgstr "" +"Legg til dette sertifikatet til listen over tiltrodde leverandører.\n" +"SHA1 fingeravtrykk til sertifikatet:\n" + +#: ../data/gui/account_creation_wizard_window.ui.h:24 msgid "" "Connecting to server\n" "\n" @@ -68,343 +159,61 @@ "\n" "Vennligst vent..." -#: ../data/gui/account_creation_wizard_window.ui.h:4 -msgid "Please choose one of the options below:" -msgstr "Vennligst velg ett av valgene under:" - -#: ../data/gui/account_creation_wizard_window.ui.h:5 -msgid "Please fill in the data for your existing account" -msgstr "Vennligst fyll in data for din eksisterende konto" - -#: ../data/gui/account_creation_wizard_window.ui.h:6 -msgid "Please select a server" -msgstr "Vennligst velg en server" - -#: ../data/gui/account_creation_wizard_window.ui.h:7 -msgid "" -"Add this certificate to the list of trusted certificates.\n" -"SHA1 fingerprint of the certificate:\n" -msgstr "" -"Legg til dette sertifikatet til listen over tiltrodde leverandører.\n" -"SHA1 fingeravtrykk til sertifikatet:\n" - -#: ../data/gui/account_creation_wizard_window.ui.h:10 -msgid "Anon_ymous authentication" -msgstr "Anon_ym autentisering" - -#: ../data/gui/account_creation_wizard_window.ui.h:11 +#: ../data/gui/account_creation_wizard_window.ui.h:27 msgid "Connect when I press Finish" msgstr "Koble til når jeg klikker Ferdig" -#: ../data/gui/account_creation_wizard_window.ui.h:12 -msgid "Gajim: Account Creation Wizard" -msgstr "Gajim: Konto Opprettings Veiviser" - -#: ../data/gui/account_creation_wizard_window.ui.h:13 -msgid "I already have an account I want to _use" -msgstr "Jeg har allerede en konto jeg ønsker å _bruke" - -#: ../data/gui/account_creation_wizard_window.ui.h:14 -msgid "I want to _register for a new account" -msgstr "Jeg ønsker å _registrere en ny konto" - -#: ../data/gui/account_creation_wizard_window.ui.h:15 -#: ../data/gui/accounts_window.ui.h:28 -msgid "If checked, Gajim will remember the password for this account" -msgstr "Dersom valgt vil Gajim huske passordet for kontoen" - -#: ../data/gui/account_creation_wizard_window.ui.h:16 -msgid "Manage..." -msgstr "Behandle..." - -#: ../data/gui/account_creation_wizard_window.ui.h:17 -#: ../data/gui/accounts_window.ui.h:39 ../data/gui/change_mood_dialog.ui.h:3 -#: ../src/config.py:1280 ../src/config.py:1383 ../src/config.py:1694 -#: ../src/config.py:1699 ../src/config.py:2265 ../src/config.py:2344 -#: ../src/config.py:2357 ../src/config.py:3613 ../src/config.py:3688 -#: ../src/dialogs.py:309 ../src/dialogs.py:311 ../src/dialogs.py:514 -#: ../src/dialogs.py:527 ../src/roster_window.py:2956 -#: ../src/roster_window.py:2962 ../src/roster_window.py:2967 +#: ../data/gui/account_creation_wizard_window.ui.h:28 +msgid "Set my profile when I connect" +msgstr "Klargjør profilen min når jeg kobler til" + +#: ../data/gui/account_creation_wizard_window.ui.h:29 +msgid "_Finish" +msgstr "_Avslutt" + +#: ../data/gui/account_creation_wizard_window.ui.h:30 +#: ../data/gui/accounts_window.ui.h:1 ../data/gui/change_mood_dialog.ui.h:1 +#: ../src/config.py:1259 ../src/config.py:1273 ../src/config.py:1278 +#: ../src/config.py:1326 ../src/config.py:1429 ../src/config.py:1744 +#: ../src/config.py:1749 ../src/config.py:2325 ../src/config.py:2404 +#: ../src/config.py:2417 ../src/config.py:3690 ../src/config.py:3765 +#: ../src/dialogs.py:313 ../src/dialogs.py:315 ../src/dialogs.py:521 +#: ../src/dialogs.py:534 ../src/roster_window.py:3214 +#: ../src/roster_window.py:3220 ../src/roster_window.py:3225 msgid "None" msgstr "Ingen" -#: ../data/gui/account_creation_wizard_window.ui.h:18 -msgid "Prox_y:" -msgstr "Prox_y:" - -#: ../data/gui/account_creation_wizard_window.ui.h:19 -#: ../data/gui/accounts_window.ui.h:48 -msgid "Save pass_word" -msgstr "Lagre pass_ord" - -#: ../data/gui/account_creation_wizard_window.ui.h:20 -msgid "Set my profile when I connect" -msgstr "Klargjør profilen min når jeg kobler til" - -#: ../data/gui/account_creation_wizard_window.ui.h:21 -msgid "Use custom hostname/port" -msgstr "Bruk egendefinert maskinnavn/port" - -#: ../data/gui/account_creation_wizard_window.ui.h:22 -msgid "" -"You need to have an account in order to connect\n" -"to the Jabber network." -msgstr "" -"Du trenger en konto før du kan koble\n" -"til Jabber nettverket." - -#: ../data/gui/account_creation_wizard_window.ui.h:24 -#: ../data/gui/roster_window.ui.h:16 -msgid "_Advanced" -msgstr "_Avansert" - -#: ../data/gui/account_creation_wizard_window.ui.h:25 -msgid "_Finish" -msgstr "_Avslutt" - -#: ../data/gui/account_creation_wizard_window.ui.h:26 -msgid "_Hostname:"

1 0

gajim: fix order of farstream calls
by Yann Leboulanger 16 Feb '13

16 Feb '13

changeset 9668f600f1f1 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=9668f600f1f1 description: fix order of farstream calls diffstat: src/common/jingle_rtp.py | 23 ++++++++++++++++++----- 1 files changed, 18 insertions(+), 5 deletions(-) diffs (40 lines): diff -r 161d893e3bac -r 9668f600f1f1 src/common/jingle_rtp.py --- a/src/common/jingle_rtp.py Fri Jul 22 12:05:38 2011 +0200 +++ b/src/common/jingle_rtp.py Sun Dec 30 16:20:57 2012 +0100 @@ -178,6 +178,15 @@ elif name == 'farstream-codecs-changed': if self.sent and self.p2psession.get_property('codecs'): self.send_description_info() + if self.transport.remote_candidates: + # those lines MUST be done after we get info on our + # codecs + self.p2pstream.add_remote_candidates( + self.transport.remote_candidates) + self.transport.remote_candidates = [] + self.p2pstream.set_property('direction', + farstream.DIRECTION_BOTH) + elif name == 'farstream-local-candidates-prepared': self.candidates_ready = True if self.is_ready(): @@ -235,11 +244,15 @@ def on_negotiated(self): if self.accepted: - if self.transport.remote_candidates: - self.p2pstream.add_remote_candidates(self.transport.remote_candidates) - self.transport.remote_candidates = [] - # TODO: farstream.DIRECTION_BOTH only if senders='both' - self.p2pstream.set_property('direction', farstream.DIRECTION_BOTH) + if self.p2psession.get_property('codecs'): + # those lines MUST be done after we get info on our codecs + if self.transport.remote_candidates: + self.p2pstream.add_remote_candidates( + self.transport.remote_candidates) + self.transport.remote_candidates = [] + # TODO: farstream.DIRECTION_BOTH only if senders='both' + self.p2pstream.set_property('direction', + farstream.DIRECTION_BOTH) JingleContent.on_negotiated(self) def __on_remote_codecs(self, stanza, content, error, action):

1 0

gajim: [OlegOAndreev] add Ctrl+K support to enable roster filter...
by Yann Leboulanger 16 Feb '13

16 Feb '13

changeset 639dad01a62b in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=639dad01a62b description: [OlegOAndreev] add Ctrl+K support to enable roster filter. Fixes #7302 diffstat: src/roster_window.py | 15 ++++++++++++++- 1 files changed, 14 insertions(+), 1 deletions(-) diffs (53 lines): diff -r eab7311f57a2 -r 639dad01a62b src/roster_window.py --- a/src/roster_window.py Tue Feb 12 19:31:35 2013 +0100 +++ b/src/roster_window.py Sat Feb 16 12:27:28 2013 +0100 @@ -3567,6 +3567,8 @@ self.send_pep(account, pep_dict) dialogs.ChangeStatusMessageDialog(on_response, status) return True + elif keyval == gtk.keysyms.k: # CTRL + k + self.enable_rfilter('') def on_roster_treeview_button_press_event(self, widget, event): # hide tooltip, no matter the button is pressed @@ -4435,7 +4437,6 @@ self.disable_rfilter() def on_rfilter_entry_key_press_event(self, widget, event): - print 'rfilter', event.keyval if event.keyval == gtk.keysyms.Escape: self.disable_rfilter() elif event.keyval == gtk.keysyms.Return: @@ -4462,6 +4463,10 @@ self.tree.expand_all() self.rfilter_entry.set_position(-1) + # If roster is hidden, let's temporarily show it. This can happen if user + # enables rfilter via keyboard shortcut. + self.show_roster_vbox(True) + def disable_rfilter(self): self.rfilter_enabled = False self.rfilter_entry.set_text('') @@ -4471,6 +4476,9 @@ self.tree.grab_focus() self._readjust_expand_collapse_state() + # If roster was hidden before enable_rfilter was called, hide it back. + self.on_show_roster_menuitem_toggled(self.xml.get_object('show_roster_menuitem')) + def on_roster_hpaned_notify(self, pane, gparamspec): """ Keep changing the width of the roster @@ -6690,6 +6698,11 @@ keyval, mod = gtk.accelerator_parse('<Control>s') accel_group.connect_group(keyval, mod, gtk.ACCEL_VISIBLE, self.accel_group_func) + + # Setting CTRL+k to focus rfilter_entry + keyval, mod = gtk.accelerator_parse('<Control>k') + accel_group.connect_group(keyval, mod, gtk.ACCEL_VISIBLE, + self.accel_group_func) self.window.add_accel_group(accel_group) # Setting the search stuff

1 0

gajim: fix weird traceback
by Yann Leboulanger 15 Feb '13

15 Feb '13

changeset 161d893e3bac in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=161d893e3bac description: fix weird traceback diffstat: src/message_window.py | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diffs (15 lines): diff -r 02568b3d4553 -r 161d893e3bac src/message_window.py --- a/src/message_window.py Fri Feb 15 00:29:16 2013 +0400 +++ b/src/message_window.py Fri Jul 22 12:05:38 2011 +0200 @@ -623,7 +623,10 @@ self.notebook.set_show_tabs(show_tabs_if_one_tab) def redraw_tab(self, ctrl, chatstate = None): - hbox = self.notebook.get_tab_label(ctrl.widget).get_children()[0] + tab = self.notebook.get_tab_label(ctrl.widget) + if not tab: + return + hbox = tab.get_children()[0] status_img = hbox.get_children()[0] nick_label = hbox.get_children()[1]

1 0

← Newer
1
2
3
4
5
6
7
8
9
Older →

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits February 2013