Commits June 2008

commits@gajim.org

7 participants
141 discussions

[commit-gajim] r9740 - trunk/src
by asterix＠gajim.org 02 Jun '08

02 Jun '08

Author: asterix Date: 2008-06-02 12:23:27 +0200 (Mon, 02 Jun 2008) New Revision: 9740 Modified: trunk/src/roster_window.py Log: fix wrong syntax Modified: trunk/src/roster_window.py =================================================================== --- trunk/src/roster_window.py 2008-06-02 10:04:27 UTC (rev 9739) +++ trunk/src/roster_window.py 2008-06-02 10:23:27 UTC (rev 9740) @@ -550,13 +550,13 @@ 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]), + 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_contact, self.model)) == 0,\ 'Old Big Brother %s is removed but still in roster' % old_big_jid return True

1 0

[commit-gajim] r9739 - trunk/src
by asterix＠gajim.org 02 Jun '08

02 Jun '08

Author: asterix Date: 2008-06-02 12:04:27 +0200 (Mon, 02 Jun 2008) New Revision: 9739 Modified: trunk/src/roster_window.py Log: coding standards Modified: trunk/src/roster_window.py =================================================================== --- trunk/src/roster_window.py 2008-06-02 08:10:36 UTC (rev 9738) +++ trunk/src/roster_window.py 2008-06-02 10:04:27 UTC (rev 9739) @@ -63,7 +63,7 @@ if sys.platform == 'darwin': from osx import syncmenu - + #(icon, name, type, jid, account, editable, second pixbuf) ( C_IMG, # image to show state (online, new message etc) @@ -84,7 +84,7 @@ Keyword arguments: name -- the account name model -- the data model (default TreeFilterModel) - + ''' if not model: model = self.modelfilter @@ -109,7 +109,7 @@ account -- the account name account_iter -- the iter of the account the model (default None) model -- the data model (default TreeFilterModel) - + ''' if not model: model = self.modelfilter @@ -123,8 +123,8 @@ break group_iter = model.iter_next(group_iter) return group_iter - + def _get_self_contact_iter(self, jid, account, model = None): ''' Return the gtk.TreeIter of SelfContact or None if not found. @@ -132,14 +132,14 @@ jid -- the jid of SelfContact account -- the account of SelfContact model -- the data model (default TreeFilterModel) - + ''' - + if not model: model = self.modelfilter iterAcct = self._get_account_iter(account, model) iterC = model.iter_children(iterAcct) - + # There might be several SelfContacts in merged account view while iterC: if model[iterC][C_TYPE] != 'self_contact': @@ -159,7 +159,7 @@ account -- the account contact -- the contact (default None) model -- the data model (default TreeFilterModel) - + ''' if not model: model = self.modelfilter @@ -199,7 +199,7 @@ elif model.iter_has_child(contact_iter): # it's a big brother and has children contact_iter = model.iter_children(contact_iter) - else: + else: # try to find next contact: # other contact in this group or brother contact next_contact_iter = model.iter_next(contact_iter) @@ -214,14 +214,14 @@ # we tested all contacts in this group contact_iter = None return found - - + + def _iter_is_separator(self, model, titer): ''' Return True if the given iter is a separator. - + Keyword arguments: model -- the data model - iter -- the gtk.TreeIter to test + iter -- the gtk.TreeIter to test ''' if model[titer][0] == 'SEPARATOR': return True @@ -230,7 +230,7 @@ def _iter_contact_rows(self, model = None): '''Iterate over all contact rows in given model. - + Keyword argument model -- the data model (default TreeFilterModel) ''' @@ -246,35 +246,36 @@ contact_iter = model.iter_next(contact_iter) group_iter = model.iter_next(group_iter) account_iter = model.iter_next(account_iter) - - -############################################################################# + + +############################################################################# ### Methods for adding and removing roster window items ############################################################################# - + def add_account(self, account): '''Add account to roster and draw it. Do nothing if it is already in.''' if self._get_account_iter(account): - # Will happen on reconnect or for merged accounts + # Will happen on reconnect or for merged accounts return - + if self.regroup: # Merged accounts view show = helpers.get_global_show() - self.model.append(None, [gajim.interface.jabber_state_images['16'][show], - _('Merged accounts'), 'account', '', 'all', None, None]) + self.model.append(None, [gajim.interface.jabber_state_images['16'][ + show], _('Merged accounts'), 'account', '', 'all', None, None]) else: show = gajim.SHOW_LIST[gajim.connections[account].connected] our_jid = gajim.get_jid_from_account(account) tls_pixbuf = None if gajim.account_is_securely_connected(account): - tls_pixbuf = self.window.render_icon(gtk.STOCK_DIALOG_AUTHENTICATION, - gtk.ICON_SIZE_MENU) # the only way to create a pixbuf from stock + # the only way to create a pixbuf from stock + tls_pixbuf = self.window.render_icon( + gtk.STOCK_DIALOG_AUTHENTICATION, gtk.ICON_SIZE_MENU) - self.model.append(None, [gajim.interface.jabber_state_images['16'][show], - gobject.markup_escape_text(account), - 'account', our_jid, account, None, tls_pixbuf]) + self.model.append(None, [gajim.interface.jabber_state_images['16'][ + show], gobject.markup_escape_text(account), 'account', our_jid, + account, None, tls_pixbuf]) self.draw_account(account) @@ -286,7 +287,7 @@ c1 = time.clock() self.starting = True jids = gajim.contacts.get_jid_list(account) - + self.tree.freeze_child_notify() c5 = time.clock() for jid in jids: @@ -306,26 +307,26 @@ self.draw_account(account) self.starting = False c10 = time.clock() - + if jids: c4 = time.clock() - + print "" print "--- Add account contacts of %s ---------" % account - print "Total Time", c4-c1 - print "Add contact without draw", c6-c5 + print "Total Time", c4-c1 + print "Add contact without draw", c6-c5 print "Draw groups and account", c10-c9 print "--- contacts added -----------------------------" print "" - + def _add_entity(self, contact, account, groups = None, big_brother_contact = None, big_brother_account = None): '''Add the given contact to roster data model. - + Contact is added regardless if he is already in roster or not. Return list of newly added iters. - + Keyword arguments: contact -- the contact to add account -- the contacts account @@ -340,9 +341,9 @@ parent_iters = self._get_contact_iter(big_brother_contact.jid, big_brother_account, big_brother_contact, self.model) assert len(parent_iters) > 0,\ - "Big brother is not yet in roster!" + 'Big brother is not yet in roster!' - # Do not confuse get_contact_iter + # Do not confuse get_contact_iter # Sync groups of family members contact.groups = big_brother_contact.groups[:] @@ -359,7 +360,7 @@ if not groups: groups = [_('General')] for group in groups: - child_iterG = self._get_group_iter(group, account, model = self.model) + child_iterG = self._get_group_iter(group, account, model=self.model) if not child_iterG: # Group is not yet in roster, add it! child_iterA = self._get_account_iter(account, self.model) @@ -375,7 +376,7 @@ typestr = 'groupchat' else: typestr = 'contact' - + # we add some values here. see draw_contact for more i_ = self.model.append(child_iterG, (None, contact.get_shown_name(), typestr, contact.jid, account, None, None)) @@ -391,18 +392,17 @@ self.tree.expand_row(path, False) 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 - return added_iters - - + + assert len(added_iters), '%s has not been added to roster!' % contact.jid + return added_iters + def _remove_entity(self, contact, account, groups = None): '''Remove the given contact from roster data model. - + Empty groups after contact removal are removed too. Return False if contact still has children and deletion was not performed. Return True on success. - + Keyword arguments: contact -- the contact to add account -- the contacts account @@ -410,7 +410,7 @@ ''' iters = self._get_contact_iter(contact.jid, account, contact, self.model) - assert iters, "%s shall be removed but is not in roster" % contact.jid + assert iters, '%s shall be removed but is not in roster' % contact.jid parent_iter = self.model.iter_parent(iters[0]) parent_type = self.model[parent_iter][C_TYPE] @@ -418,9 +418,10 @@ if groups: # Only remove from specified groups all_iters = iters[:] - group_iters = [self._get_group_iter(group, account) for group in groups] - iters = [titer for titer in all_iters - if self.model.iter_parent(titer) in group_iters] + group_iters = [self._get_group_iter(group, account) for group in \ + groups] + iters = [titer for titer in all_iters + if self.model.iter_parent(titer) in group_iters] iter_children = self.model.iter_children(iters[0]) @@ -432,7 +433,7 @@ for i in iters: parent_i = self.model.iter_parent(i) if parent_type == 'group' and \ - self.model.iter_n_children(parent_i) == 1: + self.model.iter_n_children(parent_i) == 1: group = self.model[parent_i][C_JID].decode('utf-8') if gajim.groups[account].has_key(group): del gajim.groups[account][group] @@ -441,14 +442,13 @@ self.model.remove(i) return True - def _add_metacontact_family(self, family, account): '''Add the give Metacontact family to roster data model. - - Add Big Brother to his groups and all others under him. + + Add Big Brother to his groups and all others under him. Return list of all added (contact, account) tuples with Big Brother as first element. - + Keyword arguments: family -- the family, see Contacts.get_metacontacts_family() ''' @@ -458,10 +458,11 @@ nearby_family = family else: # we want one nearby_family per account - nearby_family = [data for data in family + nearby_family = [data for data in family if account == data['account']] - big_brother_data = gajim.contacts.get_metacontacts_big_brother(nearby_family) + big_brother_data = gajim.contacts.get_metacontacts_big_brother( + nearby_family) big_brother_jid = big_brother_data['jid'] big_brother_account = big_brother_data['account'] big_brother_contact = gajim.contacts.get_first_contact_from_jid( @@ -469,9 +470,10 @@ assert len(self._get_contact_iter(big_brother_jid, big_brother_account, big_brother_contact, self.model)) == 0,\ - "Big brother %s already in roster \n Family: %s" % (big_brother_jid, family) + 'Big brother %s already in roster \n Family: %s' % (big_brother_jid, + family) self._add_entity(big_brother_contact, big_brother_account) - + brothers = [] # Filter family members for data in nearby_family: @@ -485,20 +487,19 @@ if not _contact: # Corresponding account is not connected continue - + assert len(self._get_contact_iter(_jid, _account, _contact, self.model) ) == 0, "%s already in roster. \n Family: " % (_jid, nearby_family) - self._add_entity(_contact, _account, big_brother_contact = big_brother_contact, - big_brother_account = big_brother_account) + self._add_entity(_contact, _account, big_brother_contact = \ + big_brother_contact, big_brother_account=big_brother_account) brothers.append((_contact, _account)) brothers.insert(0, (big_brother_contact, big_brother_account)) return brothers - def _remove_metacontact_family(self, family, account): '''Remove the given Metacontact family from roster data model. - + See Contacts.get_metacontacts_family() and RosterWindow._remove_entity() ''' if self.regroup: @@ -506,30 +507,30 @@ nearby_family = family else: # remove nearby_family per account - nearby_family = [data for data in family + nearby_family = [data for data in family if account == data['account']] - # Family might has changed (actual big brother not on top). + # Family might has changed (actual big brother not on top). # Remove childs first then big brother family_in_roster = False for data in nearby_family: _account = data['account'] _jid = data['jid'] _contact = gajim.contacts.get_first_contact_from_jid(_account, _jid) - + iters = self._get_contact_iter(_jid, _account, _contact, self.model) if not iters or not _contact: # Family might not be up to date. # Only try to remove what is actually in the roster continue - assert iters, "%s shall be removed but is not in roster \ - \n Family: %s" % (_jid, family) + assert iters, '%s shall be removed but is not in roster \ + \n Family: %s' % (_jid, family) family_in_roster = True parent_iter = self.model.iter_parent(iters[0]) parent_type = self.model[parent_iter][C_TYPE] - + if parent_type != 'contact': # The contact on top old_big_account = _account @@ -538,64 +539,64 @@ continue 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 - + 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 + if not family_in_roster: return False - iters = self._get_contact_iter(old_big_jid, old_big_account, 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 - + iters = self._get_contact_iter(old_big_jid, old_big_account, + 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 + 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 - + 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 + return True - - + def _add_self_contact(self, account): '''Add account's SelfContact to roster and draw it and the account. - + Return the SelfContact contact instance ''' 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)) - + self.draw_contact(jid, account) self.draw_avatar(jid, account) self.draw_account(account) return contact - - + + def add_contact(self, jid, account): '''Add contact to roster and draw him. - + Add contact to all its group and redraw the groups, the contact and the account. If it's a Metacontact, add and draw the whole family. - Do nothing if the contact is already in roster. - - Return the added contact instance. If it is a Metacontact return + Do nothing if the contact is already in roster. + + Return the added contact instance. If it is a Metacontact return Big Brother. - + Keyword arguments: jid -- the contact's jid or SelfJid to add SelfContact account -- the corresponding account. - + ''' contact = gajim.contacts.get_contact_with_highest_priority(account, jid) if len(self._get_contact_iter(jid, account, contact, self.model)): @@ -606,14 +607,14 @@ if contact.resource != gajim.connections[account].server_resource: return self._add_self_contact(account) return - + is_observer = contact.is_observer() if is_observer: # if he has a tag, remove it tag = gajim.contacts.get_metacontacts_tag(account, jid) if tag: gajim.contacts.remove_metacontact(account, jid) - + # Add contact to roster family = gajim.contacts.get_metacontacts_family(account, jid) contacts = [] @@ -648,18 +649,19 @@ def remove_contact(self, jid, account, force = False, backend = False): '''Remove contact from roster. - - Remove contact from all its group. Remove empty groups or redraw otherwise. + + Remove contact from all its group. Remove empty groups or redraw + otherwise. Draw the account. If it's a Metacontact, remove the whole family. - Do nothing if the contact is not in roster. - + Do nothing if the contact is not in roster. + Keyword arguments: jid -- the contact's jid or SelfJid to remove SelfContact account -- the corresponding account. force -- remove contact even it has pending evens (Default False) backend -- also remove contact instance (Default False) - + ''' contact = gajim.contacts.get_contact_with_highest_priority(account, jid) @@ -680,7 +682,7 @@ if family: # We have a family. So we are a metacontact. self._remove_metacontact_family(family, account) - else: + else: self._remove_entity(contact, account) # Draw all groups of the contact @@ -690,7 +692,7 @@ if not groups: groups = [_('General')] - if backend: + if backend: # Remove contact before redrawing, otherwise the old # numbers will still be show gajim.contacts.remove_jid(account, jid) @@ -714,31 +716,30 @@ gajim.contacts.add_contact(account, contact) self.add_contact(jid, account) else: - contact.show = 'online' - self.draw_contact(jid, account) + contact.show = 'online' + self.draw_contact(jid, account) return contact - + def remove_groupchat(self, jid, account): '''Remove groupchat from roster and redraw account and group.''' contact = gajim.contacts.get_contact_with_highest_priority(account, jid) self.remove_contact(jid, account, force = True, backend = True) return True - + # TODO: This function is yet unused! Port to new API def add_transport(self, jid, account): '''Add transport to roster and draw it. Return the added contact instance.''' contact = gajim.contacts.get_contact_with_highest_priority(account, jid) - if contact is None: + if contact is None: contact = gajim.contacts.create_contact(jid = jid, name = jid, - groups = [_('Transports')], show = 'offline', + groups = [_('Transports')], show = 'offline', status = 'offline', sub = 'from') gajim.contacts.add_contact(account, contact) self.add_contact(jid, account) return contact - def remove_transport(self, jid, account): '''Remove transport from roster and redraw account and group.''' @@ -746,7 +747,7 @@ self.remove_contact(jid, account, force = True, backend = True) return True - #FIXME: + #FIXME: # We need to define a generic way to keep contacts in roster # as long as they have pending events or as we # still chat with them @@ -759,7 +760,8 @@ # Close chat window msg_win = gajim.interface.msg_win_mgr.get_window(contact.jid, account) - for ctrl in gajim.interface.msg_win_mgr.get_chat_controls(contact.jid, account): + for ctrl in gajim.interface.msg_win_mgr.get_chat_controls( + contact.jid, account): msg_win.remove_tab(ctrl, msg_win.CLOSE_CLOSE_BUTTON) else: need_readd = True @@ -773,19 +775,19 @@ def add_contact_to_groups(self, jid, account, groups): - '''Add contact to given groups and redraw them. - + '''Add contact to given groups and redraw them. + Contact on server is updated too. When the contact has a family, the action will be performed for all members. - + Keyword Arguments: jid -- the jid account -- the corresponding account groups -- list of Groups to add the contact to. - + ''' self.remove_contact(jid, account, force = True) - + for contact in gajim.contacts.get_contacts(account, jid): for group in groups: if group not in contact.groups: @@ -801,16 +803,16 @@ # self._adjust_group_expand_collapse_state(group, account) def remove_contact_from_groups(self, jid, account, groups): - '''Remove contact from given groups and redraw them. - + '''Remove contact from given groups and redraw them. + Contact on server is updated too. When the contact has a family, the action will be performed for all members. - + Keyword Arguments: jid -- the jid account -- the corresponding account groups -- list of Groups to remove the contact from - + ''' self.remove_contact(jid, account, force = True) @@ -821,13 +823,13 @@ contact.groups.remove(group) gajim.connections[account].update_contact(jid, contact.name, contact.groups) - + self.add_contact(jid, account) for group in groups: self.draw_group(group, account) - - # FIXME: maybe move to gajim.py + + # FIXME: maybe move to gajim.py def remove_newly_added(self, jid, account): if jid in gajim.newly_added[account]: gajim.newly_added[account].remove(jid) @@ -843,7 +845,7 @@ if jid in gajim.to_be_removed[account]: gajim.to_be_removed[account].remove(jid) self.draw_contact(jid, account) - + #FIXME: integrate into add_contact() def add_to_not_in_the_roster(self, account, jid, nick = '', resource = ''): keyID = '' @@ -857,11 +859,11 @@ gajim.contacts.add_contact(account, contact) self.add_contact(contact.jid, account) return contact - - -################################################################################ + + +################################################################################ ### Methods for adding and removing roster window items -################################################################################ +################################################################################ def draw_account(self, account): child_iter = self._get_account_iter(account, self.model) @@ -871,7 +873,7 @@ num_of_accounts = gajim.get_number_of_connected_accounts() num_of_secured = gajim.get_number_of_securely_connected_accounts() - + if gajim.account_is_securely_connected(account) and not self.regroup or \ self.regroup and num_of_secured and num_of_secured == num_of_accounts: tls_pixbuf = self.window.render_icon(gtk.STOCK_DIALOG_AUTHENTICATION, @@ -901,7 +903,7 @@ self.model[child_iter][C_NAME] = account_name return False - + def draw_group(self, group, account): child_iter = self._get_group_iter(group, account, model = self.model) if not child_iter: @@ -919,10 +921,10 @@ nbr_on, nbr_total = gajim.contacts.get_nb_online_total_contacts( accounts = accounts, groups = [group]) text += ' (%s/%s)' % (repr(nbr_on), repr(nbr_total)) - + self.model[child_iter][C_NAME] = gobject.markup_escape_text(text) return False - + def draw_parent_contact(self, jid, account): child_iters = self._get_contact_iter(jid, account, self.model) if not child_iters: @@ -935,7 +937,7 @@ parent_account = self.model[parent_iter][C_ACCOUNT].decode('utf-8') self.draw_contact(parent_jid, parent_account) return False - + def draw_contact(self, jid, account, selected = False, focus = False): '''draw the correct state image, name BUT not avatar''' # focus is about if the roster window has toplevel-focus or not @@ -945,7 +947,7 @@ child_iters = self._get_contact_iter(jid, account, contact, self.model) if not child_iters: - return False + return False name = gobject.markup_escape_text(contact.get_shown_name()) @@ -966,7 +968,7 @@ name = '%s *' % name elif nb_unread > 1: name = '%s [%s]' % (name, str(nb_unread)) - + # Strike name if blocked strike = False if jid in gajim.connections[account].blocked_contacts: @@ -1020,7 +1022,7 @@ name += \ '\n<span size="small" style="italic" foreground="%s">%s</span>' \ % (colorstring, gobject.markup_escape_text(status)) - + # Check if our metacontacts family has changed brothers = [] family = gajim.contacts.get_metacontacts_family(account, jid) @@ -1031,10 +1033,11 @@ nearby_family = family else: # we want one nearby_family per account - nearby_family = [data for data in family + nearby_family = [data for data in family if account == data['account']] - big_brother_data = gajim.contacts.get_metacontacts_big_brother(nearby_family) + big_brother_data = gajim.contacts.get_metacontacts_big_brother( + nearby_family) big_brother_jid = big_brother_data['jid'] big_brother_account = big_brother_data['account'] @@ -1213,7 +1216,7 @@ def _idle_draw_jids_of_account(self, jids, account): '''Draw given contacts and their avatars in a lazy fashion. - + Keyword arguments: jids -- a list of jids to draw account -- the corresponding account @@ -1227,11 +1230,11 @@ print "Draw contact and avatar", time.clock() - t print "-------------------------------" yield False - + t = time.clock() task = _draw_all_contacts(jids, account, t) gobject.idle_add(task.next) - + def setup_and_draw_roster(self): '''create new empty model and draw roster''' #(icon, name, type, jid, account, editable, avatar_pixbuf, padlock_pixbuf) @@ -1251,8 +1254,8 @@ self.add_account_contacts(acct) # Recalculate column width for ellipsizing self.tree.columns_autosize() - - + + def select_contact(self, jid, account): '''Select contact in roster. If contact is hidden but has events, show him.''' @@ -1301,21 +1304,21 @@ ############################################################################## ### Roster and Modelfilter handling -############################################################################## - +############################################################################## + def _search_roster_func(self, model, column, key, titer): if model[titer][C_NAME].decode('utf-8').lower().startswith( gobject.markup_escape_text(key.lower())): return False return True - + def refilter_shown_roster_items(self): self.filtering = True self.modelfilter.refilter() - self.filtering = False - + self.filtering = False + def contact_has_pending_roster_events(self, contact, account): - ''' Return True if the contact or one if it resources has pending events''' + '''Return True if the contact or one if it resources has pending events''' # jid has pending events if gajim.events.get_nb_roster_events(account, contact.jid) > 0: return True @@ -1339,10 +1342,10 @@ if contact.jid in gajim.to_be_removed[account]: return True return False - return True - + return True + def _visible_func(self, model, titer): - '''Determine whether iter should be visible in the treeview''' + '''Determine whether iter should be visible in the treeview''' type_ = model[titer][C_TYPE] if not type_: return False @@ -1492,7 +1495,7 @@ return 0 ################################################################################ -### FIXME: Methods that don't belong to roster window... +### FIXME: Methods that don't belong to roster window... ### ... atleast not in there current form ################################################################################ @@ -1514,8 +1517,8 @@ elif (time.time() - result[2]) > 2592000: # ok, here we see that we have a message in unread messages table - # that is older than a month. It is probably from someone not in our - # roster for accounts we usually launch, so we will delete this id + # that is older than a month. It is probably from someone not in our + # roster for accounts we usually launch, so we will delete this id # from unread message tables. gajim.logger.set_read_messages([result[0]]) @@ -1578,7 +1581,8 @@ # If we already have chat windows opened, update them with new contact # instance - for chat_control in gajim.interface.msg_win_mgr.get_chat_controls(ji, account): + for chat_control in gajim.interface.msg_win_mgr.get_chat_controls(ji, + account): chat_control.contact = contact1 def _change_awn_icon_status(self, status): @@ -1646,7 +1650,7 @@ def connected_rooms(self, account): if account in gajim.gc_connected[account].values(): return True - return False + return False def auto_join_bookmarks(self, account): '''autojoin bookmarks that have 'auto join' on for this account''' @@ -1659,14 +1663,15 @@ minimize = bm['minimize'] in ('1', 'true') gajim.interface.join_gc_room(account, jid, bm['nick'], bm['password'], minimize = minimize) - + def on_event_removed(self, event_list): - '''Remove contacts on last events removed. + '''Remove contacts on last events removed. 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 event_list) + contact_list = ((event.jid.split('/')[0], event.account) for event in \ + event_list) for jid, account in contact_list: self.draw_contact(jid, account) @@ -1677,7 +1682,7 @@ # Remove contact will delay removal if there are more events pending self.remove_contact(jid, account, backend = True) self.show_title() - + def open_event(self, account, jid, event): '''If an event was handled, return True, else return False''' data = event.parameters @@ -1711,7 +1716,7 @@ dialogs.InvitationReceivedDialog(account, data[0], jid, data[2], data[1]) gajim.events.remove_events(account, jid, event) - return True + return True return False ################################################################################ @@ -1724,7 +1729,7 @@ else: self.xml.get_widget('roster_vbox2').hide() - + def show_tooltip(self, contact): pointer = self.tree.get_pointer() props = self.tree.get_path_at_pos(pointer[0], pointer[1]) @@ -1800,15 +1805,16 @@ text = _('Enter your password for account %s') % account if passwords.USER_HAS_GNOMEKEYRING and \ not passwords.USER_USES_GNOMEKEYRING: - text += '\n' + _('Gnome Keyring is installed but not correctly started\ - (environment variable probably not correctly set)') + text += '\n' + _('Gnome Keyring is installed but not \ + correctly started (environment variable probably not \ + correctly set)') w = dialogs.PassphraseDialog(_('Password Required'), text, _('Save password')) passphrase, save = w.run() if passphrase == -1: if child_iterA: - self.model[child_iterA][0] = gajim.interface.jabber_state_images[ - '16']['offline'] + self.model[child_iterA][0] = \ + gajim.interface.jabber_state_images['16']['offline'] if gajim.interface.systray_enabled: gajim.interface.systray.change_status('offline') self.update_status_combobox() @@ -1838,10 +1844,10 @@ while ctx is not None: if ctx.msgstate == gajim.otr_module.OTRL_MSGSTATE_ENCRYPTED: disconnected = True - gajim.otr_module.otrl_message_disconnect(gajim.connections[account].otr_userstates, - (gajim.otr_ui_ops, - {'account':account,'urgent':True}), ctx.accountname, - ctx.protocol, ctx.username) + gajim.otr_module.otrl_message_disconnect(gajim.connections[ + account].otr_userstates, (gajim.otr_ui_ops, + {'account': account,'urgent': True}), ctx.accountname, + ctx.protocol, ctx.username) ctx = ctx.next if to: gajim.connections[account].send_custom_status(status, txt, to) @@ -1893,7 +1899,8 @@ win.redraw_tab(ctrl) gajim.contacts.remove_contact(account, contact) - elif contact.jid == gajim.get_jid_from_account(account) and show == 'offline': + elif contact.jid == gajim.get_jid_from_account(account) and \ + show == 'offline': # Our SelfContact went offline. Remove him self.remove_contact(contact.jid, account) @@ -1956,8 +1963,8 @@ # Force the rebuild now since the on_activates on the menu itself does # not work with the os/x top level menubar if sys.platform == 'darwin': - self.make_menu(force = True) - + self.make_menu(force = True) + def get_status_message(self, show): if show in gajim.config.get_per('defaultstatusmsg'): if gajim.config.get_per('defaultstatusmsg', show, 'enabled'): @@ -1970,7 +1977,7 @@ dlg.window.present() # show it on current workspace message = dlg.run() return message - + def change_status(self, widget, account, status): def change(account, status): message = self.get_status_message(status) @@ -1987,7 +1994,7 @@ on_response_ok = (change, account, status)) else: change(account, status) - + def update_status_combobox(self): # table to change index in connection.connected to index in combobox table = {'offline':9, 'connecting':9, 'online':0, 'chat':1, 'away':2, @@ -2025,13 +2032,13 @@ prio = u.priority show = u.show return show - + def on_message_window_delete(self, win_mgr, msg_win): if gajim.config.get('one_message_window') == 'always_with_roster': self.show_roster_vbox(True) gtkgui_helpers.resize_window(self.window, gajim.config.get('roster_width'), - gajim.config.get('roster_height')) + gajim.config.get('roster_height')) def close_all_from_dict(self, dic): '''close all the windows in the given dictionary''' @@ -2204,7 +2211,7 @@ helpers.exec_command('python history_manager.py') else: # Unix user helpers.exec_command('python history_manager.py &') - + def on_info(self, widget, contact, account): '''Call vcard_information_window class to display contact's information''' if gajim.connections[account].is_zeroconf: @@ -2663,7 +2670,8 @@ keyID = keyID[0] keys[contact.jid] = keyID - for ctrl in gajim.interface.msg_win_mgr.get_chat_controls(contact.jid, account): + for ctrl in gajim.interface.msg_win_mgr.get_chat_controls(contact.jid, + account): ctrl.update_ui() keys_str = '' for jid in keys: @@ -2795,7 +2803,7 @@ if resource: # we MUST have one contact only in list_ contact_jid += '/' + resource gajim.connections[room_account].send_invite(room_jid, contact_jid) - + def on_all_groupchat_maximized(self, widget, group_list): for (contact, account) in group_list: self.on_groupchat_maximized(widget, contact.jid, account) @@ -2803,7 +2811,8 @@ def on_groupchat_maximized(self, widget, jid, account): '''When a groupchat is maximised''' ctrl = gajim.interface.minimized_controls[account][jid] - mw = gajim.interface.msg_win_mgr.get_window(ctrl.contact.jid, ctrl.account) + mw = gajim.interface.msg_win_mgr.get_window(ctrl.contact.jid, + ctrl.account) if not mw: mw = gajim.interface.msg_win_mgr.create_window(ctrl.contact, ctrl.account, ctrl.type_id) @@ -3055,7 +3064,7 @@ jids dialogs.ConfirmationDialog(pritext, sectext, on_response_ok = (on_ok2, list_)) - + def on_send_custom_status(self, widget, contact_list, show, group=None): '''send custom status''' dlg = dialogs.ChangeStatusMessageDialog(show) @@ -3094,7 +3103,8 @@ return status = model[active][2].decode('utf-8') statuses_unified = helpers.statuses_unified() # status "desync'ed" or not - if (active == 7 and statuses_unified) or (active == 9 and not statuses_unified): + if (active == 7 and statuses_unified) or (active == 9 and \ + not statuses_unified): # 'Change status message' selected: # do not change show, just show change status dialog status = model[self.previous_status_combobox_active][2].decode('utf-8') @@ -3408,7 +3418,7 @@ for group in gajim.groups[account]: if gajim.groups[account][group]['expand']: titer = self._get_group_iter(group, account) - if titer: + if titer: path = model.get_path(titer) self.tree.expand_row(path, False) elif type_ == 'contact': @@ -3418,7 +3428,7 @@ self.draw_contact(jid, account) self._toggeling_row = False - + def on_roster_treeview_row_collapsed(self, widget, titer, path): '''When a row is collapsed change the icon of the arrow''' self._toggeling_row = True @@ -3430,7 +3440,7 @@ accounts = gajim.connections.keys() else: accounts = [model[titer][C_ACCOUNT].decode('utf-8')] - + type_ = model[titer][C_TYPE] if type_ == 'group': child_model[child_iter][C_IMG] = gajim.interface.jabber_state_images[ @@ -3451,7 +3461,7 @@ jid = model[titer][C_JID].decode('utf-8') account = model[titer][C_ACCOUNT].decode('utf-8') self.draw_contact(jid, account) - + self._toggeling_row = False def on_modelfilter_row_has_child_toggled(self, model, path, titer): @@ -3462,14 +3472,14 @@ if self._toggeling_row: # Signal is emitted when we write to our model return - + type_ = model[titer][C_TYPE] account = model[titer][C_ACCOUNT] if not account: return account = account.decode('utf-8') - + if type_ == 'contact': child_iter = model.convert_iter_to_child_iter(titer) if self.model.iter_has_child(child_iter): @@ -3493,7 +3503,7 @@ ''' # Selection can change when the model is filtered # Only write to the model when filtering is finished! - + # FIXME: When we are filtering our custom colors are somehow lost model, list_of_paths = selection.get_selected_rows() @@ -3512,7 +3522,7 @@ jid = row[C_JID].decode('utf-8') account = row[C_ACCOUNT].decode('utf-8') self._last_selected_contact.append((jid, account)) - gobject.idle_add(self.draw_contact, jid, account, True) + gobject.idle_add(self.draw_contact, jid, account, True) def on_service_disco_menuitem_activate(self, widget, account): server_jid = gajim.config.get_per('accounts', account, 'hostname') @@ -3534,9 +3544,9 @@ if gajim.config.get('showoffline'): # We need to filter twice to show groups with no contacts inside # in the correct expand state - self.refilter_shown_roster_items() - + self.refilter_shown_roster_items() + def on_view_menu_activate(self, widget): # Hide the show roster menu if we are not in the right windowing mode. if self.hpaned.get_child2() is not None: @@ -3548,8 +3558,8 @@ # when num controls is 0 this menuitem is hidden, but still need to # disable keybinding if self.hpaned.get_child2() is not None: - self.show_roster_vbox(widget.get_active()) - + self.show_roster_vbox(widget.get_active()) + ################################################################################ ### Drag and Drop handling ################################################################################ @@ -3586,7 +3596,7 @@ gajim.config.set('confirm_metacontacts', 'no') else: gajim.config.set('confirm_metacontacts', 'yes') - + # We might have dropped on a metacontact. # Remove it and readd later with updated family info dest_family = gajim.contacts.get_metacontacts_family(account_dest, @@ -3600,11 +3610,11 @@ c_source.jid) old_groups = c_source.groups - # Remove old source contact(s) + # Remove old source contact(s) if was_big_brother: # We have got little brothers. Readd them all self._remove_metacontact_family(old_family, account_source) - else: + else: # We are only a litle brother. Simply remove us from our big brother if self._get_contact_iter(c_source.jid, account_source): # When we have been in the group before. @@ -3616,7 +3626,7 @@ own_data['account'] = account_source # Don't touch the rest of the family old_family = [own_data] - + # Apply new tag and update contact for data in old_family: if account_source != data['account'] and not self.regroup: @@ -3636,7 +3646,7 @@ new_family = gajim.contacts.get_metacontacts_family(account_source, c_source.jid) brothers = self._add_metacontact_family(new_family, account_source) - + for c, acc in brothers: self.draw_contact(c.jid, acc) self.draw_avatar(c.jid, acc) @@ -3644,7 +3654,7 @@ old_groups.extend(c_dest.groups) for g in old_groups: self.draw_group(g, account_source) - + self.draw_account(account_source) context.finish(True, True, etime) @@ -3661,16 +3671,17 @@ _('Do _not ask me again'), on_response_ok = merge_contacts) if not confirm_metacontacts: # First time we see this window dlg.checkbutton.set_active(True) - - def on_drop_in_group(self, widget, account, c_source, grp_dest, is_big_brother, - context, etime, grp_source = None): + + def on_drop_in_group(self, widget, account, c_source, grp_dest, + is_big_brother, context, etime, grp_source = None): if is_big_brother: # add whole metacontact to new group self.add_contact_to_groups(c_source.jid, account, [grp_dest,]) - # remove afterwards so the contact is not moved to General in the meantime + # remove afterwards so the contact is not moved to General in the + # meantime if grp_dest != grp_source: - self.remove_contact_from_groups(c_source.jid, account, [grp_source,]) + self.remove_contact_from_groups(c_source.jid, account, [grp_source]) else: # Normal contact or little brother family = gajim.contacts.get_metacontacts_family(account, @@ -3695,14 +3706,16 @@ else: # Normal contact self.add_contact_to_groups(c_source.jid, account, [grp_dest,]) - # remove afterwards so the contact is not moved to General in the meantime + # remove afterwards so the contact is not moved to General in the + # meantime if grp_dest != grp_source: - self.remove_contact_from_groups(c_source.jid, account, [grp_source,]) + self.remove_contact_from_groups(c_source.jid, account, + [grp_source]) if context.action in (gtk.gdk.ACTION_MOVE, gtk.gdk.ACTION_COPY): context.finish(True, True, etime) - + def drag_drop(self, treeview, context, x, y, timestamp): target_list = treeview.drag_dest_get_target_list() target = treeview.drag_dest_find_target(context, target_list) @@ -3752,7 +3765,8 @@ uri = data.strip() uri_splitted = uri.split() # we may have more than one file dropped try: - uri_splitted.remove('\0') # This is always the last element in windows + # This is always the last element in windows + uri_splitted.remove('\0') except ValueError: pass nb_uri = len(uri_splitted) @@ -3823,7 +3837,8 @@ if grp_source in helpers.special_groups and \ grp_source not in ('Not in Roster', 'Observers'): # a transport or a minimized groupchat was dragged - # we can add it to other accounts but not move it to another group, see below + # we can add it to other accounts but not move it to another group, + # see below return jid_source = data.decode('utf-8') c_source = gajim.contacts.get_contact_with_highest_priority( @@ -3879,12 +3894,12 @@ self.on_drop_in_contact(treeview, account_source, c_source, account_dest, c_dest, is_big_brother, context, etime) return - + ################################################################################ ### Everything about images and icons.... ### Cleanup assigned to Jim++ :-) ################################################################################ - + def get_appropriate_state_images(self, jid, size = '16', icon_name = 'online'): '''check jid and return the appropriate state images dict for @@ -3901,7 +3916,6 @@ return self.transports_state_images[size][transport] return gajim.interface.jabber_state_images[size] - def make_transport_state_images(self, transport): '''initialise opened and closed 'transport' iconset dict''' if gajim.config.get('use_transports_iconsets'): @@ -3909,16 +3923,16 @@ '16x16') pixo, pixc = gtkgui_helpers.load_icons_meta() self.transports_state_images['opened'][transport] = \ - gtkgui_helpers.load_iconset(folder, pixo, transport = True) + gtkgui_helpers.load_iconset(folder, pixo, transport=True) self.transports_state_images['closed'][transport] = \ - gtkgui_helpers.load_iconset(folder, pixc, transport = True) + gtkgui_helpers.load_iconset(folder, pixc, transport=True) folder = os.path.join(helpers.get_transport_path(transport), '32x32') - self.transports_state_images['32'][transport] = gtkgui_helpers.load_iconset( - folder, transport = True) + self.transports_state_images['32'][transport] = \ + gtkgui_helpers.load_iconset(folder, transport=True) folder = os.path.join(helpers.get_transport_path(transport), '16x16') - self.transports_state_images['16'][transport] = gtkgui_helpers.load_iconset( - folder, transport = True) - + self.transports_state_images['16'][transport] = \ + gtkgui_helpers.load_iconset(folder, transport=True) + def update_jabber_state_images(self): # Update the roster self.setup_and_draw_roster() @@ -3929,7 +3943,8 @@ if model[titer][2] != '': # If it's not change status message iter # eg. if it has show parameter not '' - model[titer][1] = gajim.interface.jabber_state_images['16'][model[titer][2]] + model[titer][1] = gajim.interface.jabber_state_images['16'][model[ + titer][2]] titer = model.iter_next(titer) # Update the systray if gajim.interface.systray_enabled: @@ -3941,7 +3956,7 @@ win.redraw_tab(ctrl) self.update_status_combobox() - + def set_account_status_icon(self, account): status = gajim.connections[account].connected child_iterA = self._get_account_iter(account, self.model) @@ -3951,7 +3966,8 @@ show = gajim.SHOW_LIST[status] else: # accounts merged show = helpers.get_global_show() - self.model[child_iterA][C_IMG] = gajim.interface.jabber_state_images['16'][show] + self.model[child_iterA][C_IMG] = gajim.interface.jabber_state_images[ + '16'][show] ################################################################################ ### Style and theme related methods @@ -4022,7 +4038,7 @@ for contact in self._iter_contact_rows(): self.draw_contact(contact[C_JID].decode('utf-8'), contact[C_ACCOUNT].decode('utf-8')) - + def set_renderer_color(self, renderer, style, set_background = True): '''set style for treeview cell, using PRELIGHT system color''' if set_background: @@ -4031,7 +4047,7 @@ else: fgcolor = self.tree.style.fg[style] renderer.set_property('foreground-gdk', fgcolor) - + def _iconCellDataFunc(self, column, renderer, model, titer, data = None): '''When a row is added, set properties for icon renderer''' theme = gajim.config.get('roster_theme') @@ -4074,7 +4090,7 @@ else: renderer.set_property('xalign', 0.4) renderer.set_property('width', 26) - + def _nameCellDataFunc(self, column, renderer, model, titer, data = None): '''When a row is added, set properties for name renderer''' theme = gajim.config.get('roster_theme') @@ -4194,18 +4210,19 @@ renderer.set_property('xalign', 1) # align pixbuf to the right else: renderer.set_property('visible', False) - + ################################################################################ ### Everything about building menus ### FIXME: We really need to make it simpler! 1465 lines are a few to much.... -################################################################################ +################################################################################ def make_menu(self, force = False): '''create the main window\'s menus''' if not force and not self.actions_menu_needs_rebuild: return new_chat_menuitem = self.xml.get_widget('new_chat_menuitem') - single_message_menuitem = self.xml.get_widget('send_single_message_menuitem') + single_message_menuitem = self.xml.get_widget( + 'send_single_message_menuitem') join_gc_menuitem = self.xml.get_widget('join_gc_menuitem') muc_icon = gtkgui_helpers.load_icon('muc_active') if muc_icon: @@ -4470,8 +4487,8 @@ if sys.platform == 'darwin': syncmenu.takeover_menu(self.xml.get_widget('menubar')) - self.actions_menu_needs_rebuild = False - + self.actions_menu_needs_rebuild = False + def build_account_menu(self, account): # we have to create our own set of icons for the menu # using self.jabber_status_images is poopoo @@ -4562,8 +4579,8 @@ else: pep_config.set_sensitive(False) pep_submenu.append(pep_config) - pep_config.connect('activate', self.on_pep_services_menuitem_activate, - account) + pep_config.connect('activate', + self.on_pep_services_menuitem_activate, account) img = gtk.image_new_from_stock(gtk.STOCK_PREFERENCES, gtk.ICON_SIZE_MENU) pep_config.set_image(img) @@ -4688,7 +4705,7 @@ menu.connect('selection-done', gtkgui_helpers.destroy_widget) menu.show_all() menu.popup(None, None, None, event_button, event.time) - + def make_group_menu(self, event, titer): '''Make group's popup menu''' model = self.modelfilter @@ -4731,7 +4748,8 @@ group_message_to_all_item = gtk.MenuItem(_('To all users')) send_group_message_submenu.append(group_message_to_all_item) - group_message_to_all_online_item = gtk.MenuItem(_('To all online users')) + group_message_to_all_online_item = gtk.MenuItem( + _('To all online users')) send_group_message_submenu.append(group_message_to_all_online_item) group_message_to_all_online_item.connect('activate', @@ -4749,10 +4767,12 @@ menu.append(invite_menuitem) # Send Custom Status - send_custom_status_menuitem = gtk.ImageMenuItem(_('Send Cus_tom Status')) + send_custom_status_menuitem = gtk.ImageMenuItem( + _('Send Cus_tom Status')) # add a special img for this menuitem if group in gajim.connections[account].blocked_groups: - send_custom_status_menuitem.set_image(gtkgui_helpers.load_icon('offline')) + send_custom_status_menuitem.set_image(gtkgui_helpers.load_icon( + 'offline')) send_custom_status_menuitem.set_sensitive(False) else: icon = gtk.image_new_from_stock(gtk.STOCK_NETWORK, @@ -4766,8 +4786,8 @@ # icon MUST be different instance for every item state_images = gtkgui_helpers.load_iconset(path) status_menuitem = gtk.ImageMenuItem(helpers.get_uf_show(s)) - status_menuitem.connect('activate', self.on_send_custom_status, list_, - s, group) + status_menuitem.connect('activate', self.on_send_custom_status, + list_, s, group) icon = state_images[s] status_menuitem.set_image(icon) status_menuitems.append(status_menuitem) @@ -4841,7 +4861,7 @@ menu.attach_to_widget(self.tree, None) menu.connect('selection-done', gtkgui_helpers.destroy_widget) menu.show_all() - menu.popup(None, None, None, event_button, event.time) + menu.popup(None, None, None, event_button, event.time) def make_contact_menu(self, event, titer): '''Make contact\'s popup menu''' @@ -5170,8 +5190,8 @@ gtkgui_helpers.destroy_widget) roster_contact_context_menu.show_all() roster_contact_context_menu.popup(None, None, None, event_button, - event.time) - + event.time) + def make_multiple_contact_menu(self, event, iters): '''Make group's popup menu''' model = self.modelfilter @@ -5268,7 +5288,7 @@ menu.connect('selection-done', gtkgui_helpers.destroy_widget) menu.show_all() menu.popup(None, None, None, event_button, event.time) - + def make_transport_menu(self, event, titer): '''Make transport\'s popup menu''' model = self.modelfilter @@ -5294,7 +5314,8 @@ send_custom_status_menuitem = gtk.ImageMenuItem(_('Send Cus_tom Status')) # add a special img for this menuitem if blocked: - send_custom_status_menuitem.set_image(gtkgui_helpers.load_icon('offline')) + send_custom_status_menuitem.set_image(gtkgui_helpers.load_icon( + 'offline')) send_custom_status_menuitem.set_sensitive(False) else: if gajim.interface.status_sent_to_users.has_key(account) and \ @@ -5448,7 +5469,7 @@ menu.connect('selection-done', gtkgui_helpers.destroy_widget) menu.show_all() menu.popup(None, None, None, event_button, event.time) - + def build_resources_submenu(self, contacts, account, action, room_jid=None, room_account=None): ''' Build a submenu with contact's resources. @@ -5546,7 +5567,7 @@ menuitem.connect('activate', self.on_invite_to_room, list_, room_jid, account) invite_to_submenu.append(menuitem) - + def get_and_connect_advanced_menuitem_menu(self, account): '''adds FOR ACCOUNT options''' xml = gtkgui_helpers.get_glade('advanced_menuitem_menu.glade') @@ -5593,7 +5614,7 @@ advanced_menuitem_menu.show_all() return advanced_menuitem_menu - + def add_history_manager_menuitem(self, menu): '''adds a seperator and History Manager menuitem BELOW for account menuitems''' @@ -5607,7 +5628,7 @@ item.set_image(icon) menu.append(item) item.connect('activate', self.on_history_manager_menuitem_activate) - + def add_bookmarks_list(self, gc_sub_menu, account): '''Show join new group chat item and bookmarks list for an account''' item = gtk.ImageMenuItem(_('_Join New Group Chat')) @@ -5626,7 +5647,7 @@ item.connect('activate', self.on_bookmark_menuitem_activate, account, bookmark) gc_sub_menu.append(item) - + def set_actions_menu_needs_rebuild(self): self.actions_menu_needs_rebuild = True # Force the rebuild now since the on_activates on the menu itself does @@ -5634,7 +5655,7 @@ if sys.platform == 'darwin': self.make_menu(force = True) return - + def show_appropriate_context_menu(self, event, iters): # iters must be all of the same type model = self.modelfilter @@ -5674,7 +5695,7 @@ self.show_appropriate_context_menu(event, iters) return True - + def setup_for_osx(self): '''Massage the GTK menu so it will match up to the OS/X nib style menu when passed to sync-menu and merged''' @@ -5720,11 +5741,11 @@ # Hide the GTK menubar itself and let the OS/X menubar do its thing #self.xml.get_widget('menubar').hide() return - + ################################################################################ -### +### ################################################################################ - + def __init__(self): self.filtering = False self.xml = gtkgui_helpers.get_glade('roster_window.glade') @@ -5808,8 +5829,8 @@ for show in ('online', 'chat', 'away', 'xa', 'dnd', 'invisible'): uf_show = helpers.get_uf_show(show) - liststore.append([uf_show, gajim.interface.jabber_state_images['16'][show], - show, True]) + liststore.append([uf_show, gajim.interface.jabber_state_images['16'][ + show], show, True]) # Add a Separator (self._iter_is_separator() checks on string SEPARATOR) liststore.append(['SEPARATOR', None, '', True]) @@ -5823,8 +5844,8 @@ liststore.append(['SEPARATOR', None, '', True]) uf_show = helpers.get_uf_show('offline') - liststore.append([uf_show, gajim.interface.jabber_state_images['16']['offline'], - 'offline', True]) + liststore.append([uf_show, gajim.interface.jabber_state_images['16'][ + 'offline'], 'offline', True]) status_combobox_items = ['online', 'chat', 'away', 'xa', 'dnd', 'invisible', 'separator1', 'change_status_msg', 'separator2', @@ -5901,8 +5922,8 @@ # signals self.TARGET_TYPE_URI_LIST = 80 - TARGETS = [('MY_TREE_MODEL_ROW', gtk.TARGET_SAME_APP | gtk.TARGET_SAME_WIDGET, - 0)] + TARGETS = [('MY_TREE_MODEL_ROW', + gtk.TARGET_SAME_APP | gtk.TARGET_SAME_WIDGET, 0)] TARGETS2 = [('MY_TREE_MODEL_ROW', gtk.TARGET_SAME_WIDGET, 0), ('text/uri-list', 0, self.TARGET_TYPE_URI_LIST)] self.tree.enable_model_drag_source(gtk.gdk.BUTTON1_MASK, TARGETS,

