Commits December 2009

commits@gajim.org

8 participants
127 discussions

gajim: Fixes #5447
by Alexander Cherniuk 29 Dec '09

29 Dec '09

changeset bff58b7d18c3 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=bff58b7d18c3 description: Fixes #5447 diffstat: src/common/passwords.py | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diffs (12 lines): diff -r bf3cbcef9306 -r bff58b7d18c3 src/common/passwords.py --- a/src/common/passwords.py Fri Nov 20 22:09:05 2009 +0100 +++ b/src/common/passwords.py Wed Nov 25 09:10:30 2009 +0200 @@ -122,6 +122,8 @@ user = gajim.config.get_per('accounts', account_name, 'name') display_name = _('XMPP account %s@%s') % (user, server) attributes1 = dict(server=str(server), user=str(user), protocol='xmpp') + if password is None: + password = str() try: auth_token = gnomekeyring.item_create_sync( self.keyring, gnomekeyring.ITEM_NETWORK_PASSWORD,

1 0

gajim: fix resizing of the MUC occupant treeview when we resize ...
by Yann Leboulanger 29 Dec '09

29 Dec '09

changeset bf3cbcef9306 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=bf3cbcef9306 description: fix resizing of the MUC occupant treeview when we resize chat window. Fixes #5433 diffstat: src/groupchat_control.py | 17 +++++++++++++++-- 1 files changed, 15 insertions(+), 2 deletions(-) diffs (43 lines): diff -r 416a49f14391 -r bf3cbcef9306 src/groupchat_control.py --- a/src/groupchat_control.py Tue Nov 24 15:41:16 2009 +0100 +++ b/src/groupchat_control.py Fri Nov 20 22:09:05 2009 +0100 @@ -318,6 +318,7 @@ id_ = self.list_treeview.connect('style-set', self.on_list_treeview_style_set) self.handlers[id_] = self.list_treeview + self.resize_from_another_muc = False # we want to know when the the widget resizes, because that is # an indication that the hpaned has moved... # FIXME: Find a better indicator that the hpaned has moved. @@ -441,17 +442,29 @@ menu.show_all() + def resize_occupant_treeview(self, position): + self.resize_from_another_muc = True + self.hpaned.set_position(position) + def reset_flag(): + self.resize_from_another_muc = False + # Reset the flag when everything will be redrawn, and in particular when + # on_treeview_size_allocate will have been called. + gobject.idle_add(reset_flag) + def on_treeview_size_allocate(self, widget, allocation): '''The MUC treeview has resized. Move the hpaned in all tabs to match''' + if self.resize_from_another_muc: + # Don't send the event to other MUC + return hpaned_position = self.hpaned.get_position() for account in gajim.gc_connected: for room_jid in [i for i in gajim.gc_connected[account] if \ - gajim.gc_connected[account][i]]: + gajim.gc_connected[account][i] and i != self.room_jid]: ctrl = gajim.interface.msg_win_mgr.get_gc_control(room_jid, account) if not ctrl: ctrl = gajim.interface.minimized_controls[account][room_jid] if ctrl: - ctrl.hpaned.set_position(hpaned_position) + ctrl.resize_occupant_treeview(hpaned_position) def iter_contact_rows(self): '''iterate over all contact rows in the tree model'''

1 0

gajim: fix strimg comparison according to locales. Fixes #4201
by Yann Leboulanger 29 Dec '09

29 Dec '09

