Commits June 2008

commits@gajim.org

7 participants
141 discussions

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

16 Jun '08

Author: jim++ Date: 2008-06-16 11:51:03 +0200 (Mon, 16 Jun 2008) New Revision: 9810 Modified: trunk/src/roster_window.py Log: [sgala] Prevent TB Modified: trunk/src/roster_window.py =================================================================== --- trunk/src/roster_window.py 2008-06-16 07:31:26 UTC (rev 9809) +++ trunk/src/roster_window.py 2008-06-16 09:51:03 UTC (rev 9810) @@ -1343,7 +1343,7 @@ jid = data['jid'] account = data['account'] contact = gajim.contacts.get_first_contact_from_jid(account, jid) - if self.contact_is_visible(contact, account): + if contact and self.contact_is_visible(contact, account): return True return False else:

1 0

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

16 Jun '08

Author: asterix Date: 2008-06-16 09:31:26 +0200 (Mon, 16 Jun 2008) New Revision: 9809 Modified: trunk/src/roster_window.py Log: don't allow to block a transport contact. Fixes #3984 Modified: trunk/src/roster_window.py =================================================================== --- trunk/src/roster_window.py 2008-06-16 00:00:52 UTC (rev 9808) +++ trunk/src/roster_window.py 2008-06-16 07:31:26 UTC (rev 9809) @@ -5135,12 +5135,15 @@ privacy_rules_supported: if jid in gajim.connections[account].blocked_contacts: block_menuitem.set_no_show_all(True) + block_menuitem.hide() unblock_menuitem.connect('activate', self.on_unblock, titer, None) - block_menuitem.hide() else: unblock_menuitem.set_no_show_all(True) - block_menuitem.connect('activate', self.on_block, titer, None) unblock_menuitem.hide() + if gajim.get_transport_name_from_jid(jid, use_config_setting=False): + block_menuitem.set_sensitive(False) + else: + block_menuitem.connect('activate', self.on_block, titer, None) else: unblock_menuitem.set_no_show_all(True) block_menuitem.set_sensitive(False)

1 0

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

16 Jun '08

Author: steve-e Date: 2008-06-16 02:00:52 +0200 (Mon, 16 Jun 2008) New Revision: 9808 Modified: trunk/src/roster_window.py Log: Correctly update metacontact icon on expand when a child has pending events. Modified: trunk/src/roster_window.py =================================================================== --- trunk/src/roster_window.py 2008-06-15 23:51:40 UTC (rev 9807) +++ trunk/src/roster_window.py 2008-06-16 00:00:52 UTC (rev 9808) @@ -3358,8 +3358,12 @@ # Metacontact got toggled, update icon jid = model[titer][C_JID].decode('utf-8') account = model[titer][C_ACCOUNT].decode('utf-8') - self.draw_contact(jid, account) - # FIXME redraw child contacts + family = gajim.contacts.get_metacontacts_family(account, jid) + nearby_family, bb_jid, bb_account = \ + self._get_nearby_family_and_big_brother(family, account) + # Redraw all brothers to show pending events + for data in nearby_family: + self.draw_contact(data['jid'], data['account']) self._toggeling_row = False @@ -3394,8 +3398,12 @@ # Metacontact got toggled, update icon jid = model[titer][C_JID].decode('utf-8') account = model[titer][C_ACCOUNT].decode('utf-8') - self.draw_contact(jid, account) - # FIXME redraw child contacts + family = gajim.contacts.get_metacontacts_family(account, jid) + nearby_family, bb_jid, bb_account = \ + self._get_nearby_family_and_big_brother(family, account) + # Redraw all brothers to show pending events + for data in nearby_family: + self.draw_contact(data['jid'], data['account']) self._toggeling_row = False

1 0

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

15 Jun '08

Author: steve-e Date: 2008-06-16 01:51:40 +0200 (Mon, 16 Jun 2008) New Revision: 9807 Modified: trunk/src/roster_window.py Log: Do not hide big brother contacts when a child has pending events. Fixes #3921 Modified: trunk/src/roster_window.py =================================================================== --- trunk/src/roster_window.py 2008-06-15 23:03:51 UTC (rev 9806) +++ trunk/src/roster_window.py 2008-06-15 23:51:40 UTC (rev 9807) @@ -1331,8 +1331,24 @@ if type_ == 'contact': if gajim.config.get('showoffline'): return True - contact = gajim.contacts.get_first_contact_from_jid(account, jid) - return self.contact_is_visible(contact, account) + bb_jid = None + bb_account = None + family = gajim.contacts.get_metacontacts_family(account, jid) + if family: + nearby_family, bb_jid, bb_account = \ + self._get_nearby_family_and_big_brother(family, account) + if (bb_jid, bb_account) == (jid, account): + # Show the big brother if a child has pending events + for data in nearby_family: + jid = data['jid'] + account = data['account'] + contact = gajim.contacts.get_first_contact_from_jid(account, jid) + if self.contact_is_visible(contact, account): + return True + return False + else: + contact = gajim.contacts.get_first_contact_from_jid(account, jid) + return self.contact_is_visible(contact, account) if type_ == 'agent': return gajim.config.get('show_transports_group') return True