1 0

[commit-gajim] r9738 - in trunk/src: . common
by asterix＠gajim.org 02 Jun '08

02 Jun '08

Author: asterix Date: 2008-06-02 10:10:36 +0200 (Mon, 02 Jun 2008) New Revision: 9738 Modified: trunk/src/common/config.py trunk/src/conversation_textview.py Log: [Yrogirg] configurable latex formulas font size. Fixes #3986 Modified: trunk/src/common/config.py =================================================================== --- trunk/src/common/config.py 2008-06-01 23:33:51 UTC (rev 9737) +++ trunk/src/common/config.py 2008-06-02 08:10:36 UTC (rev 9738) @@ -250,6 +250,7 @@ '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 systray 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.') ], } __options_per_key = { Modified: trunk/src/conversation_textview.py =================================================================== --- trunk/src/conversation_textview.py 2008-06-01 23:33:51 UTC (rev 9737) +++ trunk/src/conversation_textview.py 2008-06-02 08:10:36 UTC (rev 9738) @@ -854,15 +854,8 @@ exitcode = p.wait() if exitcode == 0: - convert_version = helpers.get_output_of_command( - 'convert -version')[0].split()[2] - convert_version = [int(n) for n in convert_version.split('.')] - if convert_version > [6, 3, 4]: - # -alpha option was added in 6.3.5 release - alpha = ['-alpha', 'off'] - else: - alpha = [] - p = Popen(['convert'] + alpha + [tmpfile + '.ps', tmpfile + '.png'], + latex_png_dpi = gajim.config.get('latex_png_dpi') + p = Popen(['convert', '-background', 'white', '-flatten', '-density', latex_png_dpi, tmpfile + '.ps', tmpfile + '.png'], cwd=gettempdir()) exitcode = p.wait()