changeset 416a49f14391 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=416a49f14391 description: fix strimg comparison according to locales. Fixes #4201 diffstat: src/groupchat_control.py | 11 +++-------- src/roster_window.py | 20 +++++++++++--------- 2 files changed, 14 insertions(+), 17 deletions(-) diffs (87 lines): diff -r 9938de8ef67d -r 416a49f14391 src/groupchat_control.py --- a/src/groupchat_control.py Tue Dec 15 19:04:35 2009 +0100 +++ b/src/groupchat_control.py Tue Nov 24 15:41:16 2009 +0100 @@ -29,6 +29,7 @@ import os import time +import locale import gtk import pango import gobject @@ -393,9 +394,7 @@ nick1 = nick1.decode('utf-8') nick2 = nick2.decode('utf-8') if type1 == 'role': - if nick1 < nick2: - return -1 - return 1 + return locale.strcoll(nick1, nick2) if type1 == 'contact': gc_contact1 = gajim.contacts.get_gc_contact(self.account, self.room_jid, nick1) @@ -419,11 +418,7 @@ # We compare names name1 = gc_contact1.get_shown_name() name2 = gc_contact2.get_shown_name() - if name1.lower() < name2.lower(): - return -1 - if name2.lower() < name1.lower(): - return 1 - return 0 + return locale.strcoll(name1.lower(), name2.lower()) def on_msg_textview_populate_popup(self, textview, menu): '''we override the default context menu and we prepend Clear diff -r 9938de8ef67d -r 416a49f14391 src/roster_window.py --- a/src/roster_window.py Tue Dec 15 19:04:35 2009 +0100 +++ b/src/roster_window.py Tue Nov 24 15:41:16 2009 +0100 @@ -38,6 +38,7 @@ import os import sys import time +import locale import common.sleepy import history_window @@ -1651,9 +1652,7 @@ account1 = account1.decode('utf-8') account2 = account2.decode('utf-8') if type1 == 'account': - if account1 < account2: - return -1 - return 1 + return locale.strcoll(account1, account2) jid1 = model[iter1][C_JID].decode('utf-8') jid2 = model[iter2][C_JID].decode('utf-8') if type1 == 'contact': @@ -1700,20 +1699,23 @@ elif show1 > show2: return 1 # We compare names - if name1.lower() < name2.lower(): + cmp_result = locale.strcoll(name1.lower(), name2.lower()) + if cmp_result < 0: return -1 - if name2.lower() < name1.lower(): + if cmp_result > 0: return 1 if type1 == 'contact' and type2 == 'contact': # We compare account names - if account1.lower() < account2.lower(): + cmp_result = locale.strcoll(account1.lower(), account2.lower()) + if cmp_result < 0: return -1 - if account2.lower() < account1.lower(): + if cmp_result > 0: return 1 # We compare jids - if jid1.lower() < jid2.lower(): + cmp_result = locale.strcoll(jid1.lower(), jid2.lower()) + if cmp_result < 0: return -1 - if jid2.lower() < jid1.lower(): + if cmp_result > 0: return 1 return 0

1 0

gajim: prevent having twice the same group for a contact. Fixes ...
by Yann Leboulanger 29 Dec '09

29 Dec '09

changeset 9938de8ef67d in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=9938de8ef67d description: prevent having twice the same group for a contact. Fixes #5504 diffstat: src/common/xmpp/roster_nb.py | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diffs (14 lines): diff -r 9f1b512429cb -r 9938de8ef67d src/common/xmpp/roster_nb.py --- a/src/common/xmpp/roster_nb.py Sun Dec 06 22:09:44 2009 +0100 +++ b/src/common/xmpp/roster_nb.py Tue Dec 15 19:04:35 2009 +0100 @@ -85,7 +85,9 @@ self._data[jid]['subscription']=item.getAttr('subscription') self._data[jid]['groups']=[] if not self._data[jid].has_key('resources'): self._data[jid]['resources']={} - for group in item.getTags('group'): self._data[jid]['groups'].append(group.getData()) + for group in item.getTags('group'): + if group.getData() not in self._data[jid]['groups']: + self._data[jid]['groups'].append(group.getData()) self._data[self._owner.User+'@'+self._owner.Server]={'resources':{},'name':None,'ask':None,'subscription':None,'groups':None,} self.set=1 # Looks like we have a workaround

1 0

gajim: Ability to copy LaTeX expressions. Fixes #5451
by Yrogirg＠lagaule.org 28 Dec '09

28 Dec '09

