Commits February 2010

commits@gajim.org

4 participants
103 discussions

gajim: fix indentation and some pylint warning in roster_window.py
by Yann Leboulanger 17 Feb '10

17 Feb '10

changeset 22a03955065b in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=22a03955065b description: fix indentation and some pylint warning in roster_window.py diffstat: scripts/dev/run-pylint.py | 2 +- src/groupchat_control.py | 2 +- src/gtkgui_helpers.py | 2 +- src/gui_interface.py | 2 +- src/roster_window.py | 1139 ++++++++++++++++++++++++-------------------- 5 files changed, 623 insertions(+), 524 deletions(-) diffs (truncated from 2949 to 300 lines): diff -r 2dfa156a89c4 -r 22a03955065b scripts/dev/run-pylint.py --- a/scripts/dev/run-pylint.py Tue Feb 16 10:41:16 2010 +0100 +++ b/scripts/dev/run-pylint.py Wed Feb 17 11:32:55 2010 +0100 @@ -7,5 +7,5 @@ if os.getcwd().endswith('dev'): os.chdir('../../src/') # we were in scripts/dev -os.system("pylint --include-ids=y --additional-builtins='_' --disable-msg=C0103,C0111,W0703,W0511,W0142 --disable-checker=design " + "".join(sys.argv[1:])) +os.system("pylint --include-ids=y --additional-builtins='_' --disable-msg=C0103,C0111,W0703,W0511,W0142,W0613,R0201 --disable-checker=design " + "".join(sys.argv[1:])) diff -r 2dfa156a89c4 -r 22a03955065b src/groupchat_control.py --- a/src/groupchat_control.py Tue Feb 16 10:41:16 2010 +0100 +++ b/src/groupchat_control.py Wed Feb 17 11:32:55 2010 +0100 @@ -1125,7 +1125,7 @@ if status != '': status = helpers.reduce_chars_newlines(status, max_lines=1) # escape markup entities and make them small italic and fg color - color = gtkgui_helpers._get_fade_color(self.list_treeview, + color = gtkgui_helpers.get_fade_color(self.list_treeview, selected, focus) colorstring = "#%04x%04x%04x" % (color.red, color.green, color.blue) name += ('\n<span size="small" style="italic" foreground="%s">' diff -r 2dfa156a89c4 -r 22a03955065b src/gtkgui_helpers.py --- a/src/gtkgui_helpers.py Tue Feb 16 10:41:16 2010 +0100 +++ b/src/gtkgui_helpers.py Wed Feb 17 11:32:55 2010 +0100 @@ -561,7 +561,7 @@ hfile.Close() return False -def _get_fade_color(treeview, selected, focused): +def get_fade_color(treeview, selected, focused): """ Get a gdk color that is between foreground and background in 0.3 0.7 respectively colors of the cell for the given treeview diff -r 2dfa156a89c4 -r 22a03955065b src/gui_interface.py --- a/src/gui_interface.py Tue Feb 16 10:41:16 2010 +0100 +++ b/src/gui_interface.py Wed Feb 17 11:32:55 2010 +0100 @@ -2758,7 +2758,7 @@ ### Other Methods ################################################################################ - def _change_awn_icon_status(self, status): + def change_awn_icon_status(self, status): if not dbus_support.supported: # do nothing if user doesn't have D-Bus bindings return diff -r 2dfa156a89c4 -r 22a03955065b src/roster_window.py --- a/src/roster_window.py Tue Feb 16 10:41:16 2010 +0100 +++ b/src/roster_window.py Wed Feb 17 11:32:55 2010 +0100 @@ -72,17 +72,17 @@ #(icon, name, type, jid, account, editable, second pixbuf) ( - C_IMG, # image to show state (online, new message etc) - C_NAME, # cellrenderer text that holds contact nickame - C_TYPE, # account, group or contact? - C_JID, # the jid of the row - C_ACCOUNT, # cellrenderer text that holds account name - C_MOOD_PIXBUF, - C_ACTIVITY_PIXBUF, - C_TUNE_PIXBUF, - C_LOCATION_PIXBUF, - C_AVATAR_PIXBUF, # avatar_pixbuf - C_PADLOCK_PIXBUF, # use for account row only + C_IMG, # image to show state (online, new message etc) + C_NAME, # cellrenderer text that holds contact nickame + C_TYPE, # account, group or contact? + C_JID, # the jid of the row + C_ACCOUNT, # cellrenderer text that holds account name + C_MOOD_PIXBUF, + C_ACTIVITY_PIXBUF, + C_TUNE_PIXBUF, + C_LOCATION_PIXBUF, + C_AVATAR_PIXBUF, # avatar_pixbuf + C_PADLOCK_PIXBUF, # use for account row only ) = range(11) class RosterWindow: @@ -218,7 +218,8 @@ # It's the last one. # Go up if we are big brother parent_iter = model.iter_parent(contact_iter) - if parent_iter and model[parent_iter][C_TYPE] == 'contact': + if parent_iter and model[parent_iter][C_TYPE] == \ + 'contact': contact_iter = model.iter_next(parent_iter) else: # we tested all @@ -303,8 +304,8 @@ def add_account_contacts(self, account): """ - Add all contacts and groups of the given account to roster, draw them and - account + Add all contacts and groups of the given account to roster, draw them + and account """ self.starting = True jids = gajim.contacts.get_jid_list(account) @@ -357,9 +358,9 @@ contact.groups = big_brother_contact.get_shown_groups()[:] for child_iter in parent_iters: - it = self.model.append(child_iter, (None, contact.get_shown_name(), - 'contact', contact.jid, account, None, None, None, None, None, - None)) + it = self.model.append(child_iter, (None, + contact.get_shown_name(), 'contact', contact.jid, account, + None, None, None, None, None, None)) added_iters.append(it) else: # We are a normal contact. Add us to our groups. @@ -372,9 +373,10 @@ # Group is not yet in roster, add it! child_iterA = self._get_account_iter(account, self.model) child_iterG = self.model.append(child_iterA, - [gajim.interface.jabber_state_images['16']['closed'], - gobject.markup_escape_text(group), - 'group', group, account, None, None, None, None, None, None]) + [gajim.interface.jabber_state_images['16']['closed'], + gobject.markup_escape_text(group), + 'group', group, account, None, None, None, None, None, + None]) self.draw_group(group, account) if contact.is_transport(): @@ -400,7 +402,8 @@ if group not in gajim.groups[account]: gajim.groups[account][group] = {'expand': is_expanded} - assert len(added_iters), '%s has not been added to roster!' % contact.jid + assert len(added_iters), '%s has not been added to roster!' % \ + contact.jid return added_iters def _remove_entity(self, contact, account, groups=None): @@ -417,7 +420,8 @@ account -- the contacts account groups -- list of groups to remove the contact from. """ - iters = self._get_contact_iter(contact.jid, account, contact, self.model) + iters = self._get_contact_iter(contact.jid, account, contact, + self.model) assert iters, '%s shall be removed but is not in roster' % contact.jid parent_iter = self.model.iter_parent(iters[0]) @@ -543,29 +547,28 @@ ok = self._remove_entity(_contact, _account) assert ok, '%s was not removed' % _jid assert len(self._get_contact_iter(_jid, _account, _contact, - self.model)) == 0, '%s is removed but still in roster' % _jid + self.model)) == 0, '%s is removed but still in roster' % _jid if not family_in_roster: return False assert old_big_jid, 'No Big Brother in nearby family % (Family: %)' % \ - (nearby_family, family) + (nearby_family, family) iters = self._get_contact_iter(old_big_jid, old_big_account, - old_big_contact, self.model) + old_big_contact, self.model) assert len(iters) > 0, 'Old Big Brother %s is not in roster anymore' % \ - old_big_jid - assert not self.model.iter_children(iters[0]),\ - 'Old Big Brother %s still has children' % old_big_jid + old_big_jid + assert not self.model.iter_children(iters[0]), \ + 'Old Big Brother %s still has children' % old_big_jid ok = self._remove_entity(old_big_contact, old_big_account) assert ok, "Old Big Brother %s not removed" % old_big_jid assert len(self._get_contact_iter(old_big_jid, old_big_account, - old_big_contact, self.model)) == 0,\ - 'Old Big Brother %s is removed but still in roster' % old_big_jid + old_big_contact, self.model)) == 0, \ + 'Old Big Brother %s is removed but still in roster' % old_big_jid return True - def _recalibrate_metacontact_family(self, family, account): """ Regroup metacontact family if necessary @@ -573,11 +576,11 @@ brothers = [] nearby_family, big_brother_jid, big_brother_account = \ - self._get_nearby_family_and_big_brother(family, account) + self._get_nearby_family_and_big_brother(family, account) big_brother_contact = gajim.contacts.get_contact(big_brother_account, - big_brother_jid) - child_iters = self._get_contact_iter(big_brother_jid, big_brother_account, - model=self.model) + big_brother_jid) + child_iters = self._get_contact_iter(big_brother_jid, + big_brother_account, model=self.model) if child_iters: parent_iter = self.model.iter_parent(child_iters[0]) parent_type = self.model[parent_iter][C_TYPE] @@ -601,7 +604,8 @@ _account = child['account'] if _account == big_brother_account and _jid == big_brother_jid: continue - child_iters = self._get_contact_iter(_jid, _account, model=self.model) + child_iters = self._get_contact_iter(_jid, _account, + model=self.model) if not child_iters: continue parent_iter = self.model.iter_parent(child_iters[0]) @@ -625,13 +629,12 @@ jid = gajim.get_jid_from_account(account) contact = gajim.contacts.get_first_contact_from_jid(account, jid) - assert len(self._get_contact_iter(jid, account, contact, self.model)) == \ - 0, 'Self contact %s already in roster' % jid + assert len(self._get_contact_iter(jid, account, contact, + self.model)) == 0, 'Self contact %s already in roster' % jid child_iterA = self._get_account_iter(account, self.model) self.model.append(child_iterA, (None, gajim.nicks[account], - 'self_contact', jid, account, None, None, None, None, - None, None)) + 'self_contact', jid, account, None, None, None, None, None, None)) self.draw_completely(jid, account) self.draw_account(account) @@ -666,9 +669,9 @@ show_self_contact = gajim.config.get('show_self_contact') if show_self_contact == 'never': return - if (contact.resource != gajim.connections[account].server_resource and\ - show_self_contact == 'when_other_resource') or show_self_contact == \ - 'always': + if (contact.resource != gajim.connections[account].server_resource \ + and show_self_contact == 'when_other_resource') or \ + show_self_contact == 'always': return self._add_self_contact(account) return @@ -689,7 +692,7 @@ contacts = self._add_metacontact_family(family, account) else: # We are a normal contact - contacts = [(contact, account),] + contacts = [(contact, account), ] self._add_entity(contact, account) # Draw the contact and its groups contact @@ -746,18 +749,19 @@ else: self._remove_entity(contact, account) - if backend and (not gajim.interface.msg_win_mgr.get_control(jid, account)\ - or force): + if backend and (not gajim.interface.msg_win_mgr.get_control(jid, + account) or force): # If a window is still opened: don't remove contact instance # Remove contact before redrawing, otherwise the old # numbers will still be show gajim.contacts.remove_jid(account, jid, remove_meta=True) if iters: rest_of_family = [data for data in family - if account != data['account'] or jid != data['jid']] + if account != data['account'] or jid != data['jid']] if rest_of_family: # reshow the rest of the family - brothers = self._add_metacontact_family(rest_of_family, account) + brothers = self._add_metacontact_family(rest_of_family, + account) for c, acc in brothers: self.draw_completely(c.jid, acc) @@ -798,7 +802,8 @@ status = '' if contact is None: - gc_control = gajim.interface.msg_win_mgr.get_gc_control(jid, account) + gc_control = gajim.interface.msg_win_mgr.get_gc_control(jid, + account) if gc_control: # there is a window that we can minimize gajim.interface.minimized_controls[account][jid] = gc_control @@ -808,9 +813,9 @@ else: name = jid.split('@')[0] # New groupchat - #GCMIN - contact = gajim.contacts.create_contact(jid=jid, account=account, name=name, - groups=[_('Groupchats')], show=show, status=status, sub='none') + contact = gajim.contacts.create_contact(jid=jid, account=account, + name=name, groups=[_('Groupchats')], show=show, status=status, + sub='none') gajim.contacts.add_contact(account, contact) self.add_contact(jid, account) else: @@ -847,10 +852,9 @@ """ contact = gajim.contacts.get_contact_with_highest_priority(account, jid) if contact is None:

1 0

gajim: prevent traceback when destroy handler already clean self...
by Yann Leboulanger 16 Feb '10

16 Feb '10

changeset 2dfa156a89c4 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=2dfa156a89c4 description: prevent traceback when destroy handler already clean self.instances[account]['online_dialog'] dict. Fixes #5604 diffstat: src/gui_interface.py | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diffs (14 lines): diff -r 3b778de58d07 -r 2dfa156a89c4 src/gui_interface.py --- a/src/gui_interface.py Tue Feb 16 09:44:23 2010 +0100 +++ b/src/gui_interface.py Tue Feb 16 10:41:16 2010 +0100 @@ -214,7 +214,9 @@ # .keys() is needed to not have a dictionary length changed # during iteration error self.instances[account]['online_dialog'][name].destroy() - del self.instances[account]['online_dialog'][name] + if name in self.instances[account]['online_dialog']: + # destroy handler may have already removed it + del self.instances[account]['online_dialog'][name] for request in self.gpg_passphrase.values(): if request: request.interrupt()

1 0

gajim: move some error/warning to info so it's not printed in st...
by Yann Leboulanger 16 Feb '10

16 Feb '10

changeset 3b778de58d07 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=3b778de58d07 description: move some error/warning to info so it's not printed in stderr by default. Fixes #5609 diffstat: src/common/xmpp/auth_nb.py | 20 ++++++++++---------- src/common/xmpp/client_nb.py | 4 ++-- src/common/xmpp/transports_nb.py | 4 ++-- 3 files changed, 14 insertions(+), 14 deletions(-) diffs (130 lines): diff -r 767e7d67db21 -r 3b778de58d07 src/common/xmpp/auth_nb.py --- a/src/common/xmpp/auth_nb.py Tue Feb 16 09:27:19 2010 +0100 +++ b/src/common/xmpp/auth_nb.py Tue Feb 16 09:44:23 2010 +0100 @@ -187,7 +187,7 @@ """ if not feats.getTag('mechanisms', namespace=NS_SASL): self.startsasl='not-supported' - log.error('SASL not supported by server') + log.info('SASL not supported by server') return self.mecs = [] for mec in feats.getTag('mechanisms', namespace=NS_SASL).getTags( @@ -245,7 +245,7 @@ self.startsasl = SASL_IN_PROCESS raise NodeProcessed self.startsasl = SASL_FAILURE - log.error('I can only use EXTERNAL, DIGEST-MD5, GSSAPI and PLAIN ' + log.info('I can only use EXTERNAL, DIGEST-MD5, GSSAPI and PLAIN ' 'mecanisms.') if self.on_sasl: self.on_sasl() @@ -264,7 +264,7 @@ reason = challenge.getChildren()[0] except Exception: reason = challenge - log.error('Failed SASL authentification: %s' % reason) + log.info('Failed SASL authentification: %s' % reason) if len(self.mecs) > 0: # There are other mechanisms to test self.MechanismHandler() @@ -340,7 +340,7 @@ self._owner.send(str(Node('response', attrs={'xmlns':NS_SASL}))) else: self.startsasl = SASL_FAILURE - log.error('Failed SASL authentification: unknown challenge') + log.info('Failed SASL authentification: unknown challenge') if self.on_sasl: self.on_sasl() raise NodeProcessed @@ -419,7 +419,7 @@ def _on_username(self, resp): if not isResultNode(resp): - log.error('No result node arrived! Aborting...') + log.info('No result node arrived! Aborting...') return self.on_auth(None) iq=Iq(typ='set', node=resp) @@ -450,7 +450,7 @@ query.setTagData('hash', hash_) self._method='0k' else: - log.warn("Sequre methods unsupported, performing plain text \ + log.warn("Secure methods unsupported, performing plain text \ authentication") query.setTagData('password', self.password) self._method = 'plain' @@ -464,7 +464,7 @@ self.owner._registered_name = self.owner.User+'@'+self.owner.Server+\ '/'+self.owner.Resource return self.on_auth(self._method) - log.error('Authentication failed!') + log.info('Authentication failed!') return self.on_auth(None) @@ -496,7 +496,7 @@ attributes accordingly """ if not feats.getTag('bind', namespace=NS_BIND): - log.error('Server does not requested binding.') + log.info('Server does not requested binding.') # we try to bind resource anyway #self.bound='failure' self.bound = [] @@ -548,10 +548,10 @@ func=self._on_session) return if resp: - log.error('Binding failed: %s.' % resp.getTag('error')) + log.info('Binding failed: %s.' % resp.getTag('error')) self.on_bound(None) else: - log.error('Binding failed: timeout expired.') + log.info('Binding failed: timeout expired.') self.on_bound(None) def _on_session(self, resp): diff -r 767e7d67db21 -r 3b778de58d07 src/common/xmpp/client_nb.py --- a/src/common/xmpp/client_nb.py Tue Feb 16 09:27:19 2010 +0100 +++ b/src/common/xmpp/client_nb.py Tue Feb 16 09:44:23 2010 +0100 @@ -372,7 +372,7 @@ # try to negotiate TLS if self.incoming_stream_version() != '1.0': # if stream version is less than 1.0, we can't do more - log.warn('While connecting with type = "tls": stream version ' + + log.info('While connecting with type = "tls": stream version ' + 'is less than 1.0') self._on_connect() return @@ -382,7 +382,7 @@ log.info('TLS supported by remote server. Requesting TLS start.') self._tls_negotiation_handler() else: - log.warn('While connecting with type = "tls": TLS unsupported ' + + log.info('While connecting with type = "tls": TLS unsupported ' + 'by remote server') self._on_connect() diff -r 767e7d67db21 -r 3b778de58d07 src/common/xmpp/transports_nb.py --- a/src/common/xmpp/transports_nb.py Tue Feb 16 09:27:19 2010 +0100 +++ b/src/common/xmpp/transports_nb.py Tue Feb 16 09:44:23 2010 +0100 @@ -223,7 +223,7 @@ if hasattr(self, '_owner') and hasattr(self._owner, 'Dispatcher'): self.on_receive = self._owner.Dispatcher.ProcessNonBlocking else: - log.warning('No Dispatcher plugged. Received data will not be processed') + log.warn('No Dispatcher plugged. Received data will not be processed') self.on_receive = None return self.on_receive = recv_handler @@ -453,7 +453,7 @@ self._sock.shutdown(socket.SHUT_RDWR) self._sock.close() except socket.error, (errnum, errstr): - log.error('Error while disconnecting socket: %s' % errstr) + log.info('Error while disconnecting socket: %s' % errstr) self.fd = -1 NonBlockingTransport.disconnect(self, do_callback)

1 0

gajim: don't fail to connect when no <stream:features> is sent b...
by Yann Leboulanger 16 Feb '10

16 Feb '10

changeset 767e7d67db21 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=767e7d67db21 description: don't fail to connect when no <stream:features> is sent by server. Fixes #5610 diffstat: src/common/connection_handlers.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r d430b5b7f668 -r 767e7d67db21 src/common/connection_handlers.py --- a/src/common/connection_handlers.py Mon Feb 15 20:10:07 2010 +0100 +++ b/src/common/connection_handlers.py Tue Feb 16 09:27:19 2010 +0100 @@ -639,7 +639,7 @@ # We can now continue connection by requesting the roster version = None - if con.Stream.features.getTag('ver', + if con.Stream.features and con.Stream.features.getTag('ver', namespace=common.xmpp.NS_ROSTER_VER): version = gajim.config.get_per('accounts', self.name, 'roster_version')

1 0

gajim: [Zash] hotkey for Enable checkbutton in XML Console. Fixe...
by Yann Leboulanger 15 Feb '10

15 Feb '10

changeset d430b5b7f668 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=d430b5b7f668 description: [Zash] hotkey for Enable checkbutton in XML Console. Fixes #5608 diffstat: data/gui/xml_console_window.ui | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 156370d12880 -r d430b5b7f668 data/gui/xml_console_window.ui --- a/data/gui/xml_console_window.ui Sun Feb 14 21:07:19 2010 +0100 +++ b/data/gui/xml_console_window.ui Mon Feb 15 20:10:07 2010 +0100 @@ -50,7 +50,7 @@ <property name="visible">True</property> <child> <object class="GtkCheckButton" id="enable_checkbutton"> - <property name="label" translatable="yes" comments="XML Console enable checkbutton">Enable</property> + <property name="label" translatable="yes" comments="XML Console enable checkbutton">_Enable</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property>

1 0

gajim: fix pep call
by Yann Leboulanger 14 Feb '10

14 Feb '10

changeset 0d988b14b888 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=0d988b14b888 description: fix pep call diffstat: src/common/connection_handlers.py | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diffs (21 lines): diff -r 914707905eb7 -r 0d988b14b888 src/common/connection_handlers.py --- a/src/common/connection_handlers.py Sun Feb 14 21:07:19 2010 +0100 +++ b/src/common/connection_handlers.py Sun Feb 14 23:12:45 2010 +0100 @@ -2157,13 +2157,13 @@ Send pep info that were waiting for connection """ if self.to_be_sent_activity: - pep.user_send_activity(*self.to_be_sent_activity) + pep.user_send_activity(self.name, *self.to_be_sent_activity) if self.to_be_sent_mood: - pep.user_send_mood(*self.to_be_sent_mood) + pep.user_send_mood(self.name, *self.to_be_sent_mood) if self.to_be_sent_tune: - pep.user_send_tune(*self.to_be_sent_tune) + pep.user_send_tune(self.name, *self.to_be_sent_tune) if self.to_be_sent_nick: - pep.user_send_nick(self.to_be_sent_nick) + pep.user_send_nick(self.name, self.to_be_sent_nick) self.reset_awaiting_pep() def _pubsubEventCB(self, con, msg):

1 0

gajim: process network events faster under windows so Gajim reac...
by Yann Leboulanger 14 Feb '10

14 Feb '10

changeset 914707905eb7 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=914707905eb7 description: process network events faster under windows so Gajim reacts faster. diffstat: src/common/xmpp/idlequeue.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r c5bd47402458 -r 914707905eb7 src/common/xmpp/idlequeue.py --- a/src/common/xmpp/idlequeue.py Fri Feb 12 22:35:07 2010 +0100 +++ b/src/common/xmpp/idlequeue.py Sun Feb 14 21:07:19 2010 +0100 @@ -198,7 +198,7 @@ ''' # (timeout, boolean) # Boolean is True if timeout is specified in seconds, False means miliseconds - PROCESS_TIMEOUT = (200, False) + PROCESS_TIMEOUT = (100, False) def __init__(self): self.queue = {}

1 0

gajim: improve bigger avatar behaviour in case on_avatar_eventbo...
by Yann Leboulanger 14 Feb '10

14 Feb '10

changeset c5bd47402458 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=c5bd47402458 description: improve bigger avatar behaviour in case on_avatar_eventbox_enter_notify_event is called twice (when using unclutter). Fixes #5590 diffstat: src/chat_control.py | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diffs (20 lines): diff -r 28ebc78e9cb2 -r c5bd47402458 src/chat_control.py --- a/src/chat_control.py Sun Feb 07 20:12:58 2010 +0100 +++ b/src/chat_control.py Fri Feb 12 22:35:07 2010 +0100 @@ -1513,6 +1513,8 @@ # do we have something bigger to show? if avatar_w > scaled_buf_w or avatar_h > scaled_buf_h: # wait for 0.5 sec in case we leave earlier + if self.show_bigger_avatar_timeout_id is not None: + gobject.source_remove(self.show_bigger_avatar_timeout_id) self.show_bigger_avatar_timeout_id = gobject.timeout_add(500, self.show_bigger_avatar, widget) @@ -1521,6 +1523,7 @@ # did we add a timeout? if yes remove it if self.show_bigger_avatar_timeout_id is not None: gobject.source_remove(self.show_bigger_avatar_timeout_id) + self.show_bigger_avatar_timeout_id = None def on_avatar_eventbox_button_press_event(self, widget, event): '''If right-clicked, show popup'''

1 0

gajim: [David Flatz] show transports even if show transports is ...
by Yann Leboulanger 14 Feb '10

14 Feb '10

changeset 28ebc78e9cb2 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=28ebc78e9cb2 description: [David Flatz] show transports even if show transports is false when they have unread events. Fixes #5591 diffstat: src/roster_window.py | 16 ++++++++++++++-- 1 files changed, 14 insertions(+), 2 deletions(-) diffs (34 lines): diff -r c2980a5b84ae -r 28ebc78e9cb2 src/roster_window.py --- a/src/roster_window.py Wed Feb 03 23:20:11 2010 +0100 +++ b/src/roster_window.py Sun Feb 07 20:12:58 2010 +0100 @@ -1565,6 +1565,15 @@ if type_ == 'group': group = jid if group == _('Transports'): + if self.regroup: + accounts = gajim.contacts.get_accounts() + else: + accounts = [account] + for _acc in accounts: + for contact in gajim.contacts.iter_contacts(_acc): + if group in contact.get_shown_groups() and \ + self.contact_has_pending_roster_events(contact, _acc): + return True return gajim.config.get('show_transports_group') and \ (gajim.account_is_connected(account) or \ gajim.config.get('showoffline')) @@ -1611,9 +1620,12 @@ jid) return self.contact_is_visible(contact, account) if type_ == 'agent': - return gajim.config.get('show_transports_group') and \ + contact = gajim.contacts.get_contact_with_highest_priority(account, + jid) + return self.contact_has_pending_roster_events(contact, account) or \ + (gajim.config.get('show_transports_group') and \ (gajim.account_is_connected(account) or \ - gajim.config.get('showoffline')) + gajim.config.get('showoffline'))) return True def _compareIters(self, model, iter1, iter2, data=None):

1 0

gajim: increase SRV answer timeout. Fixes #5466
by Yann Leboulanger 14 Feb '10

14 Feb '10

changeset c2980a5b84ae in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=c2980a5b84ae description: increase SRV answer timeout. Fixes #5466 diffstat: src/common/resolver.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 48d836612080 -r c2980a5b84ae src/common/resolver.py --- a/src/common/resolver.py Wed Feb 03 22:13:52 2010 +0100 +++ b/src/common/resolver.py Wed Feb 03 23:20:11 2010 +0100 @@ -274,7 +274,7 @@ ''' spawn new nslookup process and start waiting for results ''' ns = NsLookup(self._on_ready, host, type) ns.set_idlequeue(self.idlequeue) - ns.commandtimeout = 10 + ns.commandtimeout = 20 ns.start()

1 0

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

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits February 2010