1 0

[commit-gajim] r9737 - in branches/plugin-system: . plugins src src/common src/plugins test
by vardo＠gajim.org 01 Jun '08

01 Jun '08

Author: vardo Date: 2008-06-02 01:33:51 +0200 (Mon, 02 Jun 2008) New Revision: 9737 Added: branches/plugin-system/epydoc.conf branches/plugin-system/plugins/ branches/plugin-system/plugins/length_notifier.py branches/plugin-system/src/plugins/ branches/plugin-system/src/plugins/__init__.py branches/plugin-system/src/plugins/helpers.py branches/plugin-system/src/plugins/plugin.py branches/plugin-system/src/plugins/pluginmanager.py branches/plugin-system/test/ branches/plugin-system/test/test_pluginmanager.py Modified: branches/plugin-system/src/chat_control.py branches/plugin-system/src/common/configpaths.py branches/plugin-system/src/common/gajim.py branches/plugin-system/src/common/sleepy.py branches/plugin-system/src/gajim.py Log: Initial commit related to plug-in system: - basic PluginManager class that loads plugins from *.py files in given directories - Singleton metaclass was created to use with PluginManager; notice: __init__ of class is called only once (not like in code that is included in Python Cookbook) - variable to keep paths of plugin directories has been created (common.gajim.PLUGINS_DIRS); also added initilization of these paths to common.ConfigPaths - added global variable with PluginManager object: common.gajim.plugin_manager - created customized logger for plugin system ('gajim.plugin_system') - created function decorator plugins.helpers.log_calls which logs each call of function/method; it also logs when function is left - base class Plugin for plug-in implementation added; not much here - only empty class attributes: name, short_name, authors, version, description - based on Plugin class, first plugin was created named LengthNotifierPlugin; it is used to notify users when they exceed given length of message during writing it (text entry field highlights) - first GUI extension points works when ChatControl object is created (it is used in mentioned plugin) - added 'epydoc.conf' file customized a little bit (file is also in trunk now) - fixed indentation in common.sleepy module (also in trunk now) Added: branches/plugin-system/epydoc.conf =================================================================== --- branches/plugin-system/epydoc.conf (rev 0) +++ branches/plugin-system/epydoc.conf 2008-06-01 23:33:51 UTC (rev 9737) @@ -0,0 +1,28 @@ +[epydoc] + +# Information about the project. +name: Gajim +url: http://gajim.org + +verbosity: 3 +imports: yes +redundant-details: yes +docformat: restructuredtext +# top: gajim + +# The list of modules to document. Modules can be named using +# dotted names, module filenames, or package directory names. +# This option may be repeated. +modules: src/plugins/*.py + +# Write html output to the directory "apidocs" +#output: pdf +output: html +target: apidocs/ + +# Include all automatically generated graphs. These graphs are +# generated using Graphviz dot. +graph: all +dotpath: /usr/bin/dot +graph-font: Sans +graph-font-size: 10 Added: branches/plugin-system/plugins/length_notifier.py =================================================================== --- branches/plugin-system/plugins/length_notifier.py (rev 0) +++ branches/plugin-system/plugins/length_notifier.py 2008-06-01 23:33:51 UTC (rev 9737) @@ -0,0 +1,95 @@ +# -*- coding: utf-8 -*- + +## 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/>. +## + +''' +Message length notifier plugin. + +:author: Mateusz Biliński <mateusz(a)bilinski.it> +:since: 06/01/2008 +:copyright: Copyright (2008) Mateusz Biliński <mateusz(a)bilinski.it> +:license: GPL +''' + +import sys + +import gtk + +from plugins import GajimPlugin +from plugins.helpers import log, log_calls + +class LengthNotifierPlugin(GajimPlugin): + name = 'Message Length Notifier' + short_name = 'length_notifier' + version = '0.1' + description = '''Highlights message entry field in chat window when given +length of message is exceeded.''' + authors = ['Mateusz Biliński <mateusz(a)bilinski.it>'] + + @log_calls('LengthNotifierPlugin') + def __init__(self): + super(LengthNotifierPlugin, self).__init__() + + self.__class__.gui_extension_points = { + 'chat_control' : (self.connect_with_chat_control, + self.disconnect_from_chat_control) + } + + self.MESSAGE_WARNING_LENGTH = 140 + self.WARNING_COLOR = gtk.gdk.color_parse('#F0DB3E') + self.JIDS = [] + + @log_calls('LengthNotifierPlugin') + def textview_length_warning(self, tb, chat_control): + tv = chat_control.msg_textview + d = chat_control.length_notifier_plugin_data + t = tb.get_text(tb.get_start_iter(), tb.get_end_iter()) + if t: + len_t = len(t) + #print("len_t: %d"%(len_t)) + if len_t>self.MESSAGE_WARNING_LENGTH: + if not d['prev_color']: + d['prev_color'] = tv.style.copy().base[gtk.STATE_NORMAL] + tv.modify_base(gtk.STATE_NORMAL, self.WARNING_COLOR) + elif d['prev_color']: + tv.modify_base(gtk.STATE_NORMAL, d['prev_color']) + d['prev_color'] = None + + @log_calls('LengthNotifierPlugin') + def connect_with_chat_control(self, chat_control): + jid = chat_control.contact.jid + if self.jid_is_ok(jid): + d = {'prev_color' : None} + tv = chat_control.msg_textview + b = tv.get_buffer() + h_id = b.connect('changed', self.textview_length_warning, chat_control) + d['h_id'] = h_id + chat_control.length_notifier_plugin_data = d + + return True + + return False + + @log_calls('LengthNotifierPlugin') + def disconnect_from_chat_control(self, chat_control): + d = chat_control.length_notifier_plugin_data + chat_control.msg_textview.get_buffer().disconnect(d['h_id']) + if d['prev_color']: + tv.modify_base(gtk.STATE_NORMAL, self.PREV_COLOR) + + @log_calls('LengthNotifierPlugin') + def jid_is_ok(self, jid): + return True \ No newline at end of file Modified: branches/plugin-system/src/chat_control.py =================================================================== --- branches/plugin-system/src/chat_control.py 2008-06-01 23:07:34 UTC (rev 9736) +++ branches/plugin-system/src/chat_control.py 2008-06-01 23:33:51 UTC (rev 9737) @@ -1139,6 +1139,8 @@ self.update_ui() # restore previous conversation self.restore_conversation() + + gajim.plugin_manager.gui_extension_point('chat_control', self) def on_avatar_eventbox_enter_notify_event(self, widget, event): '''we enter the eventbox area so we under conditions add a timeout Modified: branches/plugin-system/src/common/configpaths.py =================================================================== --- branches/plugin-system/src/common/configpaths.py 2008-06-01 23:07:34 UTC (rev 9736) +++ branches/plugin-system/src/common/configpaths.py 2008-06-01 23:33:51 UTC (rev 9737) @@ -92,6 +92,10 @@ self.add('DATA', os.path.join(u'..', windowsify(u'data'))) self.add('HOME', fse(os.path.expanduser('~'))) self.add('TMP', fse(tempfile.gettempdir())) + + # dirs for plugins + self.add('PLUGINS_BASE', os.path.join(u'..', windowsify(u'plugins'))) + self.add_from_root('PLUGINS_USER', u'plugins') try: import svn_config Modified: branches/plugin-system/src/common/gajim.py =================================================================== --- branches/plugin-system/src/common/gajim.py 2008-06-01 23:07:34 UTC (rev 9736) +++ branches/plugin-system/src/common/gajim.py 2008-06-01 23:33:51 UTC (rev 9737) @@ -61,6 +61,7 @@ connections = {} # 'account name': 'account (connection.Connection) instance' verbose = False ipython_window = None +plugin_manager = None h = logging.StreamHandler() f = logging.Formatter('%(asctime)s %(name)s: %(message)s', '%d %b %Y %H:%M:%S') @@ -85,6 +86,8 @@ TMP = gajimpaths['TMP'] DATA_DIR = gajimpaths['DATA'] HOME_DIR = gajimpaths['HOME'] +PLUGINS_DIRS = [gajimpaths['PLUGINS_BASE'], + gajimpaths['PLUGINS_USER']] try: LANG = locale.getdefaultlocale()[0] # en_US, fr_FR, el_GR etc.. Modified: branches/plugin-system/src/common/sleepy.py =================================================================== --- branches/plugin-system/src/common/sleepy.py 2008-06-01 23:07:34 UTC (rev 9736) +++ branches/plugin-system/src/common/sleepy.py 2008-06-01 23:33:51 UTC (rev 9737) @@ -35,22 +35,22 @@ SUPPORTED = True try: - if os.name == 'nt': - import ctypes + if os.name == 'nt': + import ctypes - GetTickCount = ctypes.windll.kernel32.GetTickCount - GetLastInputInfo = ctypes.windll.user32.GetLastInputInfo + GetTickCount = ctypes.windll.kernel32.GetTickCount + GetLastInputInfo = ctypes.windll.user32.GetLastInputInfo - class LASTINPUTINFO(ctypes.Structure): - _fields_ = [('cbSize', ctypes.c_uint), ('dwTime', ctypes.c_uint)] + class LASTINPUTINFO(ctypes.Structure): + _fields_ = [('cbSize', ctypes.c_uint), ('dwTime', ctypes.c_uint)] - lastInputInfo = LASTINPUTINFO() - lastInputInfo.cbSize = ctypes.sizeof(lastInputInfo) + lastInputInfo = LASTINPUTINFO() + lastInputInfo.cbSize = ctypes.sizeof(lastInputInfo) - elif sys.platform == 'darwin': - import osx.idle as idle - else: # unix - import idle + elif sys.platform == 'darwin': + import osx.idle as idle + else: # unix + import idle except: gajim.log.debug('Unable to load idle module') SUPPORTED = False Modified: branches/plugin-system/src/gajim.py =================================================================== --- branches/plugin-system/src/gajim.py 2008-06-01 23:07:34 UTC (rev 9736) +++ branches/plugin-system/src/gajim.py 2008-06-01 23:33:51 UTC (rev 9737) @@ -3461,6 +3461,10 @@ gobject.timeout_add_seconds(2, self.process_connections) gobject.timeout_add_seconds(gajim.config.get( 'check_idle_every_foo_seconds'), self.read_sleepy) + + # Creating plugin manager + import plugins + gajim.plugin_manager = plugins.PluginManager() if __name__ == '__main__': def sigint_cb(num, stack): Added: branches/plugin-system/src/plugins/__init__.py =================================================================== --- branches/plugin-system/src/plugins/__init__.py (rev 0) +++ branches/plugin-system/src/plugins/__init__.py 2008-06-01 23:33:51 UTC (rev 9737) @@ -0,0 +1,30 @@ +# -*- coding: utf-8 -*- + +## 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/>. +## + +''' +Main file of plugins package. + +:author: Mateusz Biliński <mateusz(a)bilinski.it> +:since: 05/30/2008 +:copyright: Copyright (2008) Mateusz Biliński <mateusz(a)bilinski.it> +:license: GPL +''' + +from pluginmanager import PluginManager +from plugin import GajimPlugin + +__all__ = ['PluginManager', 'GajimPlugin'] Added: branches/plugin-system/src/plugins/helpers.py =================================================================== --- branches/plugin-system/src/plugins/helpers.py (rev 0) +++ branches/plugin-system/src/plugins/helpers.py 2008-06-01 23:33:51 UTC (rev 9737) @@ -0,0 +1,113 @@ +# -*- coding: utf-8 -*- + +## 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/>. +## + +''' +Helper code related to plug-ins management system. + +:author: Mateusz Biliński <mateusz(a)bilinski.it> +:since: 05/30/2008 +:copyright: Copyright (2008) Mateusz Biliński <mateusz(a)bilinski.it> +:license: GPL +''' + +__all__ = ['log', 'log_calls', 'Singleton'] + +import logging +log = logging.getLogger('gajim.plugin_system') +''' +Logger for code related to plug-in system. + +:type: logging.Logger +''' + +consoleloghandler = logging.StreamHandler() +consoleloghandler.setLevel(1) +consoleloghandler.setFormatter( + logging.Formatter('%(levelname)s: %(message)s')) + #logging.Formatter('%(asctime)s %(name)s: %(levelname)s: %(message)s')) +log.setLevel(logging.DEBUG) +log.addHandler(consoleloghandler) +log.propagate = False + +import functools + +class log_calls(object): + ''' + Decorator class for functions to easily log when they are entered and left. + ''' + + def __init__(self, classname='', log=log): + ''' + :Keywords: + classname : str + Name of class to prefix function name (if function is a method). + log : logging.Logger + Logger to use when outputing debug information on when function has + been entered and when left. By default: `plugins.helpers.log` + is used. + ''' + + self.full_func_name = '' + ''' + Full name of function, with class name (as prefix) if given + to decorator. + + Otherwise, it's only function name retrieved from function object + for which decorator was called. + + :type: str + ''' + + if classname: + self.full_func_name = classname+'.' + + def __call__(self, f): + ''' + :param f: function to be wrapped with logging statements + + :return: given function wrapped by *log.debug* statements + :rtype: function + ''' + self.full_func_name += f.func_name + @functools.wraps(f) + def wrapper(*args, **kwargs): + log.debug('%(funcname)s() <entered>'%{ + 'funcname': self.full_func_name}) + result = f(*args, **kwargs) + log.debug('%(funcname)s() <left>'%{ + 'funcname': self.full_func_name}) + return result + return wrapper + +class Singleton(type): + ''' + Singleton metaclass. + ''' + def __init__(cls,name,bases,dic): + super(Singleton,cls).__init__(name,bases,dic) + cls.instance=None + + def __call__(cls,*args,**kw): + if cls.instance is None: + cls.instance=super(Singleton,cls).__call__(*args,**kw) + log.debug('%(classname)s - new instance created'%{ + 'classname' : cls.__name__}) + else: + log.debug('%(classname)s - returning already existing instance'%{ + 'classname' : cls.__name__}) + + return cls.instance \ No newline at end of file Added: branches/plugin-system/src/plugins/plugin.py =================================================================== --- branches/plugin-system/src/plugins/plugin.py (rev 0) +++ branches/plugin-system/src/plugins/plugin.py 2008-06-01 23:33:51 UTC (rev 9737) @@ -0,0 +1,40 @@ +# -*- coding: utf-8 -*- + +## 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/>. +## + +''' +Base class for implementing plugin. + +:author: Mateusz Biliński <mateusz(a)bilinski.it> +:since: 06/01/2008 +:copyright: Copyright (2008) Mateusz Biliński <mateusz(a)bilinski.it> +:license: GPL +''' + +import sys +from plugins.helpers import log, log_calls + +class GajimPlugin(object): + name = '' + short_name = '' + version = '' + description = '' + authors = [] + gui_extension_points = {} + + @log_calls('GajimPlugin') + def __init__(self): + pass \ No newline at end of file Added: branches/plugin-system/src/plugins/pluginmanager.py =================================================================== --- branches/plugin-system/src/plugins/pluginmanager.py (rev 0) +++ branches/plugin-system/src/plugins/pluginmanager.py 2008-06-01 23:33:51 UTC (rev 9737) @@ -0,0 +1,130 @@ +# -*- coding: utf-8 -*- + +## 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/>. +## + +''' +Helper code related to plug-ins management system. + +:author: Mateusz Biliński <mateusz(a)bilinski.it> +:since: 05/30/2008 +:copyright: Copyright (2008) Mateusz Biliński <mateusz(a)bilinski.it> +:license: GPL +''' + +__all__ = ['PluginManager'] + +import os +import sys +import fnmatch + +import common.gajim as gajim + +from helpers import log, log_calls, Singleton +from plugin import GajimPlugin + +class PluginManager(object): + __metaclass__ = Singleton + + @log_calls('PluginManager') + def __init__(self): + self.plugins = [] + self.active = [] + self.gui_extension_points = {} + + for path in gajim.PLUGINS_DIRS: + self.plugins.extend(self._scan_dir_for_plugins(path)) + + log.debug('plugins: %s'%(self.plugins)) + + self._activate_all_plugins() + + log.debug('active: %s'%(self.active)) + + @log_calls('PluginManager') + def gui_extension_point(self, gui_extpoint_name, *args): + if gui_extpoint_name in self.gui_extension_points: + for handlers in self.gui_extension_points[gui_extpoint_name]: + handlers[0](*args) + + @log_calls('PluginManager') + def _activate_plugin(self, plugin): + ''' + :param plugin: Plugin to be activated. + :type plugin: class object of GajimPlugin subclass + ''' + p = plugin() + + success = True + + # :fix: what if only some handlers are successfully connected? we should + # revert all those connections that where successfully made. Maybe + # call 'self._deactivate_plugin()' or sth similar. + # Looking closer - we only rewrite tuples here. Real check should be + # made in method that invokes gui_extpoints handlers. + for gui_extpoint_name, gui_extpoint_handlers in \ + p.gui_extension_points.iteritems(): + self.gui_extension_points.setdefault(gui_extpoint_name,[]).append( + gui_extpoint_handlers) + + if success: + self.active.append(p) + + return success + + @log_calls('PluginManager') + def _activate_all_plugins(self): + self.active = [] + for plugin in self.plugins: + self._activate_plugin(plugin) + + @log_calls('PluginManager') + def _scan_dir_for_plugins(self, path): + plugins_found = [] + if os.path.isdir(path): + dir_list = os.listdir(path) + log.debug(dir_list) + + sys.path.insert(0, path) + log.debug(sys.path) + + for file in fnmatch.filter(dir_list, '*.py'): + log.debug('- "%s"'%(file)) + file_path = os.path.join(path, file) + log.debug(' "%s"'%(file_path)) + if os.path.isfile(file_path): + module_name = os.path.splitext(file)[0] + module = __import__(module_name) + filter_out_bad_names = \ + lambda x: not (x.startswith('__') or + x.endswith('__')) + for module_attr_name in filter(filter_out_bad_names, + dir(module)): + module_attr = getattr(module, module_attr_name) + log.debug('%s : %s'%(module_attr_name, module_attr)) + + try: + if issubclass(module_attr, GajimPlugin) and \ + not module_attr is GajimPlugin: + log.debug('is subclass of GajimPlugin') + plugins_found.append(module_attr) + except TypeError, e: + log.debug('module_attr: %s, error : %s'%( + module_name+'.'+module_attr_name, + e)) + + log.debug(module) + + return plugins_found \ No newline at end of file Added: branches/plugin-system/test/test_pluginmanager.py =================================================================== --- branches/plugin-system/test/test_pluginmanager.py (rev 0) +++ branches/plugin-system/test/test_pluginmanager.py 2008-06-01 23:33:51 UTC (rev 9737) @@ -0,0 +1,61 @@ +#!/usr/bin/env python +# -*- coding: utf-8 -*- + +## 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/>. +## + +''' +Testing PluginManager class. + +:author: Mateusz Biliński <mateusz(a)bilinski.it> +:since: 05/30/2008 +:copyright: Copyright (2008) Mateusz Biliński <mateusz(a)bilinski.it> +:license: GPL +''' + +import sys +import os +import unittest + +gajim_root = os.path.join(os.path.abspath(os.path.dirname(__file__)), '..') +sys.path.append(gajim_root + '/src') + +from plugins import PluginManager + +class PluginManagerTestCase(unittest.TestCase): + def setUp(self): + self.pluginmanager = PluginManager() + + def tearDown(self): + pass + + def test_01_Singleton(self): + """ 1. Checking whether PluginManger class is singleton. """ + self.pluginmanager.test_arg = 1 + secondPluginManager = PluginManager() + + self.failUnlessEqual(id(secondPluginManager), id(self.pluginmanager), + 'Different IDs in references to PluginManager objects (not a singleton)') + self.failUnlessEqual(secondPluginManager.test_arg, 1, + 'References point to different PluginManager objects (not a singleton') + +def suite(): + suite = unittest.TestLoader().loadTestsFromTestCase(PluginManagerTestCase) + return suite + +if __name__=='__main__': + runner = unittest.TextTestRunner() + test_suite = suite() + runner.run(test_suite) \ No newline at end of file

1 0

[commit-gajim] r9736 - in trunk: data/glade src src/common
by jim++＠gajim.org 01 Jun '08

01 Jun '08

Author: jim++ Date: 2008-06-02 01:07:34 +0200 (Mon, 02 Jun 2008) New Revision: 9736 Removed: trunk/src/tictactoe.py Modified: trunk/data/glade/roster_contact_context_menu.glade trunk/src/common/connection_handlers.py trunk/src/roster_window.py Log: Removing tic tac toe game. Maybe one day a full version in a plugin ? :) Modified: trunk/data/glade/roster_contact_context_menu.glade =================================================================== --- trunk/data/glade/roster_contact_context_menu.glade 2008-06-01 22:46:41 UTC (rev 9735) +++ trunk/data/glade/roster_contact_context_menu.glade 2008-06-01 23:07:34 UTC (rev 9736) @@ -92,13 +92,6 @@ </widget> </child> <child> - <widget class="GtkImageMenuItem" id="tictactoe_menuitem"> - <property name="visible">True</property> - <property name="label" translatable="yes">Play Tic Tac Toe</property> - <property name="use_underline">True</property> - </widget> - </child> - <child> <widget class="GtkImageMenuItem" id="manage_contact"> <property name="visible">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> Modified: trunk/src/common/connection_handlers.py =================================================================== --- trunk/src/common/connection_handlers.py 2008-06-01 22:46:41 UTC (rev 9735) +++ trunk/src/common/connection_handlers.py 2008-06-01 23:07:34 UTC (rev 9736) @@ -50,7 +50,6 @@ from music_track_listener import MusicTrackListener from session import ChatControlSession -import tictactoe STATUS_LIST = ['offline', 'connecting', 'online', 'chat', 'away', 'xa', 'dnd', 'invisible', 'error'] @@ -1723,22 +1722,6 @@ '\x09\x20\x20\x09\x20', '') msgtxt = msgtxt.replace('\x20\x20\x09' \ '\x09\x20\x20\x09\x20', '') - - game_invite = msg.getTag('invite', namespace='http://jabber.org/protocol/games') - if game_invite: - game = game_invite.getTag('game') - - if game.getAttr('var') == \ - 'http://jabber.org/protocol/games/tictactoe': - cls = tictactoe.TicTacToeSession - - # this assumes that the invitation came with a thread_id we haven't - # seen - session = self.make_new_session(frm, thread_id, cls=cls) - - session.invited(msg) - - return elif mtype != 'groupchat': session = self.get_or_create_session(frm, thread_id) Modified: trunk/src/roster_window.py =================================================================== --- trunk/src/roster_window.py 2008-06-01 22:46:41 UTC (rev 9735) +++ trunk/src/roster_window.py 2008-06-01 23:07:34 UTC (rev 9736) @@ -3267,18 +3267,6 @@ def on_profile_avatar_menuitem_activate(self, widget, account): gajim.interface.edit_own_details(account) - def play_tictactoe(self, widget, contact, account, resource=None): - jid = contact.jid - - if resource is not None: - jid = jid + u'/' + resource - - import tictactoe - - sess = gajim.connections[account].make_new_session(jid, - cls=tictactoe.TicTacToeSession) - sess.begin() - def on_execute_command(self, widget, contact, account, resource=None): '''Execute command. Full JID needed; if it is other contact, resource is necessary. Widget is unnecessary, only to be @@ -4999,10 +4987,6 @@ execute_command_menuitem = xml.get_widget( 'execute_command_menuitem') - tictactoe_menuitem = xml.get_widget('tictactoe_menuitem') - tictactoe_menuitem.connect('activate', self.play_tictactoe, contact, - account, contact.resource) - # send custom status icon blocked = False if jid in gajim.connections[account].blocked_contacts: Deleted: trunk/src/tictactoe.py =================================================================== --- trunk/src/tictactoe.py 2008-06-01 22:46:41 UTC (rev 9735) +++ trunk/src/tictactoe.py 2008-06-01 23:07:34 UTC (rev 9736) @@ -1,427 +0,0 @@ -from common import stanza_session -from common import xmpp - -import pygtk -pygtk.require('2.0') -import gtk -from gtk import gdk -import cairo - -# implements <http://pidgin-games.sourceforge.net/xep/tictactoe.html#invite> - -games_ns = 'http://jabber.org/protocol/games' - -class InvalidMove(Exception): - pass - -class TicTacToeSession(stanza_session.StanzaSession): - # initiate a session - def begin(self, rows = 3, cols = 3, role_s = 'x'): - self.rows = rows - self.cols = cols - - self.role_s = role_s - - self.strike = 3 - - if self.role_s == 'x': - self.role_o = 'o' - else: - self.role_o = 'x' - - self.send_invitation() - - self.next_move_id = 1 - self.received = self.wait_for_invite_response - - def send_invitation(self): - msg = xmpp.Message() - - invite = msg.NT.invite - invite.setNamespace(games_ns) - - game = invite.NT.game - game.setAttr('var', games_ns + '/tictactoe') - - x = xmpp.DataForm(typ='submit') - - game.addChild(node=x) - - self.send(msg) - - def read_invitation(self, msg): - invite = msg.getTag('invite', namespace=games_ns) - game = invite.getTag('game') - x = game.getTag('x', namespace='jabber:x:data') - - form = xmpp.DataForm(node=x) - - if form.getField('role'): - self.role_o = form.getField('role').getValues()[0] - else: - self.role_o = 'x' - - if form.getField('rows'): - self.rows = int(form.getField('rows').getValues()[0]) - else: - self.rows = 3 - - if form.getField('cols'): - self.cols = int(form.getField('cols').getValues()[0]) - else: - self.cols = 3 - - # number in a row needed to win - if form.getField('strike'): - self.strike = int(form.getField('strike').getValues()[0]) - else: - self.strike = 3 - - # received an invitation - def invited(self, msg): - self.read_invitation(msg) - - # XXX prompt user - # "accept, reject, ignore" - - # the number of the move about to be made - self.next_move_id = 1 - - # display the board - self.board = TicTacToeBoard(self, self.rows, self.cols) - - # accept the invitation, join the game - response = xmpp.Message() - - join = response.NT.join - join.setNamespace(games_ns) - - self.send(response) - - if self.role_o == 'x': - self.role_s = 'o' - - self.their_turn() - else: - self.role_s = 'x' - self.role_o = 'o' - - self.our_turn() - - # just sent an invitation, expecting a reply - def wait_for_invite_response(self, msg): - if msg.getTag('join', namespace=games_ns): - self.board = TicTacToeBoard(self, self.rows, self.cols) - - if self.role_s == 'x': - self.our_turn() - else: - self.their_turn() - - elif msg.getTag('decline', namespace=games_ns): - # XXX notify the user - - # XXX end session - pass - - # silently ignores any received messages - def ignore(self, msg): - pass - - def game_over(self, msg): - invite = msg.getTag('invite', namespace=games_ns) - - # ignore messages unless they're renewing the game - if invite and invite.getAttr('type') == 'renew': - self.invited(msg) - - def wait_for_move(self, msg): - turn = msg.getTag('turn', namespace=games_ns) - move = turn.getTag('move', namespace='http://jabber.org/protocol/games/tictactoe') - - row = int(move.getAttr('row')) - col = int(move.getAttr('col')) - id = int(move.getAttr('id')) - - if id != self.next_move_id: - print 'unexpected move id, lost a move somewhere?' - return - - try: - self.board.mark(row, col, self.role_o) - except InvalidMove, e: - # received an invalid move, end the game. - - # XXX notify the user - self.end_game('cheating') - return - - # check win conditions - if self.board.check_for_strike(self.role_o, row, col, self.strike): - self.lost() - elif self.board.full(): - self.drawn() - else: - self.next_move_id += 1 - - self.our_turn() - - def is_my_turn(self): - # XXX not great semantics - return self.received == self.ignore - - def our_turn(self): - # ignore messages until we've made our move - self.received = self.ignore - self.board.set_title('your turn') - - def their_turn(self): - self.received = self.wait_for_move - self.board.set_title('their turn') - - # called when the board receives input - def move(self, row, col): - try: - self.board.mark(row, col, self.role_s) - except InvalidMove, e: - print 'you made an invalid move' - return - - self.send_move(row, col) - - # check win conditions - if self.board.check_for_strike(self.role_s, row, col, self.strike): - self.won() - elif self.board.full(): - self.drawn() - else: - self.next_move_id += 1 - - self.their_turn() - - # sends a move message - def send_move(self, row, column): - msg = xmpp.Message() - msg.setType('chat') - - turn = msg.NT.turn - turn.setNamespace(games_ns) - - move = turn.NT.move - move.setNamespace(games_ns+'/tictactoe') - - move.setAttr('row', str(row)) - move.setAttr('col', str(column)) - move.setAttr('id', str(self.next_move_id)) - - self.send(msg) - - # sends a termination message and ends the game - def end_game(self, reason): - msg = xmpp.Message() - - terminate = msg.NT.terminate - terminate.setNamespace(games_ns) - terminate.setAttr('reason', reason) - - self.send(msg) - - self.received = self.game_over - - def won(self): - self.end_game('won') - self.board.won() - - def lost(self): - self.end_game('lost') - self.board.lost() - - def drawn(self): - self.end_game('draw') - self.board.drawn() - -class TicTacToeBoard: - def __init__(self, session, rows, cols): - self.session = session - - self.state = 'None' - - self.rows = rows - self.cols = cols - - self.board = [ [None] * self.cols for r in xrange(self.rows) ] - - self.setup_window() - - # check if the last move (at row r and column c) won the game - def check_for_strike(self, p, r, c, strike): - # number in a row: up and down, left and right - tallyI = 0 - tally_ = 0 - - # number in a row: diagonal - # (imagine L or F as two sides of a right triangle: L\ or F/) - tallyL = 0 - tallyF = 0 - - # convert real columns to internal columns - r -= 1 - c -= 1 - - for d in xrange(-strike, strike): - r_in_range = 0 <= r+d < self.rows - c_in_range = 0 <= c+d < self.cols - - # vertical check - if r_in_range: - tallyI = tallyI + 1 - if self.board[r+d][c] != p: - tallyI = 0 - - # horizontal check - if c_in_range: - tally_ = tally_ + 1 - if self.board[r][c+d] != p: - tally_ = 0 - - # diagonal checks - if r_in_range and c_in_range: - tallyL = tallyL + 1 - if self.board[r+d][c+d] != p: - tallyL = 0 - - if r_in_range and 0 <= c-d < self.cols: - tallyF = tallyF + 1 - if self.board[r+d][c-d] != p: - tallyF = 0 - - if any([t == strike for t in (tallyL, tallyF, tallyI, tally_)]): - return True - - return False - - # is the board full? - def full(self): - for r in xrange(self.rows): - for c in xrange(self.cols): - if self.board[r][c] == None: - return False - - return True - - def setup_window(self): - self.win = gtk.Window() - - self.title_prefix = 'tic-tac-toe with %s' % self.session.jid - self.set_title() - - self.win.set_app_paintable(True) - - self.win.add_events(gdk.BUTTON_PRESS_MASK) - self.win.connect('button-press-event', self.clicked) - self.win.connect('expose-event', self.expose) - - self.win.show_all() - - def clicked(self, widget, event): - if not self.session.is_my_turn(): - return - - (width, height) = widget.get_size() - - # convert click co-ordinates to row and column - - row_height = height // self.rows - col_width = width // self.cols - - row = int(event.y // row_height) + 1 - column = int(event.x // col_width) + 1 - - self.session.move(row, column) - - # this actually draws the board - def expose(self, widget, event): - win = widget.window - - cr = win.cairo_create() - - cr.set_source_rgb(1.0, 1.0, 1.0) - - cr.set_operator(cairo.OPERATOR_SOURCE) - cr.paint() - - (width, height) = widget.get_size() - - row_height = height // self.rows - col_width = width // self.cols - - for i in xrange(self.rows): - for j in xrange(self.cols): - if self.board[i][j] == 'x': - self.draw_x(cr, i, j, row_height, col_width) - elif self.board[i][j] == 'o': - self.draw_o(cr, i, j, row_height, col_width) - - # XXX draw 'won', 'lost', 'draw' - - def draw_x(self, cr, row, col, row_height, col_width): - cr.set_source_rgb(0, 0, 0) - - top = row_height * (row + 0.2) - bottom = row_height * (row + 0.8) - - left = col_width * (col + 0.2) - right = col_width * (col + 0.8) - - cr.set_line_width(row_height / 5) - - cr.move_to(left, top) - cr.line_to(right, bottom) - - cr.move_to(right, top) - cr.line_to(left, bottom) - - cr.stroke() - - def draw_o(self, cr, row, col, row_height, col_width): - cr.set_source_rgb(0, 0, 0) - - x = col_width * (col + 0.5) - y = row_height * (row + 0.5) - - cr.arc(x, y, row_height/4, 0, 2.0*3.2) # slightly further than 2*pi - - cr.set_line_width(row_height / 5) - cr.stroke() - - # mark a move on the board - def mark(self, row, column, player): - if self.board[row-1][column-1]: - raise InvalidMove - else: - self.board[row-1][column-1] = player - - self.win.queue_draw() - - def set_title(self, suffix = None): - str = self.title_prefix - - if suffix: - str += ': ' + suffix - - self.win.set_title(str) - - def won(self): - self.state = 'won' - self.set_title('you won!') - self.win.queue_draw() - - def lost(self): - self.state = 'lost' - self.set_title('you lost.') - self.win.queue_draw() - - def drawn(self): - self.state = 'drawn' - self.win.set_title(self.title_prefix + ': a draw.') - self.win.queue_draw()

