Commits

commits@gajim.org

17632 discussions

gajim: [Darlan] Update Copiright
by Denis Fomin 13 Aug '13

13 Aug '13

changeset a31ac13665a4 in /home/hg/repos/gajim branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=a31ac13665a4 description: [Darlan] Update Copiright diffstat: src/dialogs.py | 2 +- 1 файлов изменено, 1 вставок(+), 1 удалений(-) различия (12 строк): diff -r 9da845138617 -r a31ac13665a4 src/dialogs.py --- a/src/dialogs.py Tue Aug 13 21:18:44 2013 +0200 +++ b/src/dialogs.py Tue Aug 13 23:33:28 2013 +0400 @@ -1269,7 +1269,7 @@ dlg.set_transient_for(gajim.interface.roster.window) dlg.set_name('Gajim') dlg.set_version(gajim.version) - s = u'Copyright © 2003-2012 Gajim Team' + s = u'Copyright © 2003-2013 Gajim Team' dlg.set_copyright(s) copying_file_path = self.get_path('COPYING') if copying_file_path:

1 0

gajim: print correctly when we correct a /me message. Fixes #7400
by Yann Leboulanger 13 Aug '13

13 Aug '13

changeset 9da845138617 in /home/hg/repos/gajim branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=9da845138617 description: print correctly when we correct a /me message. Fixes #7400 diffstat: src/chat_control.py | 12 ++++++------ src/conversation_textview.py | 8 +++++++- 2 files changed, 13 insertions(+), 7 deletions(-) diffs (58 lines): diff -r 1e52119ce230 -r 9da845138617 src/chat_control.py --- a/src/chat_control.py Tue Aug 13 22:29:17 2013 +0400 +++ b/src/chat_control.py Tue Aug 13 21:18:44 2013 +0200 @@ -1359,8 +1359,8 @@ self.orig_msg = msg_buf.get_text(start_iter, end_iter, 0).decode( 'utf-8') if pos == size and size > 0 and direction == 'up' and \ - msg_type == 'sent' and not self.correcting and not \ - history[pos - 1].startswith('/'): + msg_type == 'sent' and not self.correcting and (not \ + history[pos - 1].startswith('/') or history[pos - 1].startswith('/me')): self.correcting = True self.old_message_tv_color = self.msg_textview.get_style().base[0] self.msg_textview.modify_base(gtk.STATE_NORMAL, gtk.gdk.color_parse( @@ -2985,14 +2985,14 @@ xhtml = None if row[2].startswith('<body '): xhtml = row[2] + if row[2].startswith('/me ') or row[2].startswith('/me\n'): + local_old_kind = None + else: + local_old_kind = kind ChatControlBase.print_conversation_line(self, row[2], kind, name, tim, small_attr, small_attr + ['restored_message'], small_attr + ['restored_message'], False, old_kind=local_old_kind, xhtml=xhtml) - if row[2].startswith('/me ') or row[2].startswith('/me\n'): - local_old_kind = None - else: - local_old_kind = kind if len(rows): self.conv_textview.print_empty_line() diff -r 1e52119ce230 -r 9da845138617 src/conversation_textview.py --- a/src/conversation_textview.py Tue Aug 13 22:29:17 2013 +0400 +++ b/src/conversation_textview.py Tue Aug 13 21:18:44 2013 +0200 @@ -486,7 +486,10 @@ i2 = buffer_.get_iter_at_mark(m2) txt = buffer_.get_text(i1, i2) buffer_.delete(i1, i2) - i2 = self.print_real_text(message, text_tags=['outgoingtxt'], name=name, + tag = 'outgoingtxt' + if message.startswith('/me'): + tag = 'outgoing' + i2 = self.print_real_text(message, text_tags=[tag], name=name, xhtml=xhtml, iter_=i1) tt_txt = _('Message was corrected. Last message was:\n %s') % \ old_txt @@ -1333,6 +1336,9 @@ if other_text_tag: # note that color of /me may be overwritten in gc_control text_tags.append(other_text_tag) + if text.startswith('/me'): + mark1 = buffer_.create_mark(None, buffer_.get_end_iter(), + left_gravity=True) else: # not status nor /me if gajim.config.get('chat_merge_consecutive_nickname'): if kind != old_kind or self.just_cleared:

1 0

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

13 Aug '13

changeset 1e52119ce230 in /home/hg/repos/gajim branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=1e52119ce230 description: [Darlan] Update Hebrew translation diffstat: po/he.po | 274 +++++++++++++++++++++++++++++++------------------------------- 1 файлов изменено, 139 вставок(+), 135 удалений(-) различия (урезанные с 907 до 300 строк): diff -r 2f8dcd2de56f -r 1e52119ce230 po/he.po --- a/po/he.po Tue Aug 13 18:27:17 2013 +0200 +++ b/po/he.po Tue Aug 13 22:29:17 2013 +0400 @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: gajim 0.15\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-08-08 09:00+0300\n" -"PO-Revision-Date: 2013-08-09 20:48+0200\n" +"POT-Creation-Date: 2013-08-12 15:40+0300\n" +"PO-Revision-Date: 2013-08-12 16:09+0200\n" "Last-Translator: Isratine Citizen <genghiskhan(a)gmx.ca>\n" "Language-Team: Rahut\n" "Language: he\n" @@ -77,7 +77,7 @@ # בו אני רוצה לעשות #: ../data/gui/account_creation_wizard_window.ui.h:4 msgid "I already have an account I want to _use" -msgstr "כבר קיים ברשותי _חשבון אשר ברצוני לעשות שימוש בו" +msgstr "כבר קיים ברשותי _חשבון אשר ברצוני לעשות בו שימוש" # I want to _register a new account # אני רוצה _לרשום חשבון חדש @@ -216,13 +216,13 @@ #: ../data/gui/accounts_window.ui.h:3 ../src/dialogs.py:3509 #: ../src/dialogs.py:3555 msgid "Add" -msgstr "הוספה" +msgstr "הוסף" #. Change label for accept_button to action name instead of 'OK'. #: ../data/gui/accounts_window.ui.h:4 ../src/dialogs.py:3513 #: ../src/dialogs.py:3610 msgid "Delete" -msgstr "מחיקה" +msgstr "מחק" #. Rename #: ../data/gui/accounts_window.ui.h:5 ../src/roster_window.py:5793 @@ -1109,11 +1109,11 @@ #: ../data/gui/gc_occupants_menu.ui.h:13 ../src/roster_window.py:5820 #: ../src/roster_window.py:5945 ../src/roster_window.py:6075 msgid "_Block" -msgstr "_חסום" +msgstr "_אסור" #: ../data/gui/contact_context_menu.ui.h:22 msgid "_Unignore" -msgstr "_בטל התעלם" +msgstr "_בטל התעלמות" #: ../data/gui/contact_context_menu.ui.h:23 msgid "_Ignore" @@ -1392,10 +1392,9 @@ msgid "_Kick" msgstr "ב_עט" -# א_סירה #: ../data/gui/gc_occupants_menu.ui.h:10 msgid "_Ban" -msgstr "ח_סום" +msgstr "א_סור" #: ../data/gui/gc_occupants_menu.ui.h:12 msgid "_Add to Roster" @@ -3382,7 +3381,7 @@ #: ../src/common/contacts.py:273 ../src/common/helpers.py:67 #: ../src/common/helpers.py:261 ../src/dialogs.py:1105 ../src/dialogs.py:2295 #: ../src/dialogs.py:2324 ../src/dialogs.py:3536 ../src/gui_interface.py:485 -#: ../src/gui_menu_builder.py:267 ../src/gui_menu_builder.py:421 +#: ../src/gui_menu_builder.py:267 ../src/gui_menu_builder.py:422 #: ../src/roster_window.py:771 ../src/roster_window.py:1733 #: ../src/roster_window.py:1735 ../src/roster_window.py:2083 #: ../src/roster_window.py:3625 ../src/roster_window.py:3652 @@ -3433,7 +3432,7 @@ msgstr "%(nickname)s מתוך שיחת קבוצה %(room_name)s" #. No key assigned nor a key is used by remote contact -#: ../src/chat_control.py:2266 ../src/dialogs.py:5175 +#: ../src/chat_control.py:2266 ../src/dialogs.py:5177 msgid "No OpenPGP key assigned" msgstr "לא הוקצה מפתח OpenPGP" @@ -3604,14 +3603,14 @@ # Would it be proper to translate to _Download? #: ../src/chat_control.py:3361 msgid "_Accept" -msgstr "_קבלה" +msgstr "_קבל" #: ../src/chat_control.py:3382 ../src/filetransfers_window.py:211 msgid "File transfer completed" msgstr "העברת קובץ הושלמה" # הזמנת שיחת קבוצה -#: ../src/chat_control.py:3418 ../src/dialogs.py:2912 +#: ../src/chat_control.py:3418 ../src/dialogs.py:2912 ../src/dialogs.py:4598 #: ../src/gui_interface.py:646 ../src/notify.py:278 msgid "Groupchat Invitation" msgstr "הזמנה אל שיחת קבוצה" @@ -4039,7 +4038,7 @@ #: ../src/common/config.py:79 msgid "Show only online and free for chat contacts in roster." -msgstr "הצגה של אנשי קשר מקוונים ופנויים לשיחה בלבד ברשימה." +msgstr "הצגה בלעדית של אנשי קשר מקוונים וחופשיים לשיחה ברשימה." #: ../src/common/config.py:82 msgid "Time in minutes, after which your status changes to away." @@ -4083,7 +4082,7 @@ #: ../src/common/config.py:90 msgid "Allow to hide the roster window even if the tray icon is not shown." -msgstr "אפשר הסתרת הרשימה אפילו אם צלמית המגש איננה מוצגת." +msgstr "אפשר הסתרת הרשימה אפילו כאשר צלמית המגש איננה מוצגת." #: ../src/common/config.py:95 msgid "Incoming nickname color." @@ -4729,24 +4728,24 @@ "Should we show the confirm metacontacts creation dialog or not? Empty string " "means we never show the dialog." msgstr "" -"האם קיים הצורך שאנחנו נציג את דו שיח וידוא יצירת אנשי־קשר-מוצמדים או שלא? " -"המשמעות של מחרוזת ריקה תהיה שאנחנו לא נציג את הדו שיח בכלל." +"האם עלינו להציג דו שיח וידוא יצירת אנשי־קשר-מוצמדים או שלא? המשמעות של " +"מחרוזת ריקה תהיה שאנחנו לא נציג את הדו שיח בכלל." #: ../src/common/config.py:287 msgid "" "Should we show the confirm block contact dialog or not? Empty string means " "we never show the dialog." msgstr "" -"האם קיים הצורך שאנחנו נציג את דו שיח וידוא חסימת איש קשר או שלא? המשמעות של " -"מחרוזת ריקה תהיה שאנחנו לא נציג את הדו שיח בכלל." +"האם עלינו להציג דו שיח וידוא חסימת איש קשר או שלא? המשמעות של מחרוזת ריקה " +"תהיה שאנחנו לא נציג את הדו שיח בכלל." #: ../src/common/config.py:288 msgid "" "Should we show the confirm custom status dialog or not? Empty string means " "we never show the dialog." msgstr "" -"האם קיים הצורך שאנחנו נציג את דו שיח וידוא מצב חיבור מותאם או שלא? המשמעות " -"של מחרוזת ריקה תהיה שאנחנו לא נציג את הדו שיח בכלל." +"האם עלינו להציג דו שיח וידוא מצב חיבור מותאם או שלא? המשמעות של מחרוזת ריקה " +"תהיה שאנחנו לא נציג את הדו שיח בכלל." #: ../src/common/config.py:289 msgid "" @@ -4771,7 +4770,7 @@ "If True, Gajim will use KDE Wallet (if kwalletcli is available) to store " "account passwords." msgstr "" -"במידה והעדפה זו מופעלת, Gajim יעשה שימוש ביישום KDE Wallet (אם kwalletcli " +"במידה והעדפה זו מופעלת, Gajim יעשה שימוש ביישום KDE Wallet (כאשר kwalletcli " "הינו זמין) כדי לאחסן סיסמאות חשבון." #: ../src/common/config.py:292 @@ -4832,8 +4831,8 @@ "Valid uri schemes. Only schemes in this list will be accepted as \"real\" " "uri. (mailto and xmpp are handled separately)" msgstr "" -"תרשים uri תקף. תרשימים המצויים ברשימה בלבד יתקבלו בתור תרשים uri \"אמיתי\". " -"(mailto וגם xmpp מטופלים בנפרד)" +"תרשים uri תקף. תרשימים המצויים בתוך הרשימה בלבד יתקבלו בתור תרשים uri \"אמיתי" +"\". (mailto וגם xmpp מטופלים בנפרד)" # שידור בקשות #: ../src/common/config.py:300 @@ -5718,8 +5717,8 @@ "JID %s is not RFC compliant. It will not be added to your roster. Use roster " "management tools such as http://jru.jabberstudio.org/ to remove it" msgstr "" -"‏JID ‏%s אינה תואמת RFC. זו לא תוסף אל רשימתך. ניתן להשתמש בכלי רשימה (roster) " -"כגון http://jru.jabberstudio.org כדי להסירה" +"‏JID ‏%s אינה תואמת RFC. זו לא תוסף אל רשימתך. ניתן להשתמש בכלי ניהול רשימה " +"(roster management tools) כגון http://jru.jabberstudio.org כדי להסירה" #: ../src/common/connection_handlers_events.py:825 #, python-format @@ -7274,9 +7273,9 @@ msgid "timestamp" msgstr "חותמת זמן" -#: ../src/common/pep.py:216 ../src/gajim-remote.py:280 +#: ../src/common/pep.py:216 msgid "uri" -msgstr "‏uri" +msgstr "‏uri‏" #: ../src/common/pep.py:349 msgid "Unknown Artist" @@ -7573,7 +7572,7 @@ #. list at the beginning #: ../src/config.py:2770 msgid "Ban List" -msgstr "רשימת חסימה" +msgstr "רשימת אסירה" #: ../src/config.py:2771 msgid "Member List" @@ -7607,7 +7606,7 @@ #: ../src/config.py:2886 msgid "Banning..." -msgstr "חוסם כעת..." +msgstr "אוסר כעת..." #. You can move '\n' before user@domain if that line is TOO BIG #: ../src/config.py:2888 @@ -7615,7 +7614,7 @@ "Whom do you want to ban?\n" "\n" msgstr "" -"את מי ברצונך לחסום?\n" +"את מי ברצונך לאסור?\n" "\n" # מוסיף כעת חבר... @@ -7948,7 +7947,7 @@ #: ../src/conversation_textview.py:801 msgid "_Quote" -msgstr "_ציטוט" +msgstr "_צטט" #: ../src/conversation_textview.py:808 #, python-format @@ -7961,7 +7960,7 @@ #: ../src/conversation_textview.py:826 msgid "Look it up in _Dictionary" -msgstr "חפש ב_מילון" +msgstr "חפש בתוך _מילון" #: ../src/conversation_textview.py:843 #, python-format @@ -8007,15 +8006,15 @@ #: ../src/dataforms_widget.py:592 msgid "This field is required" -msgstr "שדה זה נדרש" +msgstr "שדה זה הינו נדרש" #: ../src/dataforms_widget.py:637 msgid "Jabber ID already in list" -msgstr "מזהה Jabber כבר מצוי ברשימה" +msgstr "מזהה Jabber כבר מצוי בתוך הרשימה" #: ../src/dataforms_widget.py:638 msgid "The Jabber ID you entered is already in the list. Choose another one." -msgstr "מזהה Jabber אשר הזנת כבר מצוי ברשימה. בחר מזהה אחר." +msgstr "מזהה Jabber אשר הזנת כבר מצוי בתוך הרשימה. בחר מזהה אחר." #. Default jid #: ../src/dataforms_widget.py:649 @@ -8127,7 +8126,7 @@ #: ../src/dialogs.py:1092 msgid "You cannot add yourself to your roster." -msgstr "אין באפשרותך להוסיף את עצמך אל רשימתך." +msgstr "אין באפשרותך להוסיף את עצמך אל הרשימה שלך." #: ../src/dialogs.py:1106 msgid "Contact already in roster" @@ -8135,7 +8134,7 @@ #: ../src/dialogs.py:1107 msgid "This contact is already listed in your roster." -msgstr "איש קשר זה כבר מצוי ברשימתך." +msgstr "איש קשר זה כבר מצוי ברשימה שלך." #: ../src/dialogs.py:1160 ../src/dialogs.py:1194 msgid "User ID:" @@ -8641,59 +8640,59 @@ msgid "Do you want to accept the invitation?" msgstr "האם ברצונך לקבל את ההזמנה?" -#: ../src/dialogs.py:4595 +#: ../src/dialogs.py:4596 msgid "Reason (if you decline):" -msgstr "סיבה (במידה ותסרב):" - -#: ../src/dialogs.py:4646 +msgstr "סיבה (באם רצונך בדחיית ההזמנה):" + +#: ../src/dialogs.py:4648 msgid "Choose Client Cert #PCKS12" msgstr "בחירת תעודת לקוח #PCKS12" -#: ../src/dialogs.py:4656 ../src/dialogs.py:4698 ../src/dialogs.py:4754 -#: ../src/dialogs.py:4842 +#: ../src/dialogs.py:4658 ../src/dialogs.py:4700 ../src/dialogs.py:4756 +#: ../src/dialogs.py:4844 msgid "All files" msgstr "כל הקבצים" -#: ../src/dialogs.py:4661 +#: ../src/dialogs.py:4663 msgid "PKCS12 Files"

1 0

gajim: remove our own list of available spelling language. gtksp...
by Yann Leboulanger 13 Aug '13

13 Aug '13

changeset 2f8dcd2de56f in /home/hg/repos/gajim branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=2f8dcd2de56f description: remove our own list of available spelling language. gtkspell already adds one. Fixes #7408 diffstat: src/chat_control.py | 43 ------------------------------------------- 1 files changed, 0 insertions(+), 43 deletions(-) diffs (60 lines): diff -r 7aa89a08ed02 -r 2f8dcd2de56f src/chat_control.py --- a/src/chat_control.py Tue Aug 13 14:37:56 2013 +0200 +++ b/src/chat_control.py Tue Aug 13 18:27:17 2013 +0200 @@ -80,36 +80,6 @@ import dbus import remote_control -# the next script, executed in the "po" directory, -# generates the following list. -##!/bin/sh -#LANG=$(for i in *.po; do j=${i/.po/}; echo -n "_('"$j"')":" '"$j"', " ; done) -#echo "{_('en'):'en'",$LANG"}" -langs = {_('English'): 'en', _('Belarusian'): 'be', _('Bulgarian'): 'bg', - _('Breton'): 'br', _('Czech'): 'cs', _('German'): 'de', - _('Greek'): 'el', _('British'): 'en_GB', _('Esperanto'): 'eo', - _('Spanish'): 'es', _('Basque'): 'eu', _('French'): 'fr', - _('Croatian'): 'hr', _('Italian'): 'it', _('Norwegian (b)'): 'nb', - _('Dutch'): 'nl', _('Norwegian'): 'no', _('Polish'): 'pl', - _('Portuguese'): 'pt', _('Brazilian Portuguese'): 'pt_BR', - _('Russian'): 'ru', _('Serbian'): 'sr', _('Slovak'): 'sk', - _('Swedish'): 'sv', _('Chinese (Ch)'): 'zh_CN', _('Hebrew'): 'he'} - -if gajim.config.get('use_speller') and HAS_GTK_SPELL: - # loop removing non-existent dictionaries - # iterating on a copy - tv = gtk.TextView() - spell = gtkspell.Spell(tv) - for lang in dict(langs): - try: - spell.set_language(langs[lang]) - except OSError: - del langs[lang] - if spell: - spell.detach() - del tv - - ################################################################################ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools): """ @@ -595,19 +565,6 @@ id_ = item.connect('activate', self.msg_textview.clear) self.handlers[id_] = item - if gajim.config.get('use_speller') and HAS_GTK_SPELL: - item = gtk.MenuItem(_('Spelling language')) - menu.prepend(item) - submenu = gtk.Menu() - item.set_submenu(submenu) - for lang in sorted(langs): - item = gtk.CheckMenuItem(lang) - if langs[lang] == self.msg_textview.lang: - item.set_active(True) - submenu.append(item) - id_ = item.connect('activate', _on_select_dictionary, langs[lang]) - self.handlers[id_] = item - menu.show_all() def on_quote(self, widget, text):

1 0

gajim: ignore wrong incoming stanza. Fixes #7416
by Yann Leboulanger 13 Aug '13

13 Aug '13

changeset 7aa89a08ed02 in /home/hg/repos/gajim branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=7aa89a08ed02 description: ignore wrong incoming stanza. Fixes #7416 diffstat: src/common/jingle.py | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diffs (16 lines): diff -r e6e05d3bec6a -r 7aa89a08ed02 src/common/jingle.py --- a/src/common/jingle.py Tue Aug 13 13:54:16 2013 +0200 +++ b/src/common/jingle.py Tue Aug 13 14:37:56 2013 +0200 @@ -75,7 +75,11 @@ adequatelly. """ # get data - jid = helpers.get_full_jid_from_iq(stanza) + try: + jid = helpers.get_full_jid_from_iq(stanza) + except helpers.InvalidFormat: + log.warn('Invalid JID: %s, ignoring it' % stanza.getFrom()) + return id_ = stanza.getID() if (jid, id_) in self.__iq_responses.keys(): self.__iq_responses[(jid, id_)].on_stanza(stanza)

1 0

gajim: correctly detect that farstream is not available. Fixes #...
by Yann Leboulanger 13 Aug '13

13 Aug '13

changeset e6e05d3bec6a in /home/hg/repos/gajim branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=e6e05d3bec6a description: correctly detect that farstream is not available. Fixes #7420 diffstat: src/common/gajim.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 9bd551753900 -r e6e05d3bec6a src/common/gajim.py --- a/src/common/gajim.py Tue Aug 13 13:42:20 2013 +0200 +++ b/src/common/gajim.py Tue Aug 13 13:54:16 2013 +0200 @@ -182,7 +182,7 @@ session = conference.new_session(farstream.MEDIA_TYPE_AUDIO) del session del conference - except glib.GError: + except: HAVE_FARSTREAM = False except ImportError:

1 0

gajim: fix invite contact list. Fixes #7422
by Yann Leboulanger 13 Aug '13

13 Aug '13

changeset 9bd551753900 in /home/hg/repos/gajim branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=9bd551753900 description: fix invite contact list. Fixes #7422 diffstat: src/dialogs.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diffs (21 lines): diff -r 822393ed055b -r 9bd551753900 src/dialogs.py --- a/src/dialogs.py Tue Aug 13 13:02:31 2013 +0200 +++ b/src/dialogs.py Tue Aug 13 13:42:20 2013 +0200 @@ -4973,7 +4973,7 @@ contact.jid != gajim.get_jid_from_account(self.account) and contact.jid not in gajim.interface.minimized_controls[account] and not contact.is_transport() and - not contact_transport) + contact_transport in ('jabber', None)) # set jabber id and pseudos for account in gajim.contacts.get_accounts(): @@ -4985,7 +4985,7 @@ contact_transport = gajim.get_transport_name_from_jid(jid) # Add contact if it can be invited if invitable(contact, contact_transport) and \ - contact.show not in ('offline', 'error'): + contact.show not in ('offline', 'error'): img = gajim.interface.jabber_state_images['16'][contact.show] name = contact.name if name == '':

1 0

gajim: don't try to configure a room for which we are not admin....
by Yann Leboulanger 13 Aug '13

13 Aug '13

changeset 822393ed055b in /home/hg/repos/gajim branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=822393ed055b description: don't try to configure a room for which we are not admin. See #7422 diffstat: src/groupchat_control.py | 17 +++++++++++++++-- 1 files changed, 15 insertions(+), 2 deletions(-) diffs (27 lines): diff -r 6bee0dc9cc78 -r 822393ed055b src/groupchat_control.py --- a/src/groupchat_control.py Tue Aug 13 01:10:59 2013 +0400 +++ b/src/groupchat_control.py Tue Aug 13 13:02:31 2013 +0200 @@ -1567,8 +1567,21 @@ gajim.automatic_rooms[self.account][self.room_jid]['invities']: if self.room_jid not in gajim.interface.instances[ self.account]['gc_config']: - gajim.connections[self.account].request_gc_config( - self.room_jid) + if obj.role == 'owner': + # We need to configure the room if it's a new one. + # We cannot know it's a new one. Status 201 is not + # sent by all servers. + gajim.connections[self.account].request_gc_config( + self.room_jid) + elif 'continue_tag' not in gajim.automatic_rooms[ + self.account][self.room_jid]: + # We just need to invite contacts + for jid in gajim.automatic_rooms[self.account][ + self.room_jid]['invities']: + obj.conn.send_invite(self.room_jid, jid) + self.print_conversation(_('%(jid)s has been ' + 'invited in this room') % {'jid': jid}, + graphics=False) if '100' in obj.status_code: # Can be a message (see handle_event_gc_config_change in # gajim.py)

1 0

gajim: Fix invite menu. Fixes #7422
by Denis Fomin 12 Aug '13

12 Aug '13

changeset 6bee0dc9cc78 in /home/hg/repos/gajim branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=6bee0dc9cc78 description: Fix invite menu. Fixes #7422 diffstat: src/gui_menu_builder.py | 7 +++---- 1 файлов изменено, 3 вставок(+), 4 удалений(-) различия (31 строк): diff -r 780f5fbe62e0 -r 6bee0dc9cc78 src/gui_menu_builder.py --- a/src/gui_menu_builder.py Tue Aug 13 01:07:47 2013 +0400 +++ b/src/gui_menu_builder.py Tue Aug 13 01:10:59 2013 +0400 @@ -118,7 +118,6 @@ invite_to_new_room_menuitem.set_sensitive(False) rooms = [] # a list of (room_jid, account) tuple invite_to_submenu.append(invite_to_new_room_menuitem) - rooms = [] # a list of (room_jid, account) tuple minimized_controls = [] for account in connected_accounts: minimized_controls += \ @@ -133,7 +132,7 @@ continue if room_jid in gajim.gc_connected[acct] and \ gajim.gc_connected[acct][room_jid] and \ - contacts_transport == gajim.get_transport_name_from_jid(room_jid): + contacts_transport in ['jabber', None]: rooms.append((room_jid, acct)) if len(rooms): item = gtk.SeparatorMenuItem() # separator @@ -142,8 +141,8 @@ menuitem = gtk.MenuItem(room_jid.split('@')[0]) if len(contact_list) > 1: # several resources menuitem.set_submenu(build_resources_submenu( - contact_list, account, roster.on_invite_to_room, room_jid, - account)) + contact_list, account, roster.on_invite_to_room, room_jid, + account)) else: # use resource if it's self contact if contact.jid == gajim.get_jid_from_account(account):

1 0

gajim: Fix Subscription menu
by Denis Fomin 12 Aug '13

12 Aug '13

changeset 780f5fbe62e0 in /home/hg/repos/gajim branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=780f5fbe62e0 description: Fix Subscription menu diffstat: src/gui_menu_builder.py | 5 +++-- 1 файлов изменено, 3 вставок(+), 2 удалений(-) различия (15 строк): diff -r 8d1f23151d3c -r 780f5fbe62e0 src/gui_menu_builder.py --- a/src/gui_menu_builder.py Mon Aug 12 21:44:56 2013 +0400 +++ b/src/gui_menu_builder.py Tue Aug 13 01:07:47 2013 +0400 @@ -436,8 +436,9 @@ ask_auth_menuitem.connect('activate', roster.req_sub, jid, _('I would like to add you to my roster'), account, contact.groups, contact.name) - if contact.sub in ('to', 'none') or gajim.get_transport_name_from_jid( - jid, use_config_setting=False): + transport = gajim.get_transport_name_from_jid(jid, + use_config_setting=False) + if contact.sub in ('to', 'none') or transport not in ['jabber', None]: revoke_auth_menuitem.set_sensitive(False) else: revoke_auth_menuitem.connect('activate', roster.revoke_auth, jid,

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits