Commits

commits@gajim.org

17632 discussions

gajim: fix threads problem in OpenBSD. Fixes #7154
by Fomin Denis 09 May '12

09 May '12

changeset 1a3dc2a7f03d in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=1a3dc2a7f03d description: fix threads problem in OpenBSD. Fixes #7154 diffstat: src/gajim.py | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diffs (13 lines): diff -r 864301a74d3f -r 1a3dc2a7f03d src/gajim.py --- a/src/gajim.py Tue Apr 24 14:18:54 2012 +0400 +++ b/src/gajim.py Wed May 09 12:16:48 2012 +0400 @@ -454,6 +454,9 @@ # This makes Gajim unusable under windows, and threads are used only # for GPG, so not under windows gtk.gdk.threads_init() + gtk.gdk.threads_enter() gtk.main() + if os.name != 'nt': + gtk.gdk.threads_leave() except KeyboardInterrupt: print >> sys.stderr, 'KeyboardInterrupt'

1 0

gajim: correctly check window list size before removing from it
by Aleksey Rybalkin 06 May '12

06 May '12

changeset 864301a74d3f in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=864301a74d3f description: correctly check window list size before removing from it diffstat: src/dialogs.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 316a272ea2f0 -r 864301a74d3f src/dialogs.py --- a/src/dialogs.py Mon Apr 30 21:04:37 2012 +0200 +++ b/src/dialogs.py Tue Apr 24 14:18:54 2012 +0400 @@ -2832,7 +2832,7 @@ gajim.interface.roster.popups_notification_height -= self.window_height self.window.destroy() - if len(gajim.interface.roster.popup_notification_windows) > 0: + if len(gajim.interface.roster.popup_notification_windows) > self.index: # we want to remove the destroyed window from the list gajim.interface.roster.popup_notification_windows.pop(self.index)

1 0

gajim: don't load unactivatable plugins
by Yann Leboulanger 30 Apr '12

30 Apr '12

changeset 316a272ea2f0 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=316a272ea2f0 description: don't load unactivatable plugins diffstat: src/plugins/gui.py | 9 ++++++--- src/plugins/plugin.py | 1 + src/plugins/pluginmanager.py | 5 +++-- 3 files changed, 10 insertions(+), 5 deletions(-) diffs (61 lines): diff -r f922ac45c66b -r 316a272ea2f0 src/plugins/gui.py --- a/src/plugins/gui.py Mon Apr 30 00:43:18 2012 +0200 +++ b/src/plugins/gui.py Mon Apr 30 21:04:37 2012 +0200 @@ -114,10 +114,13 @@ desc_textbuffer = self.plugin_description_textview.get_buffer() from plugins.plugins_i18n import _ - desc_textbuffer.set_text(_(plugin.description)) + txt = plugin.description + if plugin.available_text: + txt += '\n\n' + _('Warning: %s') % plugin.available_text + desc_textbuffer.set_text(txt) self.plugin_description_textview.set_property('sensitive', True) self.uninstall_plugin_button.set_property('sensitive', - gajim.PLUGINS_DIRS[1] in plugin.__path__) + gajim.PLUGINS_DIRS[1] in plugin.__path__) if plugin.config_dialog is None: self.configure_plugin_button.set_property('sensitive', False) else: @@ -145,7 +148,7 @@ for plugin in pm.plugins: self.installed_plugins_model.append([plugin, plugin.name, - plugin.active, plugin.activatable]) + plugin.active and plugin.activatable, plugin.activatable]) @log_calls('PluginsWindow') def installed_plugins_toggled_cb(self, cell, path): diff -r f922ac45c66b -r 316a272ea2f0 src/plugins/plugin.py --- a/src/plugins/plugin.py Mon Apr 30 00:43:18 2012 +0200 +++ b/src/plugins/plugin.py Mon Apr 30 21:04:37 2012 +0200 @@ -155,6 +155,7 @@ :type: `plugins.plugin.GajimPluginConfig` ''' self.activatable = True + self.available_text = '' self.load_config() self.config_dialog = GajimPluginConfigDialog(self) self.init() diff -r f922ac45c66b -r 316a272ea2f0 src/plugins/pluginmanager.py --- a/src/plugins/pluginmanager.py Mon Apr 30 00:43:18 2012 +0200 +++ b/src/plugins/pluginmanager.py Mon Apr 30 21:04:37 2012 +0200 @@ -292,7 +292,7 @@ :param plugin: plugin to be activated :type plugin: class object of `GajimPlugin` subclass ''' - if not plugin.active: + if not plugin.active and plugin.activatable: self._add_gui_extension_points_handlers_from_plugin(plugin) self._handle_all_gui_extension_points_with_plugin(plugin) @@ -374,7 +374,8 @@ def _activate_all_plugins_from_global_config(self): for plugin in self.plugins: - if self._plugin_is_active_in_global_config(plugin): + if self._plugin_is_active_in_global_config(plugin) and \ + plugin.activatable: try: self.activate_plugin(plugin) except GajimPluginActivateException:

1 0

gajim: ability for plugins to be activatable. True by default, b...
by Yann Leboulanger 30 Apr '12

30 Apr '12

changeset f922ac45c66b in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=f922ac45c66b description: ability for plugins to be activatable. True by default, but plugin can be non-activatable is a dep is missing for example. diffstat: src/plugins/gui.py | 13 +++++++------ src/plugins/plugin.py | 1 + 2 files changed, 8 insertions(+), 6 deletions(-) diffs (63 lines): diff -r 357b606cea31 -r f922ac45c66b src/plugins/gui.py --- a/src/plugins/gui.py Mon Apr 30 00:19:55 2012 +0200 +++ b/src/plugins/gui.py Mon Apr 30 00:43:18 2012 +0200 @@ -60,7 +60,7 @@ self.plugin_name_label.set_attributes(attr_list) self.installed_plugins_model = gtk.ListStore(gobject.TYPE_PYOBJECT, - gobject.TYPE_STRING, gobject.TYPE_BOOLEAN) + gobject.TYPE_STRING, gobject.TYPE_BOOLEAN, gobject.TYPE_BOOLEAN) self.installed_plugins_treeview.set_model(self.installed_plugins_model) self.installed_plugins_treeview.set_rules_hint(True) @@ -69,9 +69,8 @@ self.installed_plugins_treeview.append_column(col) renderer = gtk.CellRendererToggle() - renderer.set_property('activatable', True) renderer.connect('toggled', self.installed_plugins_toggled_cb) - col = gtk.TreeViewColumn(_('Active'), renderer, active=2) + col = gtk.TreeViewColumn(_('Active'), renderer, active=2, activatable=3) self.installed_plugins_treeview.append_column(col) # connect signal for selection change @@ -146,7 +145,7 @@ for plugin in pm.plugins: self.installed_plugins_model.append([plugin, plugin.name, - plugin.active]) + plugin.active, plugin.activatable]) @log_calls('PluginsWindow') def installed_plugins_toggled_cb(self, cell, path): @@ -230,7 +229,8 @@ model.remove(model.get_iter((row, 0))) break - iter_ = model.append([plugin, plugin.name, False]) + iter_ = model.append([plugin, plugin.name, False, + plugin.activatable]) sel = self.installed_plugins_treeview.get_selection() sel.select_iter(iter_) @@ -252,7 +252,8 @@ show_warn_dialog() return model = self.installed_plugins_model - iter_ = model.append([plugin, plugin.name, False]) + iter_ = model.append([plugin, plugin.name, False, + plugin.activatable]) sel = self.installed_plugins_treeview.get_selection() sel.select_iter(iter_) diff -r 357b606cea31 -r f922ac45c66b src/plugins/plugin.py --- a/src/plugins/plugin.py Mon Apr 30 00:19:55 2012 +0200 +++ b/src/plugins/plugin.py Mon Apr 30 00:43:18 2012 +0200 @@ -154,6 +154,7 @@ :type: `plugins.plugin.GajimPluginConfig` ''' + self.activatable = True self.load_config() self.config_dialog = GajimPluginConfigDialog(self) self.init()

1 0

gajim: remove latex support. Will be in a plugin. Fixes #4176
by Yann Leboulanger 30 Apr '12

30 Apr '12

changeset 357b606cea31 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=357b606cea31 description: remove latex support. Will be in a plugin. Fixes #4176 diffstat: src/common/config.py | 2 - src/common/gajim.py | 4 - src/common/latex.py | 180 ------------------------------------------- src/conversation_textview.py | 25 ----- src/features_window.py | 8 - src/gui_interface.py | 10 -- 6 files changed, 0 insertions(+), 229 deletions(-) diffs (truncated from 306 to 300 lines): diff -r bfc60d5e0c19 -r 357b606cea31 src/common/config.py --- a/src/common/config.py Mon Apr 30 14:16:04 2012 +0400 +++ b/src/common/config.py Mon Apr 30 00:19:55 2012 +0200 @@ -278,12 +278,10 @@ 'show_contacts_number': [opt_bool, True, _('If True, Gajim will show number of online and total contacts in account and group rows.')], 'treat_incoming_messages': [ opt_str, '', _('Can be empty, \'chat\' or \'normal\'. If not empty, treat all incoming messages as if they were of this type')], 'scroll_roster_to_last_message': [opt_bool, True, _('If True, Gajim will scroll and select the contact who sent you the last message, if chat window is not already opened.')], - 'use_latex': [opt_bool, False, _('If True, Gajim will convert string between $$ and $$ to an image using dvips and convert before insterting it in chat window.')], 'change_status_window_timeout': [opt_int, 15, _('Time of inactivity needed before the change status window closes down.')], 'max_conversation_lines': [opt_int, 500, _('Maximum number of lines that are printed in conversations. Oldest lines are cleared.')], 'attach_notifications_to_systray': [opt_bool, False, _('If True, notification windows from notification-daemon will be attached to notification icon.')], 'check_idle_every_foo_seconds': [opt_int, 2, _('Choose interval between 2 checks of idleness.')], - 'latex_png_dpi': [opt_str, '108', _('Change the value to change the size of latex formulas displayed. The higher is larger.') ], 'uri_schemes': [opt_str, 'aaa:// aaas:// acap:// cap:// cid: crid:// data: dav: dict:// dns: fax: file:/ ftp:// geo: go: gopher:// h323: http:// https:// iax: icap:// im: imap:// info: ipp:// iris: iris.beep: iris.xpc: iris.xpcs: iris.lwz: ldap:// mid: modem: msrp:// msrps:// mtqp:// mupdate:// news: nfs:// nntp:// opaquelocktoken: pop:// pres: prospero:// rtsp:// service: shttp:// sip: sips: sms: snmp:// soap.beep:// soap.beeps:// tag: tel: telnet:// tftp:// thismessage:/ tip:// tv: urn:// vemmi:// xmlrpc.beep:// xmlrpc.beeps:// z39.50r:// z39.50s:// about: apt: cvs:// daap:// ed2k:// feed: fish:// git:// iax2: irc:// ircs:// ldaps:// magnet: mms:// rsync:// ssh:// svn:// sftp:// smb:// webcal://', _('Valid uri schemes. Only schemes in this list will be accepted as "real" uri. (mailto and xmpp are handled separately)'), True], 'ask_offline_status_on_connection': [ opt_bool, False, _('Ask offline status message to all offline contacts when connection to an accoutn is established. WARNING: This causes a lot of requests to be sent!') ], 'shell_like_completion': [ opt_bool, False, _('If True, completion in groupchats will be like a shell auto-completion')], diff -r bfc60d5e0c19 -r 357b606cea31 src/common/gajim.py --- a/src/common/gajim.py Mon Apr 30 14:16:04 2012 +0400 +++ b/src/common/gajim.py Mon Apr 30 00:19:55 2012 +0200 @@ -167,10 +167,6 @@ if subprocess.call(gpg_cmd, shell=True): HAVE_GPG = False -# Depends on use_latex option. Will be correctly set after we config options are -# read. -HAVE_LATEX = False - HAVE_FARSTREAM = True try: farstream = __import__('farstream') diff -r bfc60d5e0c19 -r 357b606cea31 src/common/latex.py --- a/src/common/latex.py Mon Apr 30 14:16:04 2012 +0400 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,180 +0,0 @@ -# -*- coding:utf-8 -*- -## src/common/latex.py -## -## Copyright (C) 2005 Norman Rasmussen <norman AT rasmussen.co.za> -## Copyright (C) 2005-2006 Alex Mauer <hawke AT hawkesnest.net> -## Travis Shirk <travis AT pobox.com> -## Copyright (C) 2005-2007 Nikos Kouremenos <kourem AT gmail.com> -## Copyright (C) 2005-2012 Yann Leboulanger <asterix AT lagaule.org> -## Copyright (C) 2006 Dimitur Kirov <dkirov AT gmail.com> -## Copyright (C) 2006-2008 Jean-Marie Traissard <jim AT lapin.org> -## Copyright (C) 2008 Jonathan Schleifer <js-gajim AT webkeks.org> -## Julien Pivotto <roidelapluie AT gmail.com> -## Stephan Erb <steve-e AT h3c.de> -## -## This file is part of Gajim. -## -## Gajim is free software; you can redistribute it and/or modify -## it under the terms of the GNU General Public License as published -## by the Free Software Foundation; version 3 only. -## -## Gajim is distributed in the hope that it will be useful, -## but WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -## GNU General Public License for more details. -## -## You should have received a copy of the GNU General Public License -## along with Gajim. If not, see <http://www.gnu.org/licenses/>. -## - -import os -import random -from tempfile import mkstemp, mkdtemp -from subprocess import Popen, PIPE - -import logging -log = logging.getLogger('gajim.c.latex') - -import gajim -from exceptions import LatexError -import helpers - -# some latex commands are really bad -blacklist = ['\\def', '\\let', '\\futurelet', - '\\newcommand', '\\renewcomment', '\\else', '\\fi', '\\write', - '\\input', '\\include', '\\chardef', '\\catcode', '\\makeatletter', - '\\noexpand', '\\toksdef', '\\every', '\\errhelp', '\\errorstopmode', - '\\scrollmode', '\\nonstopmode', '\\batchmode', '\\read', '\\csname', - '\\newhelp', '\\relax', '\\afterground', '\\afterassignment', - '\\expandafter', '\\noexpand', '\\special', '\\command', '\\loop', - '\\repeat', '\\toks', '\\output', '\\line', '\\mathcode', '\\name', - '\\item', '\\section', '\\mbox', '\\DeclareRobustCommand', '\\[', - '\\]'] -# True if the string matches the blacklist -def check_blacklist(str_): - for word in blacklist: - if word in str_: - return True - return False - -def write_latex(filename, str_): - texstr = '\\documentclass[12pt]{article}\\usepackage[dvips]{graphicx}' - texstr += '\\usepackage{amsmath}\\usepackage{amssymb}' - texstr += '\\pagestyle{empty}' - texstr += '\\begin{document}\\begin{large}\\begin{gather*}' - texstr += str_ - texstr += '\\end{gather*}\\end{large}\\end{document}' - - file_ = open(filename, "w+") - file_.write(texstr) - file_.flush() - file_.close() - -# a wrapper for Popen so that no window gets opened on Windows -# (i think this is the reason we're using Popen rather than just system()) -# stdout goes to a pipe so that it can be read -def popen_nt_friendly(command, directory): - if os.name == 'nt': - # CREATE_NO_WINDOW - return Popen(command, creationflags=0x08000000, cwd=directory, - stdout=PIPE) - else: - return Popen(command, cwd=directory, stdout=PIPE) - -def check_for_latex_support(): - """ - Check if latex is available and if it can create a picture - """ - try: - filename = latex_to_image("test") - if filename: - # we have a file, conversion succeeded - os.remove(filename) - return True - return False - except LatexError: - return False - -def try_run(argv, directory): - try: - p = popen_nt_friendly(argv, directory) - out = p.communicate()[0] - log.info(out) - return p.wait() - except Exception, e: - return _('Error executing "%(command)s": %(error)s') % { - 'command': " ".join(argv), - 'error': helpers.decode_string(str(e))} - - -def latex_to_image(str_): - result = None - exitcode = 0 - - def fg_str(fmt): - try: - return [{'hex' : '+level-colors', 'tex' : '-fg'}[fmt], - gajim.interface.get_fg_color(fmt)] - except KeyError: - # interface may not be available when we test latex at startup - return [] - except AttributeError: - # interface may not be available when we test latext at startup - return {'hex': ['+level-colors', '0x000000'], - 'tex': ['-fg', 'rgb 0.0 0.0 0.0']}[fmt] - - # filter latex code with bad commands - if check_blacklist(str_): - # we triggered the blacklist, immediately return None - return None - - try: - tmpdir = mkdtemp(prefix='gajimtex') - tmppng = mkstemp(prefix='gajim_tex', suffix='.png')[1] - except Exception: - raise LatexError('could not securely create one or more temporary files' - ' for LaTeX conversion') - - tmpfile = os.path.join(tmpdir, 'gajim_tex') - - # build latex string - write_latex(tmpfile + '.tex', str_) - - # convert TeX to dvi - exitcode = try_run(['latex', '--interaction=nonstopmode', tmpfile + '.tex'], - tmpdir) - - if exitcode == 0: - # convert dvi to png - latex_png_dpi = gajim.config.get('latex_png_dpi') - exitcode = try_run(['dvipng'] + fg_str('tex') + ['-T', 'tight', '-D', - latex_png_dpi, tmpfile + '.dvi', '-o', tmpfile + '.png'], tmpdir) - - if exitcode: - # dvipng failed, try convert - exitcode = try_run(['convert'] + fg_str('hex') + ['-trim', - '-density', latex_png_dpi, tmpfile + '.dvi', tmpfile + '.png'], - tmpdir) - - # remove temp files created by us and TeX - extensions = ['.tex', '.log', '.aux', '.dvi'] - for ext in extensions: - try: - os.remove(tmpfile + ext) - except Exception: - pass - - if exitcode == 0: - os.rename(tmpfile + '.png', tmppng) - else: - os.remove(tmppng) - - os.rmdir(tmpdir) - - if isinstance(exitcode, (unicode, str)): - raise LatexError(exitcode) - - if exitcode == 0: - result = tmppng - - return result diff -r bfc60d5e0c19 -r 357b606cea31 src/conversation_textview.py --- a/src/conversation_textview.py Mon Apr 30 14:16:04 2012 +0400 +++ b/src/conversation_textview.py Mon Apr 30 00:19:55 2012 +0200 @@ -1148,31 +1148,6 @@ else: if not show_ascii_formatting_chars: special_text = special_text[1:-1] # remove _ _ - elif gajim.HAVE_LATEX and special_text.startswith('$$') and \ - special_text.endswith('$$') and graphics: - try: - imagepath = latex.latex_to_image(special_text[2:-2]) - except LatexError, e: - # print the error after the line has been written - gobject.idle_add(self.print_conversation_line, str(e), '', 'info', - '', None) - imagepath = None - end_iter = buffer_.get_end_iter() - if imagepath is not None: - anchor = buffer_.create_child_anchor(end_iter) - img = TextViewImage(anchor, special_text) - img.set_from_file(imagepath) - img.show() - # add - self.tv.add_child_at_anchor(img, anchor) - # delete old file - try: - os.remove(imagepath) - except Exception: - pass - else: - buffer_.insert(end_iter, special_text) - use_other_tags = False else: # It's nothing special if use_other_tags: diff -r bfc60d5e0c19 -r 357b606cea31 src/features_window.py --- a/src/features_window.py Mon Apr 30 14:16:04 2012 +0400 +++ b/src/features_window.py Mon Apr 30 00:19:55 2012 +0200 @@ -91,10 +91,6 @@ _('Ability to measure idle time, in order to set auto status.'), _('Requires libxss library.'), _('Requires python2.5.')), - _('LaTeX'): (self.latex_available, - _('Transform LaTeX expressions between $$ $$.'), - _('Requires texlive-latex-base and (dvipng or ImageMagick). You have to set \'use_latex\' to True in the Advanced Configuration Editor.'), - _('Requires texlive-latex-base and (dvipng or ImageMagick) (All is in MikTeX). You have to set \'use_latex\' to True in the Advanced Configuration Editor.')), _('End to End message encryption'): (self.pycrypto_available, _('Encrypting chat messages.'), _('Requires python-crypto.'), @@ -244,10 +240,6 @@ from common import sleepy return sleepy.SUPPORTED - def latex_available(self): - from common import latex - return latex.check_for_latex_support() - def pycrypto_available(self): return gajim.HAVE_PYCRYPTO diff -r bfc60d5e0c19 -r 357b606cea31 src/gui_interface.py --- a/src/gui_interface.py Mon Apr 30 14:16:04 2012 +0400 +++ b/src/gui_interface.py Mon Apr 30 00:19:55 2012 +0200 @@ -1838,17 +1838,11 @@ r'(?<!\S)' r'/[^\s/]' r'([^/]*[^\s/])?' r'/(?!\S)|'\ r'(?<!\w)' r'_[^\s_]' r'([^_]*[^\s_])?' r'_(?!\w)' - latex = r'|\$\$[^$\\]*?([\]\[0-9A-Za-z()|+*/-]|'\ - r'[\\][\]\[0-9A-Za-z()|{}$])(.*?[^\\])?\$\$' - basic_pattern = links + '|' + mail + '|' + legacy_prefixes link_pattern = basic_pattern self.link_pattern_re = re.compile(link_pattern, re.I | re.U) - if gajim.config.get('use_latex'): - basic_pattern += latex - if gajim.config.get('ascii_formatting'): basic_pattern += formatting self.basic_pattern = basic_pattern @@ -2705,10 +2699,6 @@ cfg_was_read = parser.read() - from common import latex

1 0

gajim: fix gnomekeyring import
by Fomin Denis 30 Apr '12

30 Apr '12

changeset bfc60d5e0c19 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=bfc60d5e0c19 description: fix gnomekeyring import diffstat: src/common/passwords.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r b87e76697f04 -r bfc60d5e0c19 src/common/passwords.py --- a/src/common/passwords.py Mon Apr 30 10:52:12 2012 +0400 +++ b/src/common/passwords.py Mon Apr 30 14:16:04 2012 +0400 @@ -183,7 +183,7 @@ if gajim.config.get('use_gnomekeyring'): global gnomekeyring try: - __import__('gnomekeyring') + gnomekeyring = __import__('gnomekeyring') except ImportError: pass else:

1 0

gajim: gnomekeyring import will not be delayed
by Fomin Denis 30 Apr '12

30 Apr '12

changeset b87e76697f04 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=b87e76697f04 description: gnomekeyring import will not be delayed diffstat: src/common/passwords.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 5e1948c0df10 -r b87e76697f04 src/common/passwords.py --- a/src/common/passwords.py Sat Apr 28 22:45:53 2012 +0200 +++ b/src/common/passwords.py Mon Apr 30 10:52:12 2012 +0400 @@ -183,7 +183,7 @@ if gajim.config.get('use_gnomekeyring'): global gnomekeyring try: - import gnomekeyring + __import__('gnomekeyring') except ImportError: pass else:

1 0

gajim: improve roster drawing when we get many presences. Fixes ...
by Yann Leboulanger 28 Apr '12

28 Apr '12

changeset 5e1948c0df10 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=5e1948c0df10 description: improve roster drawing when we get many presences. Fixes #7125 diffstat: src/roster_window.py | 36 ++++++++++++++++++++++++++++++++++-- 1 files changed, 34 insertions(+), 2 deletions(-) diffs (71 lines): diff -r 1b50ef457322 -r 5e1948c0df10 src/roster_window.py --- a/src/roster_window.py Sat Apr 28 22:45:17 2012 +0200 +++ b/src/roster_window.py Sat Apr 28 22:45:53 2012 +0200 @@ -1009,7 +1009,7 @@ ### Methods for adding and removing roster window items ################################################################################ - def draw_account(self, account): + def _really_draw_account(self, account): child_iter = self._get_account_iter(account, self.model) if not child_iter: assert False, 'Account iter of %s could not be found.' % account @@ -1073,9 +1073,21 @@ asPixbufIcon() else: self.model[child_iter][C_LOCATION_PIXBUF] = None + + def _really_draw_accounts(self): + for acct in self.accounts_to_draw: + self._really_draw_account(acct) + self.accounts_to_draw = [] return False - def draw_group(self, group, account): + def draw_account(self, account): + if account in self.accounts_to_draw: + return + self.accounts_to_draw.append(account) + if len(self.accounts_to_draw) == 1: + gobject.timeout_add(200, self._really_draw_accounts) + + def _really_draw_group(self, group, account): child_iter = self._get_group_iter(group, account, model=self.model) if not child_iter: # Eg. We redraw groups after we removed a entitiy @@ -1094,8 +1106,23 @@ text += ' (%s/%s)' % (repr(nbr_on), repr(nbr_total)) self.model[child_iter][C_NAME] = text + + def _really_draw_groups(self): + for ag in self.groups_to_draw.values(): + acct = ag['account'] + grp = ag['group'] + self._really_draw_group(grp, acct) + self.groups_to_draw = {} return False + def draw_group(self, group, account): + ag = account + group + if ag in self.groups_to_draw: + return + self.groups_to_draw[ag] = {'group': group, 'account': account} + if len(self.groups_to_draw) == 1: + gobject.timeout_add(200, self._really_draw_groups) + def draw_parent_contact(self, jid, account): child_iters = self._get_contact_iter(jid, account, model=self.model) if not child_iters: @@ -6382,6 +6409,11 @@ # it means we are waiting for this number of accounts to disconnect # before quitting self.quit_on_next_offline = -1 + + # groups to draw next time we draw groups. + self.groups_to_draw = {} + # accounts to draw next time we draw accounts. + self.accounts_to_draw = [] # uf_show, img, show, sensitive liststore = gtk.ListStore(str, gtk.Image, str, bool)

1 0

gajim: remove big time consuming and unused function pformat. se...
by Yann Leboulanger 28 Apr '12

28 Apr '12

changeset 1b50ef457322 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=1b50ef457322 description: remove big time consuming and unused function pformat. see #7125 diffstat: src/common/nec.py | 10 +--------- 1 files changed, 1 insertions(+), 9 deletions(-) diffs (32 lines): diff -r e1f3dd979d68 -r 1b50ef457322 src/common/nec.py --- a/src/common/nec.py Sat Apr 28 21:39:32 2012 +0200 +++ b/src/common/nec.py Sat Apr 28 22:45:17 2012 +0200 @@ -25,8 +25,6 @@ :license: GPL ''' -from pprint import pformat - #from plugins.helpers import log from common import gajim @@ -158,12 +156,6 @@ for k, v in kwargs.iteritems(): setattr(self, k, v) - def __str__(self): - return '<NetworkEvent object> Attributes: %s'%(pformat(self.__dict__)) - - def __repr__(self): - return '<NetworkEvent object> Attributes: %s'%(pformat(self.__dict__)) - class NetworkIncomingEvent(NetworkEvent): base_network_events = [] @@ -176,4 +168,4 @@ base_network_events = [] ''' Names of base network events that new event is going to be generated on. - ''' \ No newline at end of file + '''

1 0

gajim: improve Gajim startup. see #7125
by Yann Leboulanger 28 Apr '12

28 Apr '12

changeset e1f3dd979d68 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=e1f3dd979d68 description: improve Gajim startup. see #7125 diffstat: src/roster_window.py | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diffs (38 lines): diff -r 15ac0c4acea8 -r e1f3dd979d68 src/roster_window.py --- a/src/roster_window.py Mon Apr 23 23:22:12 2012 +0200 +++ b/src/roster_window.py Sat Apr 28 21:39:32 2012 +0200 @@ -1375,6 +1375,7 @@ # disable sorting self.model.set_sort_column_id(-2, gtk.SORT_ASCENDING) self.starting = True + self.starting_filtering = True def _after_fill(self): self.starting = False @@ -1392,6 +1393,8 @@ self.model.set_sort_column_id(1, gtk.SORT_ASCENDING) self.tree.set_model(self.modelfilter) self.tree.thaw_child_notify() + self.starting_filtering = False + self.refilter_shown_roster_items() def setup_and_draw_roster(self): """ @@ -1548,6 +1551,8 @@ """ Determine whether iter should be visible in the treeview """ + if self.starting_filtering: + return False type_ = model[titer][C_TYPE] if not type_: return False @@ -6306,6 +6311,8 @@ def __init__(self): self.filtering = False + self.starting = False + self.starting_filtering = False # Number of renderers plugins added self.nb_ext_renderers = 0 # When we quit, rememver if we already saved config once

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