1 0

[commit-gajim] r9735 - trunk/src
by steve-e＠gajim.org 01 Jun '08

01 Jun '08

Author: steve-e Date: 2008-06-02 00:46:41 +0200 (Mon, 02 Jun 2008) New Revision: 9735 Modified: trunk/src/config.py trunk/src/roster_window.py Log: Small cleanups to roster and modelfilter. * rename draw_roster to better express its functionality * remove unnecessary call of refilter() * directly remove groups when there is only one child left and we want to remove it Note: in gtkTreeStore iters persist as long as the row isn't removed. Iters in Modelfilter persist as long as the model is unchanged. Modified: trunk/src/config.py =================================================================== --- trunk/src/config.py 2008-06-01 22:23:16 UTC (rev 9734) +++ trunk/src/config.py 2008-06-01 22:46:41 UTC (rev 9735) @@ -515,11 +515,11 @@ def on_sort_by_show_checkbutton_toggled(self, widget): self.on_checkbutton_toggled(widget, 'sort_by_show') - gajim.interface.roster.draw_roster() + gajim.interface.roster.setup_and_draw_roster() def on_show_avatars_in_roster_checkbutton_toggled(self, widget): self.on_checkbutton_toggled(widget, 'show_avatars_in_roster') - gajim.interface.roster.draw_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: @@ -530,14 +530,14 @@ def on_show_status_msgs_in_roster_checkbutton_toggled(self, widget): self.on_checkbutton_toggled(widget, 'show_status_msgs_in_roster') - gajim.interface.roster.draw_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() def on_sort_by_show_checkbutton_toggled(self, widget): self.on_checkbutton_toggled(widget, 'sort_by_show') - gajim.interface.roster.draw_roster() + gajim.interface.roster.setup_and_draw_roster() def on_emoticons_combobox_changed(self, widget): active = widget.get_active() @@ -570,7 +570,7 @@ ctl.chat_buttons_set_visible(active) gajim.config.set('compact_view', active) gajim.interface.save_config() - gajim.interface.roster.draw_roster() + gajim.interface.roster.setup_and_draw_roster() def on_xhtml_checkbutton_toggled(self, widget): self.on_checkbutton_toggled(widget, 'ignore_incoming_xhtml') @@ -1753,7 +1753,7 @@ if self.current_account == old_name: self.current_account = new_name # refresh roster - gajim.interface.roster.draw_roster() + gajim.interface.roster.setup_and_draw_roster() self.init_accounts() self.select_account(new_name) @@ -2077,7 +2077,7 @@ gajim.interface.roster.regroup = gajim.config.get('mergeaccounts') else: gajim.interface.roster.regroup = False - gajim.interface.roster.draw_roster() + gajim.interface.roster.setup_and_draw_roster() def on_enable_zeroconf_checkbutton2_toggled(self, widget): # don't do anything if there is an account with the local name but is a @@ -2119,7 +2119,7 @@ gajim.interface.roster.regroup = gajim.config.get('mergeaccounts') else: gajim.interface.roster.regroup = False - gajim.interface.roster.draw_roster() + gajim.interface.roster.setup_and_draw_roster() gajim.interface.roster.set_actions_menu_needs_rebuild() elif not gajim.config.get('enable_zeroconf') and widget.get_active(): @@ -2156,7 +2156,7 @@ gajim.interface.roster.regroup = gajim.config.get('mergeaccounts') else: gajim.interface.roster.regroup = False - gajim.interface.roster.draw_roster() + gajim.interface.roster.setup_and_draw_roster() gajim.interface.roster.set_actions_menu_needs_rebuild() gajim.interface.save_config() @@ -2587,7 +2587,7 @@ gajim.interface.roster.regroup = gajim.config.get('mergeaccounts') else: gajim.interface.roster.regroup = False - gajim.interface.roster.draw_roster() + gajim.interface.roster.setup_and_draw_roster() gajim.interface.roster.set_actions_menu_needs_rebuild() if gajim.interface.instances.has_key('accounts'): gajim.interface.instances['accounts'].init_accounts() @@ -3421,7 +3421,7 @@ gajim.interface.roster.regroup = gajim.config.get('mergeaccounts') else: gajim.interface.roster.regroup = False - gajim.interface.roster.draw_roster() + gajim.interface.roster.setup_and_draw_roster() gajim.interface.roster.set_actions_menu_needs_rebuild() gajim.interface.save_config() Modified: trunk/src/roster_window.py =================================================================== --- trunk/src/roster_window.py 2008-06-01 22:23:16 UTC (rev 9734) +++ trunk/src/roster_window.py 2008-06-01 22:46:41 UTC (rev 9735) @@ -382,7 +382,6 @@ added_iters.append(i_) # Restore the group expand state - # FIXME path may be invalid at this point! path = self.model.get_path(child_iterG) if account + group in self.collapsed_rows: is_expanded = False @@ -432,14 +431,14 @@ # Remove us and empty groups from the model for i in iters: parent_i = self.model.iter_parent(i) - self.model.remove(i) - if parent_type == 'group' and \ - self.model.iter_n_children(parent_i) == 0: + self.model.iter_n_children(parent_i) == 1: group = self.model[parent_i][C_JID].decode('utf-8') if gajim.groups[account].has_key(group): del gajim.groups[account][group] self.model.remove(parent_i) + else: + self.model.remove(i) return True @@ -552,10 +551,6 @@ assert not self.model.iter_children(iters[0]),\ "Old Big Brother %s still has children" % old_big_jid - # This one is strange but necessary: - # Refilter filtered model to not crash hard. It thinks it still has children. - self.refilter_shown_roster_items() - 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, @@ -1237,7 +1232,7 @@ task = _draw_all_contacts(jids, account, t) gobject.idle_add(task.next) - def draw_roster(self): + def setup_and_draw_roster(self): '''create new empty model and draw roster''' #(icon, name, type, jid, account, editable, avatar_pixbuf, padlock_pixbuf) self.model = gtk.TreeStore(gtk.Image, str, str, str, str, gtk.gdk.Pixbuf, @@ -3938,7 +3933,7 @@ def update_jabber_state_images(self): # Update the roster - self.draw_roster() + self.setup_and_draw_roster() # Update the status combobox model = self.status_combobox.get_model() titer = model.get_iter_root() @@ -5942,7 +5937,7 @@ self.tooltip = tooltips.RosterTooltip() # Workaroung: For strange reasons signal is behaving like row-changed self._toggeling_row = False - self.draw_roster() + self.setup_and_draw_roster() for account in gajim.connections: if gajim.config.get_per('accounts', account, 'publish_tune'):

1 0

[commit-gajim] r9734 - trunk/src
by jim++＠gajim.org 01 Jun '08

01 Jun '08

Author: jim++ Date: 2008-06-02 00:23:16 +0200 (Mon, 02 Jun 2008) New Revision: 9734 Modified: trunk/src/roster_window.py Log: try another way do redraw roster. See #3955. Modified: trunk/src/roster_window.py =================================================================== --- trunk/src/roster_window.py 2008-06-01 21:50:24 UTC (rev 9733) +++ trunk/src/roster_window.py 2008-06-01 22:23:16 UTC (rev 9734) @@ -1238,10 +1238,19 @@ gobject.idle_add(task.next) def draw_roster(self): - '''clear and draw roster''' - # clear the model, only if it is not empty - if self.model: - self.model.clear() + '''create new empty model and draw roster''' + #(icon, name, type, jid, account, editable, avatar_pixbuf, padlock_pixbuf) + self.model = gtk.TreeStore(gtk.Image, str, str, str, str, gtk.gdk.Pixbuf, + gtk.gdk.Pixbuf) + + self.model.set_sort_func(1, self._compareIters) + self.model.set_sort_column_id(1, gtk.SORT_ASCENDING) + self.modelfilter = self.model.filter_new() + self.modelfilter.set_visible_func(self._visible_func) + self.modelfilter.connect('row-has-child-toggled', + self.on_modelfilter_row_has_child_toggled) + self.tree.set_model(self.modelfilter) + for acct in gajim.connections: self.add_account(acct) self.add_account_contacts(acct) @@ -5784,20 +5793,6 @@ self.popups_notification_height = 0 self.popup_notification_windows = [] - #(icon, name, type, jid, account, editable, avatar_pixbuf, padlock_pixbuf) - self.model = gtk.TreeStore(gtk.Image, str, str, str, str, gtk.gdk.Pixbuf, - gtk.gdk.Pixbuf) - - self.model.set_sort_func(1, self._compareIters) - self.model.set_sort_column_id(1, gtk.SORT_ASCENDING) - self.modelfilter = self.model.filter_new() - self.modelfilter.set_visible_func(self._visible_func) - self.modelfilter.connect('row-has-child-toggled', - self.on_modelfilter_row_has_child_toggled) - self.tree.set_model(self.modelfilter) - # Workaroung: For strange reasons signal is behaving like row-changed - self._toggeling_row = False - # Remove contact from roster when last event opened # { (contact, account): { backend: boolean } self.contacts_to_be_removed = {} @@ -5945,6 +5940,8 @@ self.collapsed_rows = gajim.config.get('collapsed_rows').split('\t') self.tooltip = tooltips.RosterTooltip() + # Workaroung: For strange reasons signal is behaving like row-changed + self._toggeling_row = False self.draw_roster() for account in gajim.connections:

1 0

[commit-gajim] r9733 - www-website
by jim++＠gajim.org 01 Jun '08

01 Jun '08

Author: jim++ Date: 2008-06-01 23:50:24 +0200 (Sun, 01 Jun 2008) New Revision: 9733 Modified: www-website/dev.php Log: Officially back in team Modified: www-website/dev.php =================================================================== --- www-website/dev.php 2008-06-01 21:49:34 UTC (rev 9732) +++ www-website/dev.php 2008-06-01 21:50:24 UTC (rev 9733) @@ -92,6 +92,7 @@ print (" <li>Stefan Bethge (sb)</li>"); print (" <li>Julien Pivotto (roidelapluie)</li>"); print (" <li>Stephan Erb (steve-e)</li>"); +print (" <li>Jean-Marie Traissard (Jim++)</li>"); print (" </ul>"); print (" <br/>"); print _(" We also want to thank")." <a href=\"http://trac.gajim.org/browser/trunk/THANKS\">"._("these people")."</a>.\n";

1 0

[commit-gajim] r9732 - trunk
by jim++＠gajim.org 01 Jun '08

01 Jun '08

Author: jim++ Date: 2008-06-01 23:49:34 +0200 (Sun, 01 Jun 2008) New Revision: 9732 Modified: trunk/AUTHORS Log: Officially back in team Modified: trunk/AUTHORS =================================================================== --- trunk/AUTHORS 2008-06-01 21:13:06 UTC (rev 9731) +++ trunk/AUTHORS 2008-06-01 21:49:34 UTC (rev 9732) @@ -6,10 +6,10 @@ Stephan Erb (steve-e AT h3c.de) Julien Pivotto (roidelapluie AT gmail.com) Jonathan Schleifer (js-gajim AT webkeks.org) +Jean-Marie Traissard (jim AT lapin.org) PAST DEVELOPERS: -Jean-Marie Traissard (jim AT lapin.org) Stefan Bethge (stefan AT lanpartei.de) Dimitur Kirov (dkirov AT gmail.com) Vincent Hanquez (tab AT snarc.org)

1 0

[commit-gajim] r9731 - trunk/src/common
by jim++＠gajim.org 01 Jun '08

01 Jun '08

Author: jim++ Date: 2008-06-01 23:13:06 +0200 (Sun, 01 Jun 2008) New Revision: 9731 Modified: trunk/src/common/contacts.py Log: Don't traceback when refiltering during the model.clear (has a bad account name). Fixes #3893. Modified: trunk/src/common/contacts.py =================================================================== --- trunk/src/common/contacts.py 2008-06-01 08:44:03 UTC (rev 9730) +++ trunk/src/common/contacts.py 2008-06-01 21:13:06 UTC (rev 9731) @@ -246,9 +246,10 @@ return None def iter_contacts(self, account): - for jid in self._contacts[account]: - for contact in self._contacts[account][jid]: - yield contact + if account in self._contacts: + for jid in self._contacts[account]: + for contact in self._contacts[account][jid]: + yield contact def get_contact_from_full_jid(self, account, fjid): ''' Get Contact object for specific resource of given jid'''

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits June 2008