Commits

commits@gajim.org

17632 discussions

gajim: don't show Clear in received single message. Fixes #7244
by Yann Leboulanger 06 Oct '12

06 Oct '12

changeset 12008ffd5492 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=12008ffd5492 description: don't show Clear in received single message. Fixes #7244 diffstat: src/dialogs.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 05861886349b -r 12008ffd5492 src/dialogs.py --- a/src/dialogs.py Thu Oct 04 22:25:07 2012 +0400 +++ b/src/dialogs.py Sat Oct 06 19:06:56 2012 +0200 @@ -2925,7 +2925,7 @@ self.conversation_scrolledwindow = self.xml.get_object( 'conversation_scrolledwindow') self.conversation_textview = conversation_textview.ConversationTextview( - account) + account, used_in_history_window=True) self.conversation_textview.tv.show() self.conversation_tv_buffer = self.conversation_textview.tv.get_buffer() self.xml.get_object('conversation_scrolledwindow').add(

1 0

gajim: [Darlan].Update Hebrew translation.
by Fomin Denis 04 Oct '12

04 Oct '12

changeset 05861886349b in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=05861886349b description: [Darlan].Update Hebrew translation. diffstat: po/he.po | 1521 +++++++++++++++++++++++++++++++------------------------------ 1 files changed, 780 insertions(+), 741 deletions(-) diffs (truncated from 4040 to 300 lines): diff -r eede7f0239f8 -r 05861886349b po/he.po --- a/po/he.po Thu Oct 04 17:52:28 2012 +0200 +++ b/po/he.po Thu Oct 04 22:25:07 2012 +0400 @@ -7,8 +7,8 @@ msgstr "" "Project-Id-Version: gajim 0.15\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-08-17 22:54+0400\n" -"PO-Revision-Date: 2012-09-17 15:20+0200\n" +"POT-Creation-Date: 2012-10-04 21:59+0400\n" +"PO-Revision-Date: 2012-10-04 20:28+0200\n" "Last-Translator: Isratine Citizen <genghiskhan(a)gmx.ca>\n" "Language-Team: Rahut\n" "Language: he\n" @@ -90,7 +90,7 @@ #: ../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 @@ -163,7 +163,7 @@ #: ../data/gui/account_creation_wizard_window.ui.h:20 #: ../data/gui/roster_window.ui.h:8 msgid "_Advanced" -msgstr "מת_קדם" +msgstr "_מתקדם" # הוספת אישור זה לרשימת האישורים המהימנים.\n # טביעת אצבע (מסוג) SHA1 של האישור:\n @@ -175,14 +175,13 @@ "הוספת תעודה זו אל רשימת התעודות המהימנות.\n" "טביעת אצבע SHA1 של התעודה:\n" -# מתחבר כעת #: ../data/gui/account_creation_wizard_window.ui.h:24 msgid "" "Connecting to server\n" "\n" "Please wait..." msgstr "" -"מתחבר אל השרת\n" +"מתחבר כעת אל שרת\n" "\n" "נא להמתין..." @@ -212,15 +211,15 @@ #: ../src/config.py:2320 #: ../src/config.py:2399 #: ../src/config.py:2412 -#: ../src/config.py:3697 -#: ../src/config.py:3772 +#: ../src/config.py:3698 +#: ../src/config.py:3773 #: ../src/dialogs.py:312 #: ../src/dialogs.py:314 #: ../src/dialogs.py:520 #: ../src/dialogs.py:533 -#: ../src/roster_window.py:3207 -#: ../src/roster_window.py:3213 -#: ../src/roster_window.py:3218 +#: ../src/roster_window.py:3214 +#: ../src/roster_window.py:3220 +#: ../src/roster_window.py:3225 msgid "None" msgstr "ללא" @@ -230,21 +229,21 @@ #. Change label for accept_button to action name instead of 'OK'. #: ../data/gui/accounts_window.ui.h:3 -#: ../src/dialogs.py:3390 -#: ../src/dialogs.py:3436 +#: ../src/dialogs.py:3425 +#: ../src/dialogs.py:3471 msgid "Add" msgstr "הוספה" #. Change label for accept_button to action name instead of 'OK'. #: ../data/gui/accounts_window.ui.h:4 -#: ../src/dialogs.py:3394 -#: ../src/dialogs.py:3491 +#: ../src/dialogs.py:3429 +#: ../src/dialogs.py:3526 msgid "Delete" msgstr "מחיקה" #. Rename #: ../data/gui/accounts_window.ui.h:5 -#: ../src/roster_window.py:5789 +#: ../src/roster_window.py:5827 msgid "Re_name" msgstr "_שינוי שם" @@ -401,9 +400,9 @@ #: ../src/common/contacts.py:135 #: ../src/dialogs.py:112 #: ../src/dialogs.py:124 -#: ../src/roster_window.py:3149 -#: ../src/roster_window.py:4246 -#: ../src/roster_window.py:5839 +#: ../src/roster_window.py:3156 +#: ../src/roster_window.py:4284 +#: ../src/roster_window.py:5877 msgid "General" msgstr "כללית" @@ -747,32 +746,30 @@ msgid "Yes" msgstr "כן" +# מועדפת #: ../data/gui/archiving_preferences_window.ui.h:3 -#, fuzzy msgid "Prefer" -msgstr "העדפות" - +msgstr "העדף" + +# Concession/Waive = ויתור #: ../data/gui/archiving_preferences_window.ui.h:4 msgid "Concede" -msgstr "" - +msgstr "וותר" + +# אסירה #: ../data/gui/archiving_preferences_window.ui.h:5 -#, fuzzy msgid "Forbid" -msgstr "אסירה" +msgstr "אסור" #: ../data/gui/archiving_preferences_window.ui.h:6 -#, fuzzy msgid "Method Manual" msgstr "שיטה ידנית" #: ../data/gui/archiving_preferences_window.ui.h:7 -#, fuzzy msgid "Method Local" msgstr "שיטה מקומית" #: ../data/gui/archiving_preferences_window.ui.h:8 -#, fuzzy msgid "Method Auto" msgstr "שיטה אוטומטית" @@ -802,6 +799,10 @@ msgid "Last modified:" msgstr "שונתה לאחרונה:" +#: ../data/gui/atom_entry_window.ui.h:6 +msgid "Next entry" +msgstr "רשומה באה" + #: ../data/gui/blocked_contacts_window.ui.h:1 msgid "Blocked Contacts" msgstr "אנשי־קשר חסומים" @@ -809,9 +810,9 @@ #: ../data/gui/blocked_contacts_window.ui.h:2 #: ../data/gui/contact_context_menu.ui.h:20 #: ../data/gui/gc_occupants_menu.ui.h:14 -#: ../src/roster_window.py:5808 -#: ../src/roster_window.py:5935 -#: ../src/roster_window.py:6068 +#: ../src/roster_window.py:5846 +#: ../src/roster_window.py:5973 +#: ../src/roster_window.py:6106 msgid "_Unblock" msgstr "_ביטול חסימה" @@ -958,7 +959,7 @@ #: ../data/gui/chat_control.ui.h:12 #: ../data/gui/groupchat_control.ui.h:9 #: ../data/gui/xml_console_window.ui.h:15 -#: ../src/filetransfers_window.py:304 +#: ../src/filetransfers_window.py:322 msgid "_Send" msgstr "_שליחה" @@ -1016,7 +1017,7 @@ "You are going to begin a Multi-User Chat.\n" "Select the contacts you want to invite" msgstr "" -"בחרת להתחיל שיחה מרובות משתתפים.\n" +"בחרת להתחיל שיחה מרובת משתתפים.\n" "נא לבחור את אנשי־הקשר אותם ברצונך להזמין" # שרת MUC @@ -1050,8 +1051,8 @@ #. Invite to Groupchat #: ../data/gui/contact_context_menu.ui.h:4 #: ../data/gui/gc_occupants_menu.ui.h:11 -#: ../src/roster_window.py:5744 -#: ../src/roster_window.py:5903 +#: ../src/roster_window.py:5782 +#: ../src/roster_window.py:5941 msgid "In_vite to" msgstr "ה_זמנה אל" @@ -1072,8 +1073,8 @@ msgstr "הפעלת הצפנת E2E" #: ../data/gui/contact_context_menu.ui.h:8 -#: ../src/roster_window.py:5754 -#: ../src/roster_window.py:5992 +#: ../src/roster_window.py:5792 +#: ../src/roster_window.py:6030 msgid "Send Cus_tom Status" msgstr "שליחת מצב־חיבור מו_תאם" @@ -1127,9 +1128,9 @@ #: ../data/gui/contact_context_menu.ui.h:21 #: ../data/gui/gc_occupants_menu.ui.h:13 -#: ../src/roster_window.py:5816 -#: ../src/roster_window.py:5941 -#: ../src/roster_window.py:6071 +#: ../src/roster_window.py:5854 +#: ../src/roster_window.py:5979 +#: ../src/roster_window.py:6109 msgid "_Block" msgstr "_חסימה" @@ -1149,7 +1150,7 @@ #: ../data/gui/gc_control_popup_menu.ui.h:9 #: ../data/gui/gc_occupants_menu.ui.h:15 #: ../data/gui/roster_window.ui.h:19 -#: ../src/roster_window.py:6142 +#: ../src/roster_window.py:6180 msgid "_History" msgstr "_היסטוריה" @@ -1247,12 +1248,13 @@ msgstr "הסתרת החלון" #: ../data/gui/filetransfers.ui.h:16 +#: ../src/filetransfers_window.py:905 msgid "_Continue" msgstr "ה_משך" #: ../data/gui/filetransfers.ui.h:17 -#: ../src/chat_control.py:3258 -#: ../src/filetransfers_window.py:214 +#: ../src/chat_control.py:3256 +#: ../src/filetransfers_window.py:213 msgid "_Open Containing Folder" msgstr "_פתיחת תיקיה מכילה" @@ -1524,7 +1526,7 @@ #: ../data/gui/item_archiving_preferences_window.ui.h:1 #, fuzzy msgid "expire" -msgstr "פג" +msgstr "פגה" #: ../data/gui/item_archiving_preferences_window.ui.h:2 #, fuzzy @@ -1532,25 +1534,28 @@ msgstr "שמירה" #: ../data/gui/item_archiving_preferences_window.ui.h:3 +#, fuzzy msgid "otr" msgstr "otr" # gajim-remote #: ../data/gui/item_archiving_preferences_window.ui.h:4 #: ../src/gajim-remote.py:229 +#, fuzzy msgid "jid" -msgstr "" +msgstr "jid" #: ../data/gui/item_archiving_preferences_window.ui.h:5 +#, fuzzy msgid "body" -msgstr "" +msgstr "גוף" #: ../data/gui/item_archiving_preferences_window.ui.h:6 +#, fuzzy msgid "false" -msgstr "" +msgstr "false" # gajim-remote -# הודעה #: ../data/gui/item_archiving_preferences_window.ui.h:7 #: ../src/gajim-remote.py:110 #: ../src/gajim-remote.py:133 @@ -1558,45 +1563,52 @@ #: ../src/gajim-remote.py:158 #: ../src/gajim-remote.py:169 #: ../src/gajim-remote.py:282 +#, fuzzy msgid "message"

1 0

gajim: gajim-remote handles ?message in URIs. Fixes #6804, see #...
by Yann Leboulanger 04 Oct '12

04 Oct '12

changeset eede7f0239f8 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=eede7f0239f8 description: gajim-remote handles ?message in URIs. Fixes #6804, see #2133 Patch based on joeka's one in #6804 diffstat: src/gajim-remote.py | 54 ++++++++++++++++++++++++++++++++-------------------- 1 files changed, 33 insertions(+), 21 deletions(-) diffs (75 lines): diff -r f37abcc64bfb -r eede7f0239f8 src/gajim-remote.py --- a/src/gajim-remote.py Sun Sep 30 21:54:08 2012 +0200 +++ b/src/gajim-remote.py Thu Oct 04 17:52:28 2012 +0200 @@ -544,30 +544,42 @@ if not '?' in uri: self.command = sys.argv[1] = 'open_chat' return - if 'body=' in uri: - # Open chat window and paste the text in the input message dialog - self.command = sys.argv[1] = 'open_chat' - message = uri.split('body=') - message = message[1].split(';')[0] - try: - message = urllib.unquote(message) - except UnicodeDecodeError: - pass - sys.argv[2] = uri.split('?')[0] - if len(sys.argv) == 4: - # jid in the sys.argv - sys.argv.append(message) - else: - sys.argv.append('') - sys.argv.append(message) - sys.argv[3] = '' - sys.argv[4] = message - return - (jid, action) = uri.split('?', 1) + jid, args = uri.split('?', 1) try: jid = urllib.unquote(jid) except UnicodeDecodeError: pass + args = args.split(';') + action = None + options = {} + if args: + action = args[0] + for arg in args[1:]: + opt = arg.split('=', 1) + if len(opt) != 2: + continue + options[opt[0]] = opt[1] + + if action == 'message': + self.command = sys.argv[1] = 'open_chat' + sys.argv[2] = jid + if 'body' in options: + # Open chat window and paste the text in the input message + # dialog + message = options['body'] + try: + message = urllib.unquote(message) + except UnicodeDecodeError: + pass + if len(sys.argv) == 4: + # jid in the sys.argv + sys.argv.append(message) + else: + sys.argv.append('') + sys.argv.append(message) + sys.argv[3] = '' + sys.argv[4] = message + return sys.argv[2] = jid if action == 'join': self.command = sys.argv[1] = 'join_room' @@ -576,7 +588,7 @@ sys.argv.append(sys.argv[3]) sys.argv[3] = '' return - if action.startswith('roster'): + if action == 'roster': # Add contact to roster self.command = sys.argv[1] = 'add_contact' return

1 0

gajim: roster accel group func returns true
by Yann Leboulanger 30 Sep '12

30 Sep '12

changeset f37abcc64bfb in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=f37abcc64bfb description: roster accel group func returns true diffstat: src/roster_window.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r fdd7c9b81c1b -r f37abcc64bfb src/roster_window.py --- a/src/roster_window.py Sun Sep 30 21:31:45 2012 +0200 +++ b/src/roster_window.py Sun Sep 30 21:54:08 2012 +0200 @@ -3566,7 +3566,7 @@ self.send_status(account, current_show, message) self.send_pep(account, pep_dict) dialogs.ChangeStatusMessageDialog(on_response, status) - return + return True def on_roster_treeview_button_press_event(self, widget, event): # hide tooltip, no matter the button is pressed

1 0

gajim: return True in accel_group callback. Fixes #5371, #6903
by Yann Leboulanger 30 Sep '12

30 Sep '12

changeset fdd7c9b81c1b in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=fdd7c9b81c1b description: return True in accel_group callback. Fixes #5371, #6903 diffstat: src/message_window.py | 27 +++++++++++++++++++++++---- 1 files changed, 23 insertions(+), 4 deletions(-) diffs (121 lines): diff -r 93cdb995e13c -r fdd7c9b81c1b src/message_window.py --- a/src/message_window.py Wed Sep 26 20:46:09 2012 -0400 +++ b/src/message_window.py Sun Sep 30 21:31:45 2012 +0200 @@ -110,7 +110,7 @@ for key in keys: keyval, mod = gtk.accelerator_parse(key) accel_group.connect_group(keyval, mod, gtk.ACCEL_VISIBLE, - self.accel_group_func) + self.accel_group_func) self.window.add_accel_group(accel_group) # gtk+ doesn't make use of the motion notify on gtkwindow by default @@ -118,10 +118,10 @@ self.window.add_events(gtk.gdk.POINTER_MOTION_MASK) id_ = self.notebook.connect('switch-page', - self._on_notebook_switch_page) + self._on_notebook_switch_page) self.handlers[id_] = self.notebook id_ = self.notebook.connect('key-press-event', - self._on_notebook_key_press) + self._on_notebook_key_press) self.handlers[id_] = self.notebook # Tab customizations @@ -351,6 +351,7 @@ if modifier & gtk.gdk.CONTROL_MASK: if keyval == gtk.keysyms.h: # CTRL + h control._on_history_menuitem_activate() + return True elif control.type_id == message_control.TYPE_CHAT and \ keyval == gtk.keysyms.f: # CTRL + f # CTRL + f moves cursor one char forward when user uses Emacs @@ -358,28 +359,36 @@ if not gtk.settings_get_default().get_property( 'gtk-key-theme-name') == 'Emacs': control._on_send_file_menuitem_activate(None) + return True elif control.type_id == message_control.TYPE_CHAT and \ keyval == gtk.keysyms.g: # CTRL + g control._on_convert_to_gc_menuitem_activate(None) + return True elif control.type_id in (message_control.TYPE_CHAT, message_control.TYPE_PM) and keyval == gtk.keysyms.i: # CTRL + i control._on_contact_information_menuitem_activate(None) + return True elif keyval == gtk.keysyms.l or keyval == gtk.keysyms.L: # CTRL + l|L control.conv_textview.clear() + return True elif keyval == gtk.keysyms.u: # CTRL + u: emacs style clear line control.clear(control.msg_textview) + return True elif control.type_id == message_control.TYPE_GC and \ keyval == gtk.keysyms.b: # CTRL + b control._on_bookmark_room_menuitem_activate(None) + return True # Tab switch bindings elif keyval == gtk.keysyms.F4: # CTRL + F4 self.remove_tab(control, self.CLOSE_CTRL_KEY) + return True elif keyval == gtk.keysyms.w: # CTRL + w # CTRL + w removes latest word before sursor when User uses emacs # theme if not gtk.settings_get_default().get_property( 'gtk-key-theme-name') == 'Emacs': self.remove_tab(control, self.CLOSE_CTRL_KEY) + return True elif keyval in (gtk.keysyms.Page_Up, gtk.keysyms.Page_Down): # CTRL + PageUp | PageDown # Create event and send it to notebook @@ -389,12 +398,14 @@ event.state = gtk.gdk.CONTROL_MASK event.keyval = int(keyval) self.notebook.emit('key_press_event', event) + return True if modifier & gtk.gdk.SHIFT_MASK: # CTRL + SHIFT if control.type_id == message_control.TYPE_GC and \ keyval == gtk.keysyms.n: # CTRL + SHIFT + n control._on_change_nick_menuitem_activate(None) + return True # MOD1 (ALT) mask elif modifier & gtk.gdk.MOD1_MASK: # Tab switch bindings @@ -403,26 +414,34 @@ if new >= self.notebook.get_n_pages(): new = 0 self.notebook.set_current_page(new) + return True elif keyval == gtk.keysyms.Left: # ALT + LEFT new = self.notebook.get_current_page() - 1 if new < 0: new = self.notebook.get_n_pages() - 1 self.notebook.set_current_page(new) + return True elif chr(keyval) in st: # ALT + 1,2,3.. self.notebook.set_current_page(st.index(chr(keyval))) + return True elif keyval == gtk.keysyms.c: # ALT + C toggles chat buttons control.chat_buttons_set_visible(not control.hide_chat_buttons) + return True elif keyval == gtk.keysyms.m: # ALT + M show emoticons menu control.show_emoticons_menu() + return True elif keyval == gtk.keysyms.d: # ALT + D show actions menu control.on_actions_button_clicked(control.actions_button) + return True elif control.type_id == message_control.TYPE_GC and \ keyval == gtk.keysyms.t: # ALT + t control._on_change_subject_menuitem_activate(None) + return True # Close tab bindings elif keyval == gtk.keysyms.Escape and \ - gajim.config.get('escape_key_closes'): # Escape + gajim.config.get('escape_key_closes'): # Escape self.remove_tab(control, self.CLOSE_ESC) + return True def _on_close_button_clicked(self, button, control): """

1 0

gajim: refactoring
by Jefry Lagrange 27 Sep '12

27 Sep '12

changeset 93cdb995e13c in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=93cdb995e13c description: refactoring diffstat: src/common/connection_handlers_events.py | 6 ++---- src/common/jingle.py | 6 +++--- src/common/jingle_session.py | 9 +++------ 3 files changed, 8 insertions(+), 13 deletions(-) diffs (60 lines): diff -r 100fa0b983fc -r 93cdb995e13c src/common/connection_handlers_events.py --- a/src/common/connection_handlers_events.py Wed Sep 26 16:03:18 2012 +0200 +++ b/src/common/connection_handlers_events.py Wed Sep 26 20:46:09 2012 -0400 @@ -2002,10 +2002,8 @@ file_tag = desc.getTag('request').getTag('file') h = file_tag.getTag('hash') n = file_tag.getTag('name') - if h: - file_info = self.conn.get_file_info(hash_=h) - elif n: - file_info = self.conn.get_file_info(name=n) + pjid = gajim.get_jid_without_resource(self.fjid) + file_info = self.conn.get_file_info(pjid, hash_=h, name=n) self.file_props.file_name = file_info['file-name'] self.file_props.sender = self.conn._ft_get_our_jid() self.file_props.receiver = self.fjid diff -r 100fa0b983fc -r 93cdb995e13c src/common/jingle.py --- a/src/common/jingle.py Wed Sep 26 16:03:18 2012 +0200 +++ b/src/common/jingle.py Wed Sep 26 20:46:09 2012 -0400 @@ -194,15 +194,15 @@ # to be requested again. self.files.append(file_) - def get_file_info(self, hash_=None, name=None): + def get_file_info(self, peerjid, hash_=None, name=None): if hash_: for f in self.files: # DEBUG #if f['hash'] == '1294809248109223': - if f['hash'] == hash_: + if f['hash'] == hash_ and f['peerjid'] == peerjid: return f elif name: for f in self.files: - if f['name'] == name: + if f['name'] == name and f['peerjid'] == peerjid: return f def get_jingle_session(self, jid, sid=None, media=None): diff -r 100fa0b983fc -r 93cdb995e13c src/common/jingle_session.py --- a/src/common/jingle_session.py Wed Sep 26 16:03:18 2012 +0200 +++ b/src/common/jingle_session.py Wed Sep 26 20:46:09 2012 -0400 @@ -521,15 +521,12 @@ self.request = True h = request.getTag('file').getTag('hash') n = request.getTag('file').getTag('name') - if h: - file_info = self.connection.get_file_info(hash_=h) - elif n: - file_info = self.connection.get_file_info(name=n) pjid = gajim.get_jid_without_resource(self.peerjid) - if not file_info or file_info['peerjid'] != pjid: + file_info = self.connection.get_file_info(pjid, h, n) + if not file_info: log.warning('The peer ' + pjid + \ ' is requesting a ' + \ - 'file that we dont have or' + \ + 'file that we dont have or ' + \ 'it is not allowed to request') self.decline_session() raise xmpp.NodeProcessed

1 0

gajim: ignore presences when nothing changed (status, status mes...
by Yann Leboulanger 26 Sep '12

26 Sep '12

changeset 100fa0b983fc in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=100fa0b983fc description: ignore presences when nothing changed (status, status message, prio). Fixes #7210 diffstat: src/common/connection_handlers.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 7160cf6d17c8 -r 100fa0b983fc src/common/connection_handlers.py --- a/src/common/connection_handlers.py Mon Sep 24 12:24:10 2012 +0200 +++ b/src/common/connection_handlers.py Wed Sep 26 16:03:18 2012 +0200 @@ -851,7 +851,7 @@ if obj.old_show == obj.new_show and obj.contact.status == \ obj.status and obj.contact.priority == obj.prio: # no change - return + return True else: obj.contact = gajim.contacts.get_first_contact_from_jid(account, jid)

1 0

gajim: decrease call to get_contact(s) function to improve speed...
by Yann Leboulanger 24 Sep '12

24 Sep '12

changeset 7160cf6d17c8 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=7160cf6d17c8 description: decrease call to get_contact(s) function to improve speed. see #7125 diffstat: src/common/contacts.py | 2 +- src/roster_window.py | 29 ++++++++++++++++++----------- 2 files changed, 19 insertions(+), 12 deletions(-) diffs (79 lines): diff -r ec3c3635aecf -r 7160cf6d17c8 src/common/contacts.py --- a/src/common/contacts.py Sun Sep 23 23:59:26 2012 +0400 +++ b/src/common/contacts.py Mon Sep 24 12:24:10 2012 +0200 @@ -365,7 +365,7 @@ self.is_big_brother(account, jid, accounts): # count metacontacts only once continue - contact = self.get_contact_with_highest_priority(account, jid) + contact = self._accounts[account].contacts._contacts[jid][0] if _('Not in roster') in contact.groups: continue in_groups = False diff -r ec3c3635aecf -r 7160cf6d17c8 src/roster_window.py --- a/src/roster_window.py Sun Sep 23 23:59:26 2012 +0400 +++ b/src/roster_window.py Mon Sep 24 12:24:10 2012 +0200 @@ -1136,16 +1136,18 @@ self.draw_contact(parent_jid, parent_account) return False - def draw_contact(self, jid, account, selected=False, focus=False): + def draw_contact(self, jid, account, selected=False, focus=False, contact_instances=None, contact=None): """ Draw the correct state image, name BUT not avatar """ # focus is about if the roster window has toplevel-focus or not # FIXME: We really need a custom cell_renderer - contact_instances = gajim.contacts.get_contacts(account, jid) - contact = gajim.contacts.get_highest_prio_contact_from_contacts( - contact_instances) + if not contact_instances: + contact_instances = gajim.contacts.get_contacts(account, jid) + if not contact: + contact = gajim.contacts.get_highest_prio_contact_from_contacts( + contact_instances) if not contact: return False @@ -1308,11 +1310,11 @@ else: return False - def draw_all_pep_types(self, jid, account): + def draw_all_pep_types(self, jid, account, contact=None): for pep_type in self._pep_type_to_model_column: - self.draw_pep(jid, account, pep_type) - - def draw_pep(self, jid, account, pep_type): + self.draw_pep(jid, account, pep_type, contact=contact) + + def draw_pep(self, jid, account, pep_type, contact=None): if pep_type not in self._pep_type_to_model_column: return if not self._is_pep_shown_in_roster(pep_type): @@ -1322,7 +1324,8 @@ iters = self._get_contact_iter(jid, account, model=self.model) if not iters: return - contact = gajim.contacts.get_contact(account, jid) + if not contact: + contact = gajim.contacts.get_contact(account, jid) if pep_type in contact.pep: pixbuf = contact.pep[pep_type].asPixbufIcon() else: @@ -1345,8 +1348,12 @@ return False def draw_completely(self, jid, account): - self.draw_contact(jid, account) - self.draw_all_pep_types(jid, account) + contact_instances = gajim.contacts.get_contacts(account, jid) + contact = gajim.contacts.get_highest_prio_contact_from_contacts( + contact_instances) + self.draw_contact(jid, account, contact_instances=contact_instances, + contact=contact) + self.draw_all_pep_types(jid, account, contact=contact) self.draw_avatar(jid, account) def adjust_and_draw_contact_context(self, jid, account):

1 0

gajim: output style.
by Fomin Denis 23 Sep '12

23 Sep '12

changeset ec3c3635aecf in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=ec3c3635aecf description: output style. diffstat: src/command_system/implementation/standard.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diffs (14 lines): diff -r 850eb549ea8f -r ec3c3635aecf src/command_system/implementation/standard.py --- a/src/command_system/implementation/standard.py Sun Sep 23 13:34:21 2012 +0200 +++ b/src/command_system/implementation/standard.py Sun Sep 23 23:59:26 2012 +0400 @@ -129,8 +129,8 @@ @doc(_(""" Set the current status - Status can be given as one of the following values: online, away, - chat, xa, dnd. + Status can be given as one of the following values: + online, away, chat, xa, dnd. """)) def status(self, status, message): if status not in ('online', 'away', 'chat', 'xa', 'dnd'):

1 0

gajim: fix var name. Fixes #7229
by Yann Leboulanger 23 Sep '12

23 Sep '12

changeset 850eb549ea8f in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=850eb549ea8f description: fix var name. Fixes #7229 diffstat: src/common/connection_handlers.py | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diffs (16 lines): diff -r 3c26e0149541 -r 850eb549ea8f src/common/connection_handlers.py --- a/src/common/connection_handlers.py Sat Sep 22 22:16:03 2012 -0400 +++ b/src/common/connection_handlers.py Sun Sep 23 13:34:21 2012 +0200 @@ -1002,9 +1002,9 @@ def _on_message_decrypted(self, output, obj): if len(self.gpg_messages_to_decrypt): - encmsg, keyID, obj = self.gpg_messages_to_decrypt[0] - gajim.thread_interface(self.decrypt_thread, [encmsg, keyID, obj], - self._on_message_decrypted, [obj]) + encmsg, keyID, obj2 = self.gpg_messages_to_decrypt[0] + gajim.thread_interface(self.decrypt_thread, [encmsg, keyID, obj2], + self._on_message_decrypted, [obj2]) gajim.nec.push_incoming_event(DecryptedMessageReceivedEvent(None, conn=self, msg_obj=obj))

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