changeset 61291a23d3d4 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=61291a23d3d4 description: Ability to copy LaTeX expressions. Fixes #5451 diffstat: src/conversation_textview.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r bd76810dac85 -r 61291a23d3d4 src/conversation_textview.py --- a/src/conversation_textview.py Tue Dec 29 00:01:10 2009 +0100 +++ b/src/conversation_textview.py Tue Dec 29 00:01:55 2009 +0100 @@ -1129,7 +1129,7 @@ end_iter = buffer_.get_end_iter() if imagepath is not None: anchor = buffer_.create_child_anchor(end_iter) - img = gtk.Image() + img = TextViewImage(anchor, special_text) img.set_from_file(imagepath) img.show() # add

1 0

gajim: re-enable LATEX usage.
by Yann Leboulanger 28 Dec '09

28 Dec '09

changeset bd76810dac85 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=bd76810dac85 description: re-enable LATEX usage. diffstat: src/common/gajim.py | 5 +++-- src/gui_interface.py | 5 +++++ 2 files changed, 8 insertions(+), 2 deletions(-) diffs (30 lines): diff -r 33ddae907f95 -r bd76810dac85 src/common/gajim.py --- a/src/common/gajim.py Mon Dec 28 23:36:15 2009 +0100 +++ b/src/common/gajim.py Tue Dec 29 00:01:10 2009 +0100 @@ -182,8 +182,9 @@ if system('gpg -h >/dev/null 2>&1'): HAVE_GPG = False -import latex -HAVE_LATEX = config.get('use_latex') and latex.check_for_latex_support() +# Depends on use_latex option. Will be correctly set after we config options are +# read. +HAVE_LATEX = False HAVE_INDICATOR = True try: diff -r 33ddae907f95 -r bd76810dac85 src/gui_interface.py --- a/src/gui_interface.py Mon Dec 28 23:36:15 2009 +0100 +++ b/src/gui_interface.py Tue Dec 29 00:01:10 2009 +0100 @@ -3198,6 +3198,11 @@ } cfg_was_read = parser.read() + + from common import latex + gajim.HAVE_LATEX = gajim.config.get('use_latex') and \ + latex.check_for_latex_support() + gajim.logger.reset_shown_unread_messages() # override logging settings from config (don't take care of '-q' option) if gajim.config.get('verbose'):

1 0

gajim: don't allow to disable a connecting account. Fixes #5522
by Yann Leboulanger 28 Dec '09

28 Dec '09

changeset 33ddae907f95 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=33ddae907f95 description: don't allow to disable a connecting account. Fixes #5522 diffstat: src/config.py | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diffs (22 lines): diff -r 13dc3263f8ca -r 33ddae907f95 src/config.py --- a/src/config.py Mon Dec 28 23:23:04 2009 +0100 +++ b/src/config.py Mon Dec 28 23:36:15 2009 +0100 @@ -2412,7 +2412,7 @@ # normal account if self.ignore_events: return - if gajim.account_is_connected(self.current_account): + if gajim.connections[self.current_account].connected > 0: self.ignore_events = True self.xml.get_widget('enable_zeroconf_checkbutton2').set_active(True) self.ignore_events = False @@ -2446,7 +2446,8 @@ def on_enable_checkbutton1_toggled(self, widget): if self.ignore_events: return - if gajim.account_is_connected(self.current_account): + if gajim.connections[self.current_account].connected > 0: + # connecting or connected self.ignore_events = True self.xml.get_widget('enable_checkbutton1').set_active(True) self.ignore_events = False

1 0

gajim: fix indentation typo
by Yann Leboulanger 28 Dec '09

28 Dec '09

changeset 13dc3263f8ca in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=13dc3263f8ca description: fix indentation typo diffstat: src/common/gajim.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 475d5057e4e4 -r 13dc3263f8ca src/common/gajim.py --- a/src/common/gajim.py Mon Dec 28 23:04:23 2009 +0100 +++ b/src/common/gajim.py Mon Dec 28 23:23:04 2009 +0100 @@ -225,7 +225,7 @@ def get_resource_from_jid(jid): tokens = jid.split('/', 1) if len(tokens) > 1: - return tokens[1] + return tokens[1] def get_name_and_server_from_jid(jid): name = get_nick_from_jid(jid)

1 0

gajim: harmonize indentation. Fixes #5518
by mariolenz＠lagaule.org 28 Dec '09

28 Dec '09

changeset 475d5057e4e4 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=475d5057e4e4 description: harmonize indentation. Fixes #5518 diffstat: src/common/gajim.py | 8 ++++---- src/common/xmpp/protocol.py | 12 ++++++------ src/common/zeroconf/zeroconf_avahi.py | 4 ++-- src/common/zeroconf/zeroconf_bonjour.py | 22 +++++++++++----------- src/groupchat_control.py | 8 ++++---- src/history_manager.py | 32 ++++++++++++++++---------------- src/roster_window.py | 4 ++-- 7 files changed, 45 insertions(+), 45 deletions(-) diffs (246 lines): diff -r 1d96df4d8e56 -r 475d5057e4e4 src/common/gajim.py --- a/src/common/gajim.py Mon Dec 28 22:41:05 2009 +0100 +++ b/src/common/gajim.py Mon Dec 28 23:04:23 2009 +0100 @@ -82,7 +82,7 @@ MY_ICONSETS_PATH = gajimpaths['MY_ICONSETS'] MY_MOOD_ICONSETS_PATH = gajimpaths['MY_MOOD_ICONSETS'] MY_ACTIVITY_ICONSETS_PATH = gajimpaths['MY_ACTIVITY_ICONSETS'] -MY_CACERTS = gajimpaths['MY_CACERTS'] +MY_CACERTS = gajimpaths['MY_CACERTS'] TMP = gajimpaths['TMP'] DATA_DIR = gajimpaths['DATA'] ICONS_DIR = gajimpaths['ICONS'] @@ -223,9 +223,9 @@ return jid[pos:] def get_resource_from_jid(jid): - tokens = jid.split('/', 1) - if len(tokens) > 1: - return tokens[1] + tokens = jid.split('/', 1) + if len(tokens) > 1: + return tokens[1] def get_name_and_server_from_jid(jid): name = get_nick_from_jid(jid) diff -r 1d96df4d8e56 -r 475d5057e4e4 src/common/xmpp/protocol.py --- a/src/common/xmpp/protocol.py Mon Dec 28 22:41:05 2009 +0100 +++ b/src/common/xmpp/protocol.py Mon Dec 28 23:04:23 2009 +0100 @@ -523,12 +523,12 @@ return time.strftime('%Y%m%dT%H:%M:%S', time.gmtime()) def getTimestamp2(self): - """ - Return the timestamp in the 'yyyymmddThhmmss' format - """ - if self.timestamp: - return self.timestamp - return time.strftime('%Y-%m-%dT%H:%M:%SZ', time.gmtime()) + """ + Return the timestamp in the 'yyyymmddThhmmss' format + """ + if self.timestamp: + return self.timestamp + return time.strftime('%Y-%m-%dT%H:%M:%SZ', time.gmtime()) def getID(self): """ diff -r 1d96df4d8e56 -r 475d5057e4e4 src/common/zeroconf/zeroconf_avahi.py --- a/src/common/zeroconf/zeroconf_avahi.py Mon Dec 28 22:41:05 2009 +0100 +++ b/src/common/zeroconf/zeroconf_avahi.py Mon Dec 28 23:04:23 2009 +0100 @@ -77,7 +77,7 @@ log.debug('Found service %s in domain %s on %i.%i.' % (name, domain, interface, protocol)) if not self.connected: - return + return # synchronous resolving self.server.ResolveService( int(interface), int(protocol), name, stype, @@ -90,7 +90,7 @@ log.debug('Service %s in domain %s on %i.%i disappeared.' % (name, domain, interface, protocol)) if not self.connected: - return + return if name != self.name: for key in self.contacts.keys(): if self.contacts[key][C_BARE_NAME] == name: diff -r 1d96df4d8e56 -r 475d5057e4e4 src/common/zeroconf/zeroconf_bonjour.py --- a/src/common/zeroconf/zeroconf_bonjour.py Mon Dec 28 22:41:05 2009 +0100 +++ b/src/common/zeroconf/zeroconf_bonjour.py Mon Dec 28 23:04:23 2009 +0100 @@ -10,11 +10,11 @@ ## ## 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 +## 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/>. +## along with Gajim. If not, see <http://www.gnu.org/licenses/>. ## from common import gajim @@ -28,14 +28,14 @@ pass -resolve_timeout = 1 +resolve_timeout = 1 class Zeroconf: def __init__(self, new_serviceCB, remove_serviceCB, name_conflictCB, disconnected_CB, error_CB, name, host, port): - self.domain = None # specific domain to browse + self.domain = None # specific domain to browse self.stype = '_presence._tcp' - self.port = port # listening port that gets announced + self.port = port # listening port that gets announced self.username = name self.host = host self.txt = pybonjour.TXTRecord() # service data @@ -48,7 +48,7 @@ self.disconnected_CB = disconnected_CB self.error_CB = error_CB - self.contacts = {} # all current local contacts with data + self.contacts = {} # all current local contacts with data self.connected = False self.announced = False self.invalid_self_contact = {} @@ -58,7 +58,7 @@ def browse_callback(self, sdRef, flags, interfaceIndex, errorCode, serviceName, regtype, replyDomain): gajim.log.debug('Found service %s in domain %s on %i(type: %s).' % (serviceName, replyDomain, interfaceIndex, regtype)) if not self.connected: - return + return if errorCode != pybonjour.kDNSServiceErr_NoError: return if not (flags & pybonjour.kDNSServiceFlagsAdd): @@ -83,7 +83,7 @@ def remove_service_callback(self, name): gajim.log.debug('Service %s disappeared.' % name) if not self.connected: - return + return if name != self.name: for key in self.contacts.keys(): if self.contacts[key][C_BARE_NAME] == name: @@ -103,7 +103,7 @@ def service_resolved_callback(self, sdRef, flags, interfaceIndex, errorCode, fullname, hosttarget, port, txtRecord): - # TODO: do proper decoding... + # TODO: do proper decoding... escaping= { r'\.': '.', r'\032': ' ', @@ -211,7 +211,7 @@ txt['version'] = 1 txt['txtvers'] = 1 - # replace gajim's show messages with compatible ones + # replace gajim's show messages with compatible ones if 'status' in self.txt: txt['status'] = self.replace_show(self.txt['status']) else: @@ -221,7 +221,7 @@ try: sdRef = pybonjour.DNSServiceRegister(name = self.name, - regtype = self.stype, port = self.port, txtRecord = self.txt, + regtype = self.stype, port = self.port, txtRecord = self.txt, callBack = self.service_added_callback) self.service_sdRef = sdRef except pybonjour.BonjourError, e: diff -r 1d96df4d8e56 -r 475d5057e4e4 src/groupchat_control.py --- a/src/groupchat_control.py Mon Dec 28 22:41:05 2009 +0100 +++ b/src/groupchat_control.py Mon Dec 28 23:04:23 2009 +0100 @@ -126,8 +126,8 @@ class PrivateChatControl(ChatControl): TYPE_ID = message_control.TYPE_PM - # Set a command host to bound to. Every command given through a private chat - # will be processed with this command host. + # Set a command host to bound to. Every command given through a private chat + # will be processed with this command host. COMMAND_HOST = PrivateChatCommands def __init__(self, parent_win, gc_contact, contact, account, session): @@ -193,8 +193,8 @@ class GroupchatControl(ChatControlBase): TYPE_ID = message_control.TYPE_GC - # Set a command host to bound to. Every command given through a group chat - # will be processed with this command host. + # Set a command host to bound to. Every command given through a group chat + # will be processed with this command host. COMMAND_HOST = GroupChatCommands def __init__(self, parent_win, contact, acct, is_continued=False): diff -r 1d96df4d8e56 -r 475d5057e4e4 src/history_manager.py --- a/src/history_manager.py Mon Dec 28 22:41:05 2009 +0100 +++ b/src/history_manager.py Mon Dec 28 23:04:23 2009 +0100 @@ -57,23 +57,23 @@ from common import i18n def parseOpts(): - config_path = None + config_path = None - try: - shortargs = 'hc:' - longargs = 'help config_path=' - opts = getopt.getopt(sys.argv[1:], shortargs, longargs.split())[0] - except getopt.error, msg: - print str(msg) - print 'for help use --help' - sys.exit(2) - for o, a in opts: - if o in ('-h', '--help'): - print 'history_manager [--help] [--config-path]' - sys.exit() - elif o in ('-c', '--config-path'): - config_path = a - return config_path + try: + shortargs = 'hc:' + longargs = 'help config_path=' + opts = getopt.getopt(sys.argv[1:], shortargs, longargs.split())[0] + except getopt.error, msg: + print str(msg) + print 'for help use --help' + sys.exit(2) + for o, a in opts: + if o in ('-h', '--help'): + print 'history_manager [--help] [--config-path]' + sys.exit() + elif o in ('-c', '--config-path'): + config_path = a + return config_path config_path = parseOpts() del parseOpts diff -r 1d96df4d8e56 -r 475d5057e4e4 src/roster_window.py --- a/src/roster_window.py Mon Dec 28 22:41:05 2009 +0100 +++ b/src/roster_window.py Mon Dec 28 23:04:23 2009 +0100 @@ -1778,7 +1778,7 @@ """ Remove contacts on last events removed - Only performed if removal was requested before but the contact still had + Only performed if removal was requested before but the contact still had pending events """ contact_list = ((event.jid.split('/')[0], event.account) for event in \ @@ -5748,7 +5748,7 @@ self.popups_notification_height = 0 self.popup_notification_windows = [] - # Remove contact from roster when last event opened + # Remove contact from roster when last event opened # { (contact, account): { backend: boolean } self.contacts_to_be_removed = {} gajim.events.event_removed_subscribe(self.on_event_removed)

1 0

gajim: apply config to minimized controls too. Fixes #5515
by Yann Leboulanger 28 Dec '09

28 Dec '09

changeset 1d96df4d8e56 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=1d96df4d8e56 description: apply config to minimized controls too. Fixes #5515 diffstat: src/config.py | 63 ++++++++++++++++++++++++++++---------------------- src/message_window.py | 12 --------- 2 files changed, 35 insertions(+), 40 deletions(-) diffs (158 lines): diff -r 7291d2dff27e -r 1d96df4d8e56 src/config.py --- a/src/config.py Mon Dec 28 21:52:45 2009 +0100 +++ b/src/config.py Mon Dec 28 22:41:05 2009 +0100 @@ -382,7 +382,8 @@ # Default Status messages self.default_msg_tree = self.xml.get_widget('default_msg_treeview') - col2 = self.default_msg_tree.rc_get_style().bg[gtk.STATE_ACTIVE].to_string() + col2 = self.default_msg_tree.rc_get_style().bg[gtk.STATE_ACTIVE].\ + to_string() # (status, translated_status, message, enabled) model = gtk.ListStore(str, str, str, bool) self.default_msg_tree.set_model(model) @@ -576,37 +577,43 @@ w.set_sensitive(widget.get_active()) gajim.interface.save_config() + def _get_all_controls(self): + for ctrl in gajim.interface.msg_win_mgr.get_controls(): + yield ctrl + for account in gajim.connections: + for ctrl in gajim.interface.minimized_controls[account].values(): + yield ctrl + + def _get_all_muc_controls(self): + for ctrl in gajim.interface.msg_win_mgr.get_controls( + message_control.TYPE_GC): + yield ctrl + for account in gajim.connections: + for ctrl in gajim.interface.minimized_controls[account].values(): + yield ctrl + def on_sort_by_show_in_roster_checkbutton_toggled(self, widget): self.on_checkbutton_toggled(widget, 'sort_by_show_in_roster') gajim.interface.roster.setup_and_draw_roster() def on_sort_by_show_in_muc_checkbutton_toggled(self, widget): self.on_checkbutton_toggled(widget, 'sort_by_show_in_muc') - # Redraw connected groupchats - for account in gajim.connections: - if gajim.connections[account].connected: - for gc_control in gajim.interface.msg_win_mgr.get_controls( - message_control.TYPE_GC) + \ - gajim.interface.minimized_controls[account].values(): - gc_control.draw_roster() + # Redraw groupchats + for ctrl in self._get_all_muc_controls(): + ctrl.draw_roster() def on_show_avatars_in_roster_checkbutton_toggled(self, widget): self.on_checkbutton_toggled(widget, 'show_avatars_in_roster') gajim.interface.roster.setup_and_draw_roster() - # Redraw connected groupchats (in an ugly way) - for account in gajim.connections: - if gajim.connections[account].connected: - for gc_control in gajim.interface.msg_win_mgr.get_controls( - message_control.TYPE_GC) + \ - gajim.interface.minimized_controls[account].values(): - gc_control.draw_roster() + # Redraw groupchats (in an ugly way) + for ctrl in self._get_all_muc_controls(): + ctrl.draw_roster() def on_show_status_msgs_in_roster_checkbutton_toggled(self, widget): self.on_checkbutton_toggled(widget, 'show_status_msgs_in_roster') gajim.interface.roster.setup_and_draw_roster() - for ctl in gajim.interface.msg_win_mgr.controls(): - if ctl.type_id == message_control.TYPE_GC: - ctl.update_ui() + for ctrl in self._get_all_muc_controls(): + ctrl.update_ui() def on_show_mood_in_roster_checkbutton_toggled(self, widget): self.on_checkbutton_toggled(widget, 'show_mood_in_roster') @@ -641,8 +648,8 @@ """ Update emoticons state in Opened Chat Windows """ - for win in gajim.interface.msg_win_mgr.windows(): - win.toggle_emoticons() + for ctrl in self._get_all_controls(): + ctrl.toggle_emoticons() def on_one_window_type_combo_changed(self, widget): active = widget.get_active() @@ -653,8 +660,8 @@ def on_compact_view_checkbutton_toggled(self, widget): active = widget.get_active() - for ctl in gajim.interface.msg_win_mgr.controls(): - ctl.chat_buttons_set_visible(active) + for ctrl in self._get_all_controls(): + ctrl.chat_buttons_set_visible(active) gajim.config.set('compact_view', active) gajim.interface.save_config() @@ -663,7 +670,7 @@ helpers.update_optional_features() def apply_speller(self): - for ctrl in gajim.interface.msg_win_mgr.controls(): + for ctrl in self._get_all_controls(): if isinstance(ctrl, chat_control.ChatControlBase): try: spell_obj = gtkspell.get_from_text_view(ctrl.msg_textview) @@ -674,7 +681,7 @@ ctrl.set_speller() def remove_speller(self): - for ctrl in gajim.interface.msg_win_mgr.controls(): + for ctrl in self._get_all_controls(): if isinstance(ctrl, chat_control.ChatControlBase): try: spell_obj = gtkspell.get_from_text_view(ctrl.msg_textview) @@ -837,8 +844,8 @@ """ Update color tags in opened chat windows """ - for win in gajim.interface.msg_win_mgr.windows(): - win.update_tags() + for ctrl in self._get_all_controls(): + ctrl.update_tags() def on_preference_widget_color_set(self, widget, text): color = widget.get_color() @@ -860,8 +867,8 @@ """ Update text font in opened chat windows """ - for win in gajim.interface.msg_win_mgr.windows(): - win.update_font() + for ctrl in self._get_all_controls(): + ctrl.update_font() def on_incoming_nick_colorbutton_color_set(self, widget): self.on_preference_widget_color_set(widget, 'inmsgcolor') diff -r 7291d2dff27e -r 1d96df4d8e56 src/message_window.py --- a/src/message_window.py Mon Dec 28 21:52:45 2009 +0100 +++ b/src/message_window.py Mon Dec 28 22:41:05 2009 +0100 @@ -661,18 +661,6 @@ def get_origin(self): return self.window.window.get_origin() - def toggle_emoticons(self): - for ctrl in self.controls(): - ctrl.toggle_emoticons() - - def update_font(self): - for ctrl in self.controls(): - ctrl.update_font() - - def update_tags(self): - for ctrl in self.controls(): - ctrl.update_tags() - def get_control(self, key, acct): """ Return the MessageControl for jid or n, where n is a notebook page index.

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits December 2009