1 0

[commit-gajim] r9806 - in trunk/src: . common
by steve-e＠gajim.org 15 Jun '08

15 Jun '08

Author: steve-e Date: 2008-06-16 01:03:51 +0200 (Mon, 16 Jun 2008) New Revision: 9806 Modified: trunk/src/common/contacts.py trunk/src/roster_window.py Log: Two roster sort fixes. * Change metacontact ordering. Fallback to priority only if two contacts have the same show, not the other way round. * Move contacts that just signed out to the bottom of the group, not to the top. Modified: trunk/src/common/contacts.py =================================================================== --- trunk/src/common/contacts.py 2008-06-15 21:48:13 UTC (rev 9805) +++ trunk/src/common/contacts.py 2008-06-15 23:03:51 UTC (rev 9806) @@ -473,14 +473,14 @@ return 1 if transport1 and not transport2: return -1 + if show1 > show2: + return 1 + if show2 > show1: + return -1 if priority1 > priority2: return 1 if priority2 > priority1: return -1 - if show1 > show2: - return 1 - if show2 > show1: - return -1 server1 = common.gajim.get_server_from_jid(jid1) server2 = common.gajim.get_server_from_jid(jid2) myserver1 = common.gajim.config.get_per('accounts', account1, 'hostname') Modified: trunk/src/roster_window.py =================================================================== --- trunk/src/roster_window.py 2008-06-15 21:48:13 UTC (rev 9805) +++ trunk/src/roster_window.py 2008-06-15 23:03:51 UTC (rev 9806) @@ -1031,7 +1031,6 @@ if have_visible_children: # We are the big brother and have a visible family - # that is not just us for child_iter in child_iters: path = self.model.get_path(child_iter) @@ -1058,10 +1057,11 @@ self.model[child_iter][C_IMG] = img self.model[child_iter][C_NAME] = name else: - # All iters have the same icon (no expand/collapse) + # A normal contact or little brother state_images = self.get_appropriate_state_images(jid, icon_name = icon_name) + # All iters have the same icon (no expand/collapse) img = state_images[icon_name] for child_iter in child_iters: self.model[child_iter][C_IMG] = img @@ -1413,9 +1413,9 @@ if show2 == 6 and jid2 in gajim.to_be_removed[account2]: removing2 = True if removing1 and not removing2: + return 1 + if removing2 and not removing1: return -1 - if removing2 and not removing1: - return 1 if show1 < show2: return -1 elif show1 > show2: @@ -3343,6 +3343,7 @@ jid = model[titer][C_JID].decode('utf-8') account = model[titer][C_ACCOUNT].decode('utf-8') self.draw_contact(jid, account) + # FIXME redraw child contacts self._toggeling_row = False @@ -3378,6 +3379,7 @@ jid = model[titer][C_JID].decode('utf-8') account = model[titer][C_ACCOUNT].decode('utf-8') self.draw_contact(jid, account) + # FIXME redraw child contacts self._toggeling_row = False

1 0

[commit-gajim] r9805 - in trunk/src: . common
by jim++＠gajim.org 15 Jun '08

15 Jun '08

Author: jim++ Date: 2008-06-15 23:48:13 +0200 (Sun, 15 Jun 2008) New Revision: 9805 Modified: trunk/src/common/contacts.py trunk/src/gajim.py trunk/src/roster_window.py Log: groups : -Use a method to get_shown_groups (possibly more work to do (special group attribute)) -Show contact only if contact.ask, not according to modified xep 0162 logic. (I don't get neither the xep meaning, neither this modified logic, can you explain steve-e ?) -Remove contact before we modify it req_sub(). Else we can't remove it because iter is not found. -When removing a contact and we let him in see us (observer), manually set show to offline, so he is not set as visible. -Remove observer from observer group if we asked him auth (I mean before he answer). Xep 0162 say he is not an observer then. Fix contact staying in observer group when we get auth later. -Renaming groups seems fixed (it's an accident :p ) More work on group to follow Modified: trunk/src/common/contacts.py =================================================================== --- trunk/src/common/contacts.py 2008-06-15 18:13:03 UTC (rev 9804) +++ trunk/src/common/contacts.py 2008-06-15 21:48:13 UTC (rev 9805) @@ -32,7 +32,7 @@ self.jid = jid self.name = name self.contact_name = '' # nick choosen by contact - self.groups = groups # See below for what we do if it's empty + self.groups = groups self.show = show self.status = status self.sub = sub @@ -63,11 +63,6 @@ # this is contact's chatstate self.chatstate = chatstate self.last_status_time = last_status_time - if not self.groups: - if self.is_observer(): - self.groups = [_('Observers')] - else: - self.groups = [_('General')] self.mood = mood.copy() self.tune = tune.copy() self.activity = activity.copy() @@ -84,6 +79,20 @@ return self.contact_name return self.jid.split('@')[0] + def get_shown_groups(self): + ''' + ''' + if self.is_observer(): + return [_('Observers')] + elif self.is_groupchat(): + return [_('Groupchats')] + elif self.is_transport(): + return [_('Transports')] + elif not self.groups: + return [_('General')] + else: + return self.groups + def is_hidden_from_roster(self): '''if contact should not be visible in roster''' # XEP-0162: http://www.xmpp.org/extensions/xep-0162.html @@ -316,7 +325,7 @@ in_groups = True else: for group in groups: - if group in contact.groups: + if group in contact.get_shown_groups(): in_groups = True break Modified: trunk/src/gajim.py =================================================================== --- trunk/src/gajim.py 2008-06-15 18:13:03 UTC (rev 9804) +++ trunk/src/gajim.py 2008-06-15 21:48:13 UTC (rev 9805) @@ -1425,7 +1425,9 @@ else: re_add = False # if sub changed: remove and re-add, maybe observer status changed - if contacts[0].sub != sub: + # according to xep 0162, contact is not an observer anymore when + # we asked him is auth, so also remove him if ask changed + if contacts[0].sub != sub or contacts[0].ask != ask: self.roster.remove_contact(contacts[0].jid, account, force = True) re_add = True for contact in contacts: Modified: trunk/src/roster_window.py =================================================================== --- trunk/src/roster_window.py 2008-06-15 18:13:03 UTC (rev 9804) +++ trunk/src/roster_window.py 2008-06-15 21:48:13 UTC (rev 9805) @@ -183,7 +183,7 @@ acct = self._get_account_iter(account, model) found = [] # the contact iters. One per group - for group in contact.groups: + for group in contact.get_shown_groups(): group_iter = self._get_group_iter(group, account, acct, model) contact_iter = model.iter_children(group_iter) @@ -329,9 +329,11 @@ Keyword arguments: contact -- the contact to add account -- the contacts account - groups -- list of groups to add the contact to. (default groups in contact.groups). + groups -- list of groups to add the contact to. (default groups in + contact.get_shown_groups()). Parameter ignored when big_brother_contact is specified. - big_brother_contact -- if specified contact is added as child big_brother_contact. (default None) + big_brother_contact -- if specified contact is added as child + big_brother_contact. (default None) ''' added_iters = [] if big_brother_contact: @@ -344,7 +346,7 @@ # Do not confuse get_contact_iter # Sync groups of family members - contact.groups = big_brother_contact.groups[:] + contact.groups = big_brother_contact.get_shown_groups()[:] for child_iter in parent_iters: it = self.model.append(child_iter, (None, contact.get_shown_name(), @@ -353,7 +355,7 @@ else: # We are a normal contact. Add us to our groups. if not groups: - groups = contact.groups + groups = contact.get_shown_groups() for group in groups: child_iterG = self._get_group_iter(group, account, model=self.model) if not child_iterG: @@ -398,8 +400,7 @@ Keyword arguments: contact -- the contact to add account -- the contacts account - groups -- list of groups to remove the contact from. (default groups in contact.groups). - + groups -- list of groups to remove the contact from. ''' iters = self._get_contact_iter(contact.jid, account, contact, self.model) assert iters, '%s shall be removed but is not in roster' % contact.jid @@ -662,7 +663,7 @@ for c, acc in contacts: self.draw_contact(c.jid, acc) self.draw_avatar(c.jid, acc) - for group in contact.groups: + for group in contact.get_shown_groups(): self.draw_group(group, account) self.draw_account(account) @@ -714,7 +715,7 @@ # numbers will still be show gajim.contacts.remove_jid(account, jid) - for group in contact.groups: + for group in contact.get_shown_groups(): self.draw_group(group, account) self.draw_account(account) @@ -777,7 +778,6 @@ ''' 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: @@ -804,7 +804,6 @@ ''' self.remove_contact(jid, account, force = True) - for contact in gajim.contacts.get_contacts(account, jid): for group in groups: if group in contact.groups: @@ -963,7 +962,7 @@ if jid in gajim.connections[account].blocked_contacts: strike = True else: - for group in contact.groups: + for group in contact.get_shown_groups(): if group in gajim.connections[account].blocked_groups: strike = True break @@ -1072,7 +1071,7 @@ if family and not is_big_brother and not self.starting: self.draw_parent_contact(jid, account) - for group in contact.groups: + for group in contact.get_shown_groups(): # We need to make sure that _visible_func is called for # our groups otherwise we might not be shown iterG = self._get_group_iter(group, account, model = self.model) @@ -1157,7 +1156,7 @@ self.draw_contact(jid, account) self.draw_account(account) - for group in contact.groups: + for group in contact.get_shown_groups(): self.draw_group(group, account) self._adjust_group_expand_collapse_state(group, account) @@ -1279,13 +1278,11 @@ def contact_is_visible(self, contact, account): if self.contact_has_pending_roster_events(contact, account): return True - # XEP-0162 - hide = contact.is_hidden_from_roster() - if hide and contact.sub != 'from': - return False - showOffline = gajim.config.get('showoffline') - if (contact.show in ('offline', 'error') or hide) and not showOffline: + if contact.ask: + return True + + if contact.show in ('offline', 'error'): if contact.jid in gajim.to_be_removed[account]: return True return False @@ -1327,7 +1324,7 @@ for contact in gajim.contacts.iter_contacts(_acc): # Is this contact in this group ? (last part of if check if it's # self contact) - if group in contact.groups: + if group in contact.get_shown_groups(): if self.contact_is_visible(contact, _acc): return True return False @@ -1716,15 +1713,15 @@ sub = 'subscribe', keyID = keyID) gajim.contacts.add_contact(account, contact) else: - if not _('Not in Roster') in contact.groups: + if not _('Not in Roster') in contact.get_shown_groups(): dialogs.InformationDialog(_('Subscription request has been sent'), _('If "%s" accepts this request you will know his or her status.' ) % jid) return + self.remove_contact(contact.jid, account) contact.groups = groups if nickname: contact.name = nickname - self.remove_contact(contact.jid, account) self.add_contact(jid, account) def revoke_auth(self, widget, jid, account): @@ -2516,9 +2513,10 @@ if row_type in ('contact', 'agent'): if old_text == new_text: return - for u in gajim.contacts.get_contacts(account, jid): - u.name = new_text - gajim.connections[account].update_contact(jid, new_text, u.groups) + for contact in gajim.contacts.get_contacts(account, jid): + contact.name = new_text + gajim.connections[account].update_contact(jid, new_text, \ + contact.groups) self.draw_contact(jid, account) # Update opened chats for ctrl in gajim.interface.msg_win_mgr.get_controls(jid, account): @@ -2666,7 +2664,7 @@ ctrl.shutdown() contact = gajim.contacts.get_contact_with_highest_priority(account, jid) - if contact.groups == [_('Groupchats')]: + if contact.get_shown_groups() == [_('Groupchats')]: self.remove_groupchat(contact.jid, account) def on_send_single_message_menuitem_activate(self, widget, account, @@ -2947,6 +2945,8 @@ contact.name = '' contact.groups = [] contact.sub = 'from' + # we can't see him, but have to set it manually in contact + contact.show = 'offline' gajim.contacts.add_contact(account, contact) self.add_contact(contact.jid, account) def on_ok2(list_): @@ -4659,7 +4659,7 @@ for jid in gajim.contacts.get_jid_list(account): contact = gajim.contacts.get_contact_with_highest_priority(account, jid) - if group in contact.groups: + if group in contact.get_shown_groups(): if contact.show not in ('offline', 'error'): list_online.append((contact, account)) list_.append((contact, account)) @@ -4880,7 +4880,7 @@ history_menuitem.connect('activate', self.on_history, contact, account) - if _('Not in Roster') not in contact.groups: + if _('Not in Roster') not in contact.get_shown_groups(): # contact is in normal group edit_groups_menuitem.set_no_show_all(False) assign_openpgp_key_menuitem.set_no_show_all(False) @@ -4950,7 +4950,7 @@ if jid in gajim.connections[account].blocked_contacts: blocked = True else: - for group in contact.groups: + for group in contact.get_shown_groups(): if group in gajim.connections[account].blocked_groups: blocked = True break @@ -5048,7 +5048,7 @@ history_menuitem.connect('activate', self.on_history, contact, account) - if _('Not in Roster') not in contact.groups: + if _('Not in Roster') not in contact.get_shown_groups(): # contact is in normal group add_to_roster_menuitem.hide() add_to_roster_menuitem.set_no_show_all(True)

1 0

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

15 Jun '08

Author: asterix Date: 2008-06-15 20:13:03 +0200 (Sun, 15 Jun 2008) New Revision: 9804 Modified: trunk/src/common/helpers.py trunk/src/dialogs.py Log: add "other" to all sub-activities and fix "Having an appointment" activity. Fixes #4019, #3981 Modified: trunk/src/common/helpers.py =================================================================== --- trunk/src/common/helpers.py 2008-06-14 18:20:24 UTC (rev 9803) +++ trunk/src/common/helpers.py 2008-06-15 18:13:03 UTC (rev 9804) @@ -412,7 +412,7 @@ 'taking_a_shower':_('taking a shower'), 'jogging':_('jogging'), 'in_a_meeting': _('in a meeting'), 'in_a_car':_('in a car'), 'studying': _('studying'), 'swimming': _('swimming'), - 'having_coffee': _('having coffee')} + 'having_coffee': _('having coffee'), 'other': _('other')} if activities.has_key(activity): return activities[activity] else: Modified: trunk/src/dialogs.py =================================================================== --- trunk/src/dialogs.py 2008-06-14 18:20:24 UTC (rev 9803) +++ trunk/src/dialogs.py 2008-06-15 18:13:03 UTC (rev 9804) @@ -335,24 +335,24 @@ {'None': [], 'doing_chores': ['buying_groceries', 'cleaning', 'cooking', 'doing_maintenance', 'doing_the_dishes', 'doing_the_laundry', - 'gardening', 'running_an_errand', 'walking_the_dog'], - 'drinking': ['having_a_beer', 'having_coffee', 'having_tea'], + 'gardening', 'running_an_errand', 'walking_the_dog', 'other'], + 'drinking': ['having_a_beer', 'having_coffee', 'having_tea', 'other'], 'eating': ['having_a_snack', 'having_breakfast', 'having_dinner', - 'having_lunch'], + 'having_lunch', 'other'], 'excercising': ['cycling', 'hiking', 'jogging', 'playing_sports', - 'running', 'skiing', 'swimming', 'working_out'], + 'running', 'skiing', 'swimming', 'working_out', 'other'], 'grooming': ['at_the_spa', 'brushing_teeth', 'getting_a_haircut', - 'shaving','taking_a_bath', 'taking_a_shower'], + 'shaving','taking_a_bath', 'taking_a_shower', 'other'], 'having_appointment': [], 'inactive': ['day_off', 'hanging_out', 'on_vacation', 'scheduled_holiday', - 'sleeping'], + 'sleeping', 'other'], 'relaxing': ['gaming', 'going_out', 'partying', 'reading', 'rehearsing', 'shopping', 'socializing', 'sunbathing', 'watching_tv', - 'watching_a_movie'], - 'talking': ['in_real_life', 'on_the_phone', 'on_video_phone'], + 'watching_a_movie', 'other'], + 'talking': ['in_real_life', 'on_the_phone', 'on_video_phone', 'other'], 'traveling': ['commuting', 'cycling', 'driving', 'in_a_car', 'on_a_bus', - 'on_a_plane', 'on_a_train', 'on_a_trip', 'walking'], - 'working': ['coding', 'in_a_meeting', 'studying', 'writing']} + 'on_a_plane', 'on_a_train', 'on_a_trip', 'walking', 'other'], + 'working': ['coding', 'in_a_meeting', 'studying', 'writing', 'other']} def __init__(self, account): self.account = account self.xml = gtkgui_helpers.get_glade('change_activity_dialog.glade') @@ -428,6 +428,8 @@ if active2 > -1: subactivity = self.liststore2[active2][1].decode('utf-8') message = self.entry.get_text().decode('utf-8') + if subactivity is None: + subactivity = '' from common import pep if activity == 'None': pep.user_retract_activity(self.account)

1 0

[commit-gajim] r9803 - in branches/plugin-system: plugins plugins/roster_buttons src/plugins
by vardo＠gajim.org 14 Jun '08

14 Jun '08

Author: vardo Date: 2008-06-14 20:20:24 +0200 (Sat, 14 Jun 2008) New Revision: 9803 Added: branches/plugin-system/plugins/roster_buttons/ branches/plugin-system/plugins/roster_buttons/__init__.py branches/plugin-system/plugins/roster_buttons/plugin.py branches/plugin-system/plugins/roster_buttons/roster_buttons.glade Modified: branches/plugin-system/src/plugins/plugin.py branches/plugin-system/src/plugins/pluginmanager.py Log: Plugin can be a package (directory) now. Added example plugin that modifies roster window (with glade file). Added activate and deactivate methods to Plugin (used in forementioned RosterButtonsPlugin). Added: branches/plugin-system/plugins/roster_buttons/__init__.py =================================================================== --- branches/plugin-system/plugins/roster_buttons/__init__.py (rev 0) +++ branches/plugin-system/plugins/roster_buttons/__init__.py 2008-06-14 18:20:24 UTC (rev 9803) @@ -0,0 +1,4 @@ + +__all__ = ['RosterButtonsPlugin'] + +from plugin import RosterButtonsPlugin Added: branches/plugin-system/plugins/roster_buttons/plugin.py =================================================================== --- branches/plugin-system/plugins/roster_buttons/plugin.py (rev 0) +++ branches/plugin-system/plugins/roster_buttons/plugin.py 2008-06-14 18:20:24 UTC (rev 9803) @@ -0,0 +1,88 @@ +# -*- 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/>. +## + +''' +Roster buttons plug-in. + +:author: Mateusz Biliński <mateusz(a)bilinski.it> +:since: 06/10/2008 +:copyright: Copyright (2008) Mateusz Biliński <mateusz(a)bilinski.it> +:license: GPL +''' + +import sys + +import gtk +from common import i18n +from common import gajim + +from plugins import GajimPlugin +from plugins.helpers import log, log_calls + +class RosterButtonsPlugin(GajimPlugin): + name = u'Roster Buttons' + short_name = u'roster_buttons' + version = u'0.1' + description = u'''Adds quick action buttons to roster window.''' + authors = [u'Mateusz Biliński <mateusz(a)bilinski.it>'] + homepage = u'http://blog.bilinski.it' + + #@log_calls('RosterButtonsPlugin') + #def __init__(self): + #super(RosterButtonsPlugin, self).__init__() + + @log_calls('RosterButtonsPlugin') + def activate(self): + #log.debug('self.__path__==%s'%(self.__path__)) + self.GLADE_FILE_PATH = self.local_file_path('roster_buttons.glade') + self.xml = gtk.glade.XML(self.GLADE_FILE_PATH, root='roster_buttons_buttonbox', domain=i18n.APP) + self.buttonbox = self.xml.get_widget('roster_buttons_buttonbox') + + self.roster_vbox = gajim.interface.roster.xml.get_widget('roster_vbox2') + self.roster_vbox.pack_start(self.buttonbox, expand=False) + self.roster_vbox.reorder_child(self.buttonbox, 0) + + self.show_offline_contacts_menuitem = gajim.interface.roster.xml.get_widget('show_offline_contacts_menuitem') + + self.xml.signal_autoconnect(self) + + + @log_calls('RosterButtonsPlugin') + def deactivate(self): + self.roster_vbox.remove(self.buttonbox) + + self.buttonbox = None + self.xml = None + + @log_calls('RosterButtonsPlugin') + def on_roster_button_1_clicked(self, button): + #gajim.interface.roster.on_show_offline_contacts_menuitem_activate(None) + self.show_offline_contacts_menuitem.set_active(not self.show_offline_contacts_menuitem.get_active()) + + + @log_calls('RosterButtonsPlugin') + def on_roster_button_2_clicked(self, button): + pass + + @log_calls('RosterButtonsPlugin') + def on_roster_button_3_clicked(self, button): + pass + + @log_calls('RosterButtonsPlugin') + def on_roster_button_4_clicked(self, button): + pass + Added: branches/plugin-system/plugins/roster_buttons/roster_buttons.glade =================================================================== --- branches/plugin-system/plugins/roster_buttons/roster_buttons.glade (rev 0) +++ branches/plugin-system/plugins/roster_buttons/roster_buttons.glade 2008-06-14 18:20:24 UTC (rev 9803) @@ -0,0 +1,64 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd"> + +<glade-interface> + <widget class="GtkWindow" id="window1"> + <child> + <widget class="GtkHButtonBox" id="roster_buttons_buttonbox"> + <property name="visible">True</property> + <property name="homogeneous">True</property> + <property name="layout_style">GTK_BUTTONBOX_SPREAD</property> + <child> + <widget class="GtkButton" id="roster_button_1"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="tooltip_text">Show/Hide Offline Contacts</property> + <property name="label" translatable="yes">1</property> + <property name="response_id">0</property> + <signal name="clicked" handler="on_roster_button_1_clicked"/> + </widget> + </child> + <child> + <widget class="GtkButton" id="roster_button_2"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="label" translatable="yes">2</property> + <property name="response_id">0</property> + <signal name="clicked" handler="on_roster_button_2_clicked"/> + </widget> + <packing> + <property name="position">1</property> + </packing> + </child> + <child> + <widget class="GtkButton" id="roster_button_3"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="label" translatable="yes">3</property> + <property name="response_id">0</property> + <signal name="clicked" handler="on_roster_button_3_clicked"/> + </widget> + <packing> + <property name="position">2</property> + </packing> + </child> + <child> + <widget class="GtkButton" id="roster_button_4"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="label" translatable="yes">4</property> + <property name="response_id">0</property> + <signal name="clicked" handler="on_roster_button_4_clicked"/> + </widget> + <packing> + <property name="position">3</property> + </packing> + </child> + </widget> + </child> + </widget> +</glade-interface> Modified: branches/plugin-system/src/plugins/plugin.py =================================================================== --- branches/plugin-system/src/plugins/plugin.py 2008-06-14 16:49:48 UTC (rev 9802) +++ branches/plugin-system/src/plugins/plugin.py 2008-06-14 18:20:24 UTC (rev 9803) @@ -24,6 +24,8 @@ :license: GPL ''' +import os + from plugins.helpers import log_calls class GajimPlugin(object): @@ -117,6 +119,17 @@ def __del__(self): self._save_config() + @log_calls('GajimPlugin') + def local_file_path(self, file_name): + return os.path.join(self.__path__, file_name) + + @log_calls('GajimPlugin') + def activate(self): + pass + + @log_calls('GajimPlugin') + def deactivate(self): + pass class Config(dict): pass \ No newline at end of file Modified: branches/plugin-system/src/plugins/pluginmanager.py =================================================================== --- branches/plugin-system/src/plugins/pluginmanager.py 2008-06-14 16:49:48 UTC (rev 9802) +++ branches/plugin-system/src/plugins/pluginmanager.py 2008-06-14 18:20:24 UTC (rev 9803) @@ -171,6 +171,7 @@ if success: self.active_plugins.append(plugin_object) + plugin_object.activate() plugin_class._instance = plugin_object plugin_class._active = True @@ -193,6 +194,7 @@ self.gui_extension_points_handlers[gui_extpoint_name].remove(gui_extpoint_handlers) # removing plug-in from active plug-ins list + plugin_object.deactivate() self.active_plugins.remove(plugin_object) plugin_object.__class__._active = False plugin_object.__class__._instance = None @@ -249,28 +251,57 @@ plugins_found = [] if os.path.isdir(path): dir_list = os.listdir(path) - log.debug(dir_list) + #log.debug(dir_list) sys.path.insert(0, path) - log.debug(sys.path) + #log.debug(sys.path) - for file_name in fnmatch.filter(dir_list, '*.py'): - log.debug('- "%s"'%(file_name)) - file_path = os.path.join(path, file_name) + for elem_name in dir_list: + log.debug('- "%s"'%(elem_name)) + file_path = os.path.join(path, elem_name) log.debug(' "%s"'%(file_path)) - if os.path.isfile(file_path): - module_name = os.path.splitext(file_name)[0] - module = __import__(module_name) - for module_attr_name in [f_name for f_name in dir(module) - if not (f_name.startswith('__') or - f_name.endswith('__'))]: + + module = None + + if os.path.isfile(file_path) and fnmatch.fnmatch(file_path,'*.py'): + module_name = os.path.splitext(elem_name)[0] + log.debug('Possible module detected.') + try: + module = __import__(module_name) + log.debug('Module imported.') + except ValueError, value_error: + log.debug('Module not imported successfully. ValueError: %s'%(value_error)) + except ImportError, import_error: + log.debug('Module not imported successfully. ImportError: %s'%(import_error)) + + elif os.path.isdir(file_path): + module_name = elem_name + file_path += os.path.sep + log.debug('Possible package detected.') + try: + module = __import__(module_name) + log.debug('Package imported.') + except ValueError, value_error: + log.debug('Package not imported successfully. ValueError: %s'%(value_error)) + except ImportError, import_error: + log.debug('Package not imported successfully. ImportError: %s'%(import_error)) + + + if module: + log.debug('Attributes processing started') + for module_attr_name in [attr_name for attr_name in dir(module) + if not (attr_name.startswith('__') or + attr_name.endswith('__'))]: 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') + #log.debug('file_path: %s\nabspath: %s\ndirname: %s'%(file_path, os.path.abspath(file_path), os.path.dirname(os.path.abspath(file_path)))) + #log.debug('file_path: %s\ndirname: %s\nabspath: %s'%(file_path, os.path.dirname(file_path), os.path.abspath(os.path.dirname(file_path)))) + module_attr.__path__ = os.path.abspath(os.path.dirname(file_path)) plugins_found.append(module_attr) except TypeError, type_error: log.debug('module_attr: %s, error : %s'%(

1 0

[commit-gajim] r9802 - in trunk/src: . common
by bct＠gajim.org 14 Jun '08

14 Jun '08

Author: bct Date: 2008-06-14 18:49:48 +0200 (Sat, 14 Jun 2008) New Revision: 9802 Modified: trunk/src/chat_control.py trunk/src/common/events.py trunk/src/common/stanza_session.py trunk/src/gajim.py Log: pass the ChatControl around with printed_chat events Modified: trunk/src/chat_control.py =================================================================== --- trunk/src/chat_control.py 2008-06-14 08:43:20 UTC (rev 9801) +++ trunk/src/chat_control.py 2008-06-14 16:49:48 UTC (rev 9802) @@ -710,7 +710,7 @@ show_in_systray = notify.get_show_in_systray(event, self.account, self.contact, type_) - event = gajim.events.create_event(type_, (self.session,), + event = gajim.events.create_event(type_, (self,), show_in_roster = show_in_roster, show_in_systray = show_in_systray) gajim.events.add_event(self.account, full_jid, event) Modified: trunk/src/common/events.py =================================================================== --- trunk/src/common/events.py 2008-06-14 08:43:20 UTC (rev 9801) +++ trunk/src/common/events.py 2008-06-14 16:49:48 UTC (rev 9802) @@ -41,6 +41,7 @@ where kind in error, incoming file-*: file_props gc_msg: None + printed_chat: control printed_*: None messages that are already printed in chat, but not read''' self.type_ = type_ Modified: trunk/src/common/stanza_session.py =================================================================== --- trunk/src/common/stanza_session.py 2008-06-14 08:43:20 UTC (rev 9801) +++ trunk/src/common/stanza_session.py 2008-06-14 16:49:48 UTC (rev 9802) @@ -58,7 +58,7 @@ for event in gajim.events.get_events(self.conn.name, self.jid, types=types): # the event wasn't in this session if (event.type_ == 'chat' and event.parameters[8] != self) or \ - (event.type_ == 'printed_chat' and event.parameters[0] != self): + (event.type_ == 'printed_chat' and event.parameters[0].session != self): continue # events.remove_events returns True when there were no events Modified: trunk/src/gajim.py =================================================================== --- trunk/src/gajim.py 2008-06-14 08:43:20 UTC (rev 9801) +++ trunk/src/gajim.py 2008-06-14 16:49:48 UTC (rev 9802) @@ -2260,20 +2260,17 @@ if not event: event = gajim.events.get_first_event(account, jid, type_) - session = None - if type_ == 'printed_chat': - session = event.parameters[0] + ctrl = event.parameters[0] elif type_ == 'chat': session = event.parameters[8] - - if session and session.control: ctrl = session.control - elif type_ == '' and self.msg_win_mgr.has_window(fjid, account): + + if type_ == '' and self.msg_win_mgr.has_window(fjid, account): # assume that the most recently updated control we have for this party # is the one that this event was in ctrl = self.msg_win_mgr.get_chat_controls(fjid, account)[0] - else: + elif not ctrl: highest_contact = gajim.contacts.get_contact_with_highest_priority( account, jid) # jid can have a window if this resource was lower when he sent

1 0

[commit-gajim] r9801 - in trunk/src: . common
by bct＠gajim.org 14 Jun '08

14 Jun '08

Author: bct Date: 2008-06-14 10:43:20 +0200 (Sat, 14 Jun 2008) New Revision: 9801 Modified: trunk/src/common/helpers.py trunk/src/gajim.py Log: hopefully fix the last of the get_control calls (fixes #4018) Modified: trunk/src/common/helpers.py =================================================================== --- trunk/src/common/helpers.py 2008-06-13 22:54:36 UTC (rev 9800) +++ trunk/src/common/helpers.py 2008-06-14 08:43:20 UTC (rev 9801) @@ -960,18 +960,23 @@ account, contact.jid) # Look for a chat control that has the given resource, or default to # one without resource - ctrl = gajim.interface.msg_win_mgr.get_control(full_jid_with_resource, + ctrls = gajim.interface.msg_win_mgr.get_chat_controls(full_jid_with_resource, account) - if ctrl: - return ctrl + if ctrls: + return ctrls[0] elif not highest_contact or not highest_contact.resource: # unknow contact or offline message - return gajim.interface.msg_win_mgr.get_control(contact.jid, account) + pass # fall through, handle this at the end elif highest_contact and contact.resource != \ highest_contact.resource: return None - return gajim.interface.msg_win_mgr.get_control(contact.jid, account) + ctrls = gajim.interface.msg_win_mgr.get_chat_controls(contact.jid, account) + if ctrls: + return ctrls[0] + else: + return None + def reduce_chars_newlines(text, max_chars = 0, max_lines = 0): '''Cut the chars after 'max_chars' on each line and show only the first 'max_lines'. Modified: trunk/src/gajim.py =================================================================== --- trunk/src/gajim.py 2008-06-13 22:54:36 UTC (rev 9800) +++ trunk/src/gajim.py 2008-06-14 08:43:20 UTC (rev 9801) @@ -798,6 +798,11 @@ full_jid_with_resource = array[0] jids = full_jid_with_resource.split('/', 1) jid = jids[0] + + session = None + if len(array) > 5: + session = array[5] + gc_control = self.msg_win_mgr.get_gc_control(jid, account) if not gc_control and \ jid in self.minimized_controls[account]: @@ -807,8 +812,17 @@ if gc_control: if len(jids) > 1: # it's a pm nick = jids[1] - if not self.msg_win_mgr.get_control(full_jid_with_resource, - account): + + ctrl = None + if session: + ctrl = session.control + + if not ctrl: + ctrls = self.msg_win_mgr.get_chat_controls(full_jid_with_resource, account) + if ctrls: + ctrl = ctrls[0] + + if not ctrl: tv = gc_control.list_treeview model = tv.get_model() iter = gc_control.get_contact_iter(nick) @@ -818,8 +832,8 @@ show = 'offline' gc_c = gajim.contacts.create_gc_contact(room_jid = jid, name = nick, show = show) - self.new_private_chat(gc_c, account) - ctrl = self.msg_win_mgr.get_control(full_jid_with_resource, account) + ctrl = self.new_private_chat(gc_c, account, session) + ctrl.print_conversation('Error %s: %s' % (array[1], array[2]), 'status') return @@ -2673,6 +2687,8 @@ # We call this here to avoid race conditions with widget validation session.control.read_queue() + return session.control + def new_chat(self, contact, account, resource = None, session = None): # Get target window, create a control, and associate it with the window type_ = message_control.TYPE_CHAT

1 0

← Newer
1
...
4
5
6
7
8
9
10
...
15
Older →

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