Commits July 2008

commits@gajim.org

7 participants
229 discussions

[commit-gajim] r10099 - trunk/src
by asterix＠gajim.org 31 Jul '08

31 Jul '08

Author: asterix Date: 2008-07-31 22:12:23 +0200 (Thu, 31 Jul 2008) New Revision: 10099 Modified: trunk/src/systray.py Log: don't delay click on systray if there is no waiting event. Fixes #2932 Modified: trunk/src/systray.py =================================================================== --- trunk/src/systray.py 2008-07-31 20:08:36 UTC (rev 10098) +++ trunk/src/systray.py 2008-07-31 20:12:23 UTC (rev 10099) @@ -321,15 +321,20 @@ def on_clicked(self, widget, event): self.on_tray_leave_notify_event(widget, None) if event.type == gtk.gdk._2BUTTON_PRESS: + if len(gajim.events.get_systray_events()) == 0: + return self.double_click = True self.on_middle_click() if event.type != gtk.gdk.BUTTON_PRESS: return if event.button == 1: # Left click - if self.double_click_id: - gobject.source_remove(self.double_click_id) - self.double_click_id = gobject.timeout_add(self.double_click_time, - self.on_left_click) + if len(gajim.events.get_systray_events()) == 0: + self.on_left_click() + else: + if self.double_click_id: + gobject.source_remove(self.double_click_id) + self.double_click_id = gobject.timeout_add( + self.double_click_time, self.on_left_click) elif event.button == 2: # middle click self.on_middle_click() elif event.button == 3: # right click

1 0

[commit-gajim] r10098 - trunk/src
by asterix＠gajim.org 31 Jul '08

31 Jul '08

Author: asterix Date: 2008-07-31 22:08:36 +0200 (Thu, 31 Jul 2008) New Revision: 10098 Modified: trunk/src/gajim.py Log: fix traceback when canceling GPG passphrase dialog Modified: trunk/src/gajim.py =================================================================== --- trunk/src/gajim.py 2008-07-31 19:24:34 UTC (rev 10097) +++ trunk/src/gajim.py 2008-07-31 20:08:36 UTC (rev 10098) @@ -468,8 +468,7 @@ def _cancel(): # user cancelled, continue without GPG - gajim.connections[account].gpg_passphrase(None) - callback() + self.complete(None) def _ok(passphrase, checked, count): if count < 3:

1 0

[commit-gajim] r10097 - trunk/src
by asterix＠gajim.org 31 Jul '08

31 Jul '08

Author: asterix Date: 2008-07-31 21:24:34 +0200 (Thu, 31 Jul 2008) New Revision: 10097 Modified: trunk/src/gajim.py Log: [avm] add a PassphraseRequest class that queue GPG passphrase requests. Fixes #4164 Modified: trunk/src/gajim.py =================================================================== --- trunk/src/gajim.py 2008-07-31 18:23:14 UTC (rev 10096) +++ trunk/src/gajim.py 2008-07-31 19:24:34 UTC (rev 10097) @@ -432,6 +432,64 @@ def process(self): self.check_time_events() +class PassphraseRequest: + def __init__(self, keyid): + self.keyid = keyid + self.callbacks = [] + self.dialog_created = False + self.completed = False + + def run_callback(self, account, callback): + gajim.connections[account].gpg_passphrase(self.passphrase) + callback() + + def add_callback(self, account, cb): + if self.completed: + self.run_callback(account, cb) + else: + self.callbacks.append((account, cb)) + if not self.dialog_created: + self.create_dialog(account) + + def complete(self, passphrase): + self.passphrase = passphrase + self.completed = True + if passphrase is not None: + gobject.timeout_add(30000, gajim.interface.forget_gpg_passphrase, + self.keyid) + for (account, cb) in self.callbacks: + self.run_callback(account, cb) + del self.callbacks + + def create_dialog(self, account): + title = _('Passphrase Required') + second = _('Enter GPG key passphrase for key %s (account %s).' + ) % (self.keyid, account) + + def _cancel(): + # user cancelled, continue without GPG + gajim.connections[account].gpg_passphrase(None) + callback() + + def _ok(passphrase, checked, count): + if count < 3: + done = gajim.connections[account].test_gpg_passphrase(passphrase) + else: + done = True + passphrase = None + + if done: + self.complete(passphrase) + else: + # ask again + dialogs.PassphraseDialog(_('Wrong Passphrase'), + _('Please retype your GPG passphrase or press Cancel.'), + ok_handler=(_ok, count + 1), cancel_handler=_cancel) + + dialogs.PassphraseDialog(title, second, ok_handler=(_ok, 0), + cancel_handler=_cancel) + self.dialog_created = True + class Interface: ################################################################################ @@ -1409,42 +1467,13 @@ #('GPG_PASSWORD_REQUIRED', account, (callback,)) callback = array[0] keyid = gajim.config.get_per('accounts', account, 'keyid') - if self.gpg_passphrase.has_key(keyid): - gajim.connections[account].gpg_passphrase(self.gpg_passphrase[keyid]) - callback() - return + if keyid in self.gpg_passphrase: + request = self.gpg_passphrase[keyid] + else: + request = PassphraseRequest(keyid) + self.gpg_passphrase[keyid] = request + request.add_callback(account, callback) - title = _('Passphrase Required') - second = _('Enter GPG key passphrase for account %s.') % account - - def _cancel(): - # user cancelled, continue without GPG - gajim.connections[account].gpg_passphrase(None) - callback() - - def _ok(passphrase, checked, count): - if count < 3: - count += 1 - done = gajim.connections[account].test_gpg_passphrase(passphrase) - else: - done = True - passphrase = None - - if done: - if passphrase is not None: - self.gpg_passphrase[keyid] = passphrase - gobject.timeout_add(30000, self.forget_gpg_passphrase, keyid) - gajim.connections[account].gpg_passphrase(passphrase) - callback() - else: - # ask again - dialogs.PassphraseDialog(_('Wrong Passphrase'), - _('Please retype your GPG passphrase or press Cancel.'), - ok_handler=(_ok, count), cancel_handler=_cancel) - - dialogs.PassphraseDialog(title, second, ok_handler=(_ok, 0), - cancel_handler=_cancel) - def handle_event_roster_info(self, account, array): #('ROSTER_INFO', account, (jid, name, sub, ask, groups)) jid = array[0]

1 0

[commit-gajim] r10096 - trunk/src
by steve-e＠gajim.org 31 Jul '08

31 Jul '08

Author: steve-e Date: 2008-07-31 20:23:14 +0200 (Thu, 31 Jul 2008) New Revision: 10096 Modified: trunk/src/roster_window.py Log: Some coding standards. Modified: trunk/src/roster_window.py =================================================================== --- trunk/src/roster_window.py 2008-07-31 15:30:20 UTC (rev 10095) +++ trunk/src/roster_window.py 2008-07-31 18:23:14 UTC (rev 10096) @@ -919,7 +919,7 @@ # FIXME: maybe move to gajim.py def remove_to_be_removed(self, jid, account): - if not gajim.interface.instances.has_key(account): + if account not in gajim.interface.instances: # Account has been deleted during the timeout that called us return if jid in gajim.newly_added[account]: @@ -1073,8 +1073,7 @@ contact = gajim.contacts.get_highest_prio_contact_from_contacts( contact_instances) - child_iters = self._get_contact_iter(jid, account, - contact, self.model) + child_iters = self._get_contact_iter(jid, account, contact, self.model) if not child_iters: return False @@ -1099,8 +1098,7 @@ strike = True else: for group in contact.get_shown_groups(): - if group in \ - gajim.connections[account].blocked_groups: + if group in gajim.connections[account].blocked_groups: strike = True break if strike: @@ -1123,13 +1121,10 @@ # useless to add account name if account_ == account: continue - for jid_ in \ - gajim.contacts.get_jid_list(account_): - contact_ = gajim.contacts. \ - get_first_contact_from_jid( + for jid_ in gajim.contacts.get_jid_list(account_): + contact_ = gajim.contacts.get_first_contact_from_jid( account_, jid_) - if contact_.get_shown_name() == \ - contact.get_shown_name() and \ + if contact_.get_shown_name() == contact.get_shown_name() and \ (jid_, account_) != (jid, account): add_acct = True break @@ -1142,8 +1137,7 @@ # add status msg, if not empty, under contact name in # the treeview - if contact.status \ - and gajim.config.get('show_status_msgs_in_roster'): + if contact.status and gajim.config.get('show_status_msgs_in_roster'): status = contact.status.strip() if status != '': status = helpers.reduce_chars_newlines(status, @@ -1151,10 +1145,8 @@ # escape markup entities and make them small # italic and fg color color is calcuted to be # always readable - color = gtkgui_helpers._get_fade_color( - self.tree, selected, focus) - colorstring = '#%04x%04x%04x' % (color.red, - color.green, color.blue) + color = gtkgui_helpers._get_fade_color(self.tree, selected, focus) + colorstring = '#%04x%04x%04x' % (color.red, color.green, color.blue) name += '\n<span size="small" style="italic" ' \ 'foreground="%s">%s</span>' % ( colorstring, @@ -1164,8 +1156,7 @@ # look if another resource has awaiting events for c in contact_instances: c_icon_name = helpers.get_icon_name_to_show(c, account) - if c_icon_name \ - in ('event', 'muc_active', 'muc_inactive'): + if c_icon_name in ('event', 'muc_active', 'muc_inactive'): icon_name = c_icon_name break @@ -1175,8 +1166,7 @@ have_visible_children = False if family: nearby_family, bb_jid, bb_account = \ - self._get_nearby_family_and_big_brother( - family, account) + self._get_nearby_family_and_big_brother(family, account) is_big_brother = (jid, account) == (bb_jid, bb_account) iters = self._get_contact_iter(jid, account) have_visible_children = iters \ @@ -1186,35 +1176,25 @@ # We are the big brother and have a visible family for child_iter in child_iters: child_path = self.model.get_path(child_iter) - path = self.modelfilter. \ - convert_child_path_to_path(child_path) + path = self.modelfilter.convert_child_path_to_path(child_path) - if not self.tree.row_expanded(path) \ - and icon_name != 'event': - iterC = self.model.iter_children( - child_iter) + if not self.tree.row_expanded(path) and icon_name != 'event': + iterC = self.model.iter_children(child_iter) while iterC: # a child has awaiting messages? - jidC = self.model[iterC] \ - [C_JID].decode('utf-8') - accountC = self.model \ - [iterC][C_ACCOUNT]. \ - decode('utf-8') - if len(gajim.events.get_events( - accountC, jidC)): + jidC = self.model[iterC][C_JID].decode('utf-8') + accountC = self.model[iterC][C_ACCOUNT].decode('utf-8') + if len(gajim.events.get_events(accountC, jidC)): icon_name = 'event' break - iterC = self.model.iter_next( - iterC) + iterC = self.model.iter_next(iterC) if self.tree.row_expanded(path): - state_images = self. \ - get_appropriate_state_images( + state_images = self.get_appropriate_state_images( jid, size = 'opened', icon_name = icon_name) else: - state_images = self. \ - get_appropriate_state_images( + state_images = self.get_appropriate_state_images( jid, size = 'closed', icon_name = icon_name) @@ -1241,12 +1221,10 @@ 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) + iterG = self._get_group_iter(group, account, model = self.model) if iterG: # it's not self contact - self.model[iterG][C_JID] = \ - self.model[iterG][C_JID] + self.model[iterG][C_JID] = self.model[iterG][C_JID] return False @@ -1258,11 +1236,10 @@ jid = self.model[iters[0]][C_JID] jid = jid.decode('utf-8') contact = gajim.contacts.get_contact(account, jid) - if contact.mood.has_key('mood') \ - and contact.mood['mood'].strip() in MOODS: + if 'mood' in contact.mood and contact.mood['mood'].strip() in MOODS: pixbuf = gtkgui_helpers.load_mood_icon( contact.mood['mood'].strip()).get_pixbuf() - elif contact.mood.has_key('mood'): + elif 'mood' in contact.mood: pixbuf = gtkgui_helpers.load_mood_icon( 'unknown').get_pixbuf() else: @@ -1279,12 +1256,11 @@ jid = self.model[iters[0]][C_JID] jid = jid.decode('utf-8') contact = gajim.contacts.get_contact(account, jid) - if contact.activity.has_key('activity') \ + if 'activity' in contact.activity \ and contact.activity['activity'].strip() in ACTIVITIES: pixbuf = gtkgui_helpers.load_activity_icon( - contact.activity['activity'].strip()). \ - get_pixbuf() - elif contact.activity.has_key('activity'): + contact.activity['activity'].strip()).get_pixbuf() + elif 'activity' in contact.activity: pixbuf = gtkgui_helpers.load_activity_icon( 'unknown').get_pixbuf() else: @@ -1301,8 +1277,7 @@ jid = self.model[iters[0]][C_JID] jid = jid.decode('utf-8') contact = gajim.contacts.get_contact(account, jid) - if contact.tune.has_key('artist') \ - or contact.tune.has_key('title'): + if contact.tune.has_key('artist') or contact.tune.has_key('title'): pixbuf = gtk.gdk.pixbuf_new_from_file( '../data/emoticons/static/music.png') else: @@ -1680,7 +1655,7 @@ # Most of the logic SHOULD NOT be done at GUI level if account not in gajim.contacts.get_accounts(): gajim.contacts.add_account(account) - if not gajim.groups.has_key(account): + if account not in gajim.groups: gajim.groups[account] = {} for jid in array.keys(): # Remove the contact in roster. It might has changed @@ -1724,7 +1699,7 @@ gajim.connections[account].request_vcard(jid_with_resource) else: host = gajim.get_server_from_jid(contact1.jid) - if not gajim.transport_avatar[account].has_key(host): + if host not in gajim.transport_avatar[account]: gajim.transport_avatar[account][host] = [contact1.jid] else: gajim.transport_avatar[account][host].append(contact1.jid)

1 0

[commit-gajim] r10095 - in branches/plugin-system: plugins plugins/banner_tweaks src src/plugins
by vardo＠gajim.org 31 Jul '08

31 Jul '08

Author: vardo Date: 2008-07-31 17:30:20 +0200 (Thu, 31 Jul 2008) New Revision: 10095 Added: branches/plugin-system/plugins/banner_tweaks/ branches/plugin-system/plugins/banner_tweaks/__init__.py branches/plugin-system/plugins/banner_tweaks/config_dialog.glade branches/plugin-system/plugins/banner_tweaks/plugin.py Modified: branches/plugin-system/src/chat_control.py branches/plugin-system/src/plugins/pluginmanager.py Log: Added files with Banner Tweaks plugin (initial version). Few changes to PluginManager. Added new GUI extension point related to draw_banner in ChatControlBase. Added: branches/plugin-system/plugins/banner_tweaks/__init__.py =================================================================== --- branches/plugin-system/plugins/banner_tweaks/__init__.py (rev 0) +++ branches/plugin-system/plugins/banner_tweaks/__init__.py 2008-07-31 15:30:20 UTC (rev 10095) @@ -0,0 +1,2 @@ + +from plugin import BannerTweaksPlugin \ No newline at end of file Added: branches/plugin-system/plugins/banner_tweaks/config_dialog.glade =================================================================== --- branches/plugin-system/plugins/banner_tweaks/config_dialog.glade (rev 0) +++ branches/plugin-system/plugins/banner_tweaks/config_dialog.glade 2008-07-31 15:30:20 UTC (rev 10095) @@ -0,0 +1,73 @@ +<?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="GtkVBox" id="banner_tweaks_config_vbox"> + <property name="visible">True</property> + <property name="border_width">9</property> + <property name="spacing">4</property> + <child> + <widget class="GtkCheckButton" id="show_banner_image_checkbutton"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="tooltip" translatable="yes">If checked, status icon will be displayed in chat window banner.</property> + <property name="label" translatable="yes">Display status icon</property> + <property name="response_id">0</property> + <property name="draw_indicator">True</property> + <signal name="toggled" handler="on_show_banner_image_checkbutton_toggled"/> + </widget> + <packing> + <property name="expand">False</property> + </packing> + </child> + <child> + <widget class="GtkCheckButton" id="show_banner_online_msg_checkbutton"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="tooltip" translatable="yes">If checked, status message of contact will be displayed in chat window banner.</property> + <property name="label" translatable="yes">Display status message of contact</property> + <property name="response_id">0</property> + <property name="draw_indicator">True</property> + <signal name="toggled" handler="on_show_banner_online_msg_checkbutton_toggled"/> + </widget> + <packing> + <property name="expand">False</property> + <property name="position">1</property> + </packing> + </child> + <child> + <widget class="GtkCheckButton" id="show_banner_resource_checkbutton"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="tooltip" translatable="yes">If checked, resource name of contact will be displayed in chat window banner.</property> + <property name="label" translatable="yes">Display resource name of contact</property> + <property name="response_id">0</property> + <property name="draw_indicator">True</property> + <signal name="toggled" handler="on_show_banner_resource_checkbutton_toggled"/> + </widget> + <packing> + <property name="expand">False</property> + <property name="position">2</property> + </packing> + </child> + <child> + <widget class="GtkCheckButton" id="banner_small_fonts_checkbutton"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="tooltip" translatable="yes">If checked, smaller font will be used to display resource name and contact name in chat window banner.</property> + <property name="label" translatable="yes">Use small fonts for contact name and resource name</property> + <property name="response_id">0</property> + <property name="draw_indicator">True</property> + <signal name="toggled" handler="on_banner_small_fonts_checkbutton_toggled"/> + </widget> + <packing> + <property name="expand">False</property> + <property name="position">3</property> + </packing> + </child> + </widget> + </child> + </widget> +</glade-interface> Added: branches/plugin-system/plugins/banner_tweaks/plugin.py =================================================================== --- branches/plugin-system/plugins/banner_tweaks/plugin.py (rev 0) +++ branches/plugin-system/plugins/banner_tweaks/plugin.py 2008-07-31 15:30:20 UTC (rev 10095) @@ -0,0 +1,135 @@ +# -*- 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/>. +## + +''' +Adjustable chat window banner. + +Includes tweaks to make it compact. + +Based on patch by pb in ticket #4133: +http://trac.gajim.org/attachment/ticket/4133/gajim-chatbanneroptions-svn10008.patch + +:author: Mateusz Biliński <mateusz(a)bilinski.it> +:since: 30 July 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 +from plugins.gui import GajimPluginConfigDialog + +class BannerTweaksPlugin(GajimPlugin): + name = u'Banner Tweaks' + short_name = u'banner_tweaks' + version = u'0.1' + description = u'''Allows user to tweak chat window banner appearance (eg. make it compact). + +Based on patch by pb in ticket #4133: +http://trac.gajim.org/attachment/ticket/4133''' + authors = [u'Mateusz Biliński <mateusz(a)bilinski.it>'] + homepage = u'http://blog.bilinski.it' + + @log_calls('BannerTweaksPlugin') + def init(self): + self.config_dialog = BannerTweaksPluginConfigDialog(self) + + self.gui_extension_points = { + 'chat_control_base_draw_banner' : (self.chat_control_base_draw_banner_called, + self.chat_control_base_draw_banner_deactivation) + } + + self.config_default_values = {'show_banner_image': (True, _('If True, Gajim will display a status icon in the banner of chat windows.')), + 'show_banner_online_msg': (True, _('If True, Gajim will display the status message of the contact in the banner of chat windows.')), + 'show_banner_resource': (False, _('If True, Gajim will display the resource name of the contact in the banner of chat windows.')), + 'banner_small_fonts': (False, _('If True, Gajim will use small fonts for contact name and resource name in the banner of chat windows.')), + 'old_chat_avatar_height' : (52, _('chat_avatar_height value before plugin was activated')), + } + + def activate(self): + self.config['old_chat_avatar_height'] = gajim.config.get('chat_avatar_height') + #gajim.config.set('chat_avatar_height', 28) + + def deactivate(self): + gajim.config.set('chat_avatar_height', self.config['old_chat_avatar_height']) + + def chat_control_base_draw_banner_called(self, chat_control): + if not self.config['show_banner_online_msg']: + chat_control.banner_status_label.hide() + chat_control.banner_status_label.set_no_show_all(True) + status_text = '' + chat_control.banner_status_label.set_markup(status_text) + + if not self.config['show_banner_image']: + banner_status_img = chat_control.xml.get_widget('banner_status_image') + banner_status_img.clear() + + def chat_control_base_draw_banner_deactivation(self, chat_control): + pass + #chat_control.draw_banner() + + #@log_calls('BannerTweaksPlugin') + #def connect_with_chat_control(self, chat_control): + #d = {} + #banner_status_img = chat_control.xml.get_widget('banner_status_image') + #h_id = banner_status_img.connect('state-changed', self.on_banner_status_img_state_changed, chat_control) + #d['banner_img_h_id'] = h_id + + #chat_control.banner_tweaks_plugin_data = d + + #@log_calls('BannerTweaksPlugin') + #def disconnect_from_chat_control(self, chat_control): + #pass + +class BannerTweaksPluginConfigDialog(GajimPluginConfigDialog): + def init(self): + self.GLADE_FILE_PATH = self.plugin.local_file_path('config_dialog.glade') + self.xml = gtk.glade.XML(self.GLADE_FILE_PATH, root='banner_tweaks_config_vbox', domain=i18n.APP) + self.config_vbox = self.xml.get_widget('banner_tweaks_config_vbox') + self.child.pack_start(self.config_vbox) + + self.show_banner_image_checkbutton = self.xml.get_widget('show_banner_image_checkbutton') + self.show_banner_online_msg_checkbutton = self.xml.get_widget('show_banner_online_msg_checkbutton') + self.show_banner_resource_checkbutton = self.xml.get_widget('show_banner_resource_checkbutton') + self.banner_small_fonts_checkbutton = self.xml.get_widget('banner_small_fonts_checkbutton') + + self.xml.signal_autoconnect(self) + + def on_run(self): + self.show_banner_image_checkbutton.set_active(self.plugin.config['show_banner_image']) + self.show_banner_online_msg_checkbutton.set_active(self.plugin.config['show_banner_online_msg']) + self.show_banner_resource_checkbutton.set_active(self.plugin.config['show_banner_resource']) + self.banner_small_fonts_checkbutton.set_active(self.plugin.config['banner_small_fonts']) + + def on_show_banner_image_checkbutton_toggled(self, button): + self.plugin.config['show_banner_image'] = button.get_active() + + def on_show_banner_online_msg_checkbutton_toggled(self, button): + self.plugin.config['show_banner_online_msg'] = button.get_active() + + def on_show_banner_resource_checkbutton_toggled(self, button): + self.plugin.config['show_banner_resource'] = button.get_active() + + def on_banner_small_fonts_checkbutton_toggled(self, button): + self.plugin.config['banner_small_fonts'] = button.get_active() + \ No newline at end of file Modified: branches/plugin-system/src/chat_control.py =================================================================== --- branches/plugin-system/src/chat_control.py 2008-07-31 13:34:19 UTC (rev 10094) +++ branches/plugin-system/src/chat_control.py 2008-07-31 15:30:20 UTC (rev 10095) @@ -109,6 +109,8 @@ ''' self.draw_banner_text() self._update_banner_state_image() + gajim.plugin_manager.gui_extension_point('chat_control_base_draw_banner', + self) # Derived types MAY implement this def draw_banner_text(self): Modified: branches/plugin-system/src/plugins/pluginmanager.py =================================================================== --- branches/plugin-system/src/plugins/pluginmanager.py 2008-07-31 13:34:19 UTC (rev 10094) +++ branches/plugin-system/src/plugins/pluginmanager.py 2008-07-31 15:30:20 UTC (rev 10095) @@ -194,6 +194,12 @@ return success def deactivate_plugin(self, plugin): + # remove GUI extension points handlers (provided by plug-in) from + # handlers list + for gui_extpoint_name, gui_extpoint_handlers in \ + plugin.gui_extension_points.iteritems(): + self.gui_extension_points_handlers[gui_extpoint_name].remove(gui_extpoint_handlers) + # detaching plug-in from handler GUI extension points (calling # cleaning up method that must be provided by plug-in developer # for each handled GUI extension point) @@ -201,14 +207,10 @@ plugin.gui_extension_points.iteritems(): if gui_extpoint_name in self.gui_extension_points: for gui_extension_point_args in self.gui_extension_points[gui_extpoint_name]: - gui_extpoint_handlers[1](*gui_extension_point_args) - - # remove GUI extension points handlers (provided by plug-in) from - # handlers list - for gui_extpoint_name, gui_extpoint_handlers in \ - plugin.gui_extension_points.iteritems(): - self.gui_extension_points_handlers[gui_extpoint_name].remove(gui_extpoint_handlers) - + handler = gui_extpoint_handlers[1] + if handler: + handler(*gui_extension_point_args) + # removing plug-in from active plug-ins list plugin.deactivate() self.active_plugins.remove(plugin) @@ -232,7 +234,9 @@ plugin.gui_extension_points.iteritems(): if gui_extpoint_name in self.gui_extension_points: for gui_extension_point_args in self.gui_extension_points[gui_extpoint_name]: - gui_extpoint_handlers[0](*gui_extension_point_args) + handler = gui_extpoint_handlers[0] + if handler: + handler(*gui_extension_point_args) @log_calls('PluginManager') def _activate_all_plugins(self):

1 0

[commit-gajim] r10094 - trunk/src
by asterix＠gajim.org 31 Jul '08

31 Jul '08

Author: asterix Date: 2008-07-31 15:34:19 +0200 (Thu, 31 Jul 2008) New Revision: 10094 Modified: trunk/src/roster_window.py Log: don't look for a contact when we double click on an account row Modified: trunk/src/roster_window.py =================================================================== --- trunk/src/roster_window.py 2008-07-31 08:49:31 UTC (rev 10093) +++ trunk/src/roster_window.py 2008-07-31 13:34:19 UTC (rev 10094) @@ -3456,16 +3456,17 @@ model = self.modelfilter account = model[path][C_ACCOUNT].decode('utf-8') type_ = model[path][C_TYPE] - jid = model[path][C_JID].decode('utf-8') - resource = None - contact = gajim.contacts.get_first_contact_from_jid(account, jid) - titer = model.get_iter(path) if type_ in ('group', 'account'): if self.tree.row_expanded(path): self.tree.collapse_row(path) else: self.tree.expand_row(path, False) - elif contact.is_groupchat(): + return + jid = model[path][C_JID].decode('utf-8') + resource = None + contact = gajim.contacts.get_first_contact_from_jid(account, jid) + titer = model.get_iter(path) + if contact.is_groupchat(): first_ev = gajim.events.get_first_event(account, jid) if first_ev and self.open_event(account, jid, first_ev): # We are invited to a GC @@ -3473,45 +3474,47 @@ self.remove_groupchat(jid, account) else: self.on_groupchat_maximized(None, jid, account) - else: - first_ev = gajim.events.get_first_event(account, jid) - if not first_ev: - # look in other resources - for c in gajim.contacts.get_contacts(account, jid): - fjid = c.get_full_jid() - first_ev = gajim.events.get_first_event(account, fjid) - if first_ev: - resource = c.resource - break - if not first_ev and model.iter_has_child(titer): - child_iter = model.iter_children(titer) - while not first_ev and child_iter: - child_jid = model[child_iter][C_JID].decode('utf-8') - first_ev = gajim.events.get_first_event(account, child_jid) - if first_ev: - jid = child_jid - else: - child_iter = model.iter_next(child_iter) - session = None - if first_ev: - if first_ev.type_ in ('chat', 'normal'): - session = first_ev.parameters[8] - fjid = jid - if resource: - fjid += '/' + resource - if self.open_event(account, fjid, first_ev): - return - # else - contact = gajim.contacts.get_contact(account, jid, resource) - if not contact or isinstance(contact, list): - contact = \ - gajim.contacts.get_contact_with_highest_priority(account, jid) - if jid == gajim.get_jid_from_account(account): - resource = contact.resource + return - gajim.interface.on_open_chat_window(None, contact, account, \ - resource = resource, session = session) + # else + first_ev = gajim.events.get_first_event(account, jid) + if not first_ev: + # look in other resources + for c in gajim.contacts.get_contacts(account, jid): + fjid = c.get_full_jid() + first_ev = gajim.events.get_first_event(account, fjid) + if first_ev: + resource = c.resource + break + if not first_ev and model.iter_has_child(titer): + child_iter = model.iter_children(titer) + while not first_ev and child_iter: + child_jid = model[child_iter][C_JID].decode('utf-8') + first_ev = gajim.events.get_first_event(account, child_jid) + if first_ev: + jid = child_jid + else: + child_iter = model.iter_next(child_iter) + session = None + if first_ev: + if first_ev.type_ in ('chat', 'normal'): + session = first_ev.parameters[8] + fjid = jid + if resource: + fjid += '/' + resource + if self.open_event(account, fjid, first_ev): + return + # else + contact = gajim.contacts.get_contact(account, jid, resource) + if not contact or isinstance(contact, list): + contact = gajim.contacts.get_contact_with_highest_priority(account, + jid) + if jid == gajim.get_jid_from_account(account): + resource = contact.resource + gajim.interface.on_open_chat_window(None, contact, account, \ + resource=resource, session=session) + def on_roster_treeview_row_activated(self, widget, path, col = 0): '''When an iter is double clicked: open the first event window''' if not gajim.single_click:

1 0

[commit-gajim] r10093 - trunk/src
by asterix＠gajim.org 31 Jul '08

31 Jul '08

Author: asterix Date: 2008-07-31 10:49:31 +0200 (Thu, 31 Jul 2008) New Revision: 10093 Modified: trunk/src/systray.py Log: implement double_click in systray. see #2932 Modified: trunk/src/systray.py =================================================================== --- trunk/src/systray.py 2008-07-31 08:08:54 UTC (rev 10092) +++ trunk/src/systray.py 2008-07-31 08:49:31 UTC (rev 10093) @@ -60,6 +60,10 @@ self.added_hide_menuitem = False self.img_tray = gtk.Image() self.status = 'offline' + self.double_click = False + self.double_click_id = None + self.double_click_time = gtk.settings_get_default().get_property( + 'gtk-double-click-time') self.xml = gtkgui_helpers.get_glade('systray_context_menu.glade') self.systray_context_menu = self.xml.get_widget('systray_context_menu') self.xml.signal_autoconnect(self) @@ -283,6 +287,10 @@ gajim.interface.roster.on_quit_request() def on_left_click(self): + self.double_click_id = None + if self.double_click: + self.double_click = False + return win = gajim.interface.roster.window # toggle visible/hidden for roster window if win.get_property('visible') and win.get_property('has-toplevel-focus'): @@ -312,10 +320,16 @@ def on_clicked(self, widget, event): self.on_tray_leave_notify_event(widget, None) + if event.type == gtk.gdk._2BUTTON_PRESS: + self.double_click = True + self.on_middle_click() if event.type != gtk.gdk.BUTTON_PRESS: return if event.button == 1: # Left click - self.on_left_click() + if self.double_click_id: + gobject.source_remove(self.double_click_id) + self.double_click_id = gobject.timeout_add(self.double_click_time, + self.on_left_click) elif event.button == 2: # middle click self.on_middle_click() elif event.button == 3: # right click @@ -405,4 +419,4 @@ self.t = None self.unsubscribe_events() -# vim: se ts=3: \ No newline at end of file +# vim: se ts=3:

1 0

[commit-gajim] r10092 - trunk/src
by asterix＠gajim.org 31 Jul '08

31 Jul '08

Author: asterix Date: 2008-07-31 10:08:54 +0200 (Thu, 31 Jul 2008) New Revision: 10092 Modified: trunk/src/dialogs.py Log: block adding ourself in our roster. Fixes #4073 Modified: trunk/src/dialogs.py =================================================================== --- trunk/src/dialogs.py 2008-07-31 06:23:03 UTC (rev 10091) +++ trunk/src/dialogs.py 2008-07-31 08:08:54 UTC (rev 10092) @@ -869,6 +869,11 @@ ErrorDialog(pritext, _('The user ID must not contain a resource.')) return + if jid == gajim.get_jid_from_account(self.account): + pritext = _('Invalid User ID') + ErrorDialog(pritext, _('You cannot add yourself to your roster.')) + return + nickname = self.nickname_entry.get_text().decode('utf-8') or '' # get value of account combobox, if account was not specified if not self.account:

1 0

[commit-gajim] r10091 - trunk/src
by asterix＠gajim.org 31 Jul '08

31 Jul '08

Author: asterix Date: 2008-07-31 08:23:03 +0200 (Thu, 31 Jul 2008) New Revision: 10091 Modified: trunk/src/dialogs.py Log: Use InvitationReceivedDialog asynchronously. see #4147 Modified: trunk/src/dialogs.py =================================================================== --- trunk/src/dialogs.py 2008-07-31 06:14:48 UTC (rev 10090) +++ trunk/src/dialogs.py 2008-07-31 06:23:03 UTC (rev 10091) @@ -2927,8 +2927,8 @@ PrivacyListWindow(self.account, name, 'EDIT') class InvitationReceivedDialog: - def __init__(self, account, room_jid, contact_jid, password = None, - comment = None, is_continued = False): + def __init__(self, account, room_jid, contact_jid, password=None, + comment=None, is_continued=False): self.room_jid = room_jid self.account = account @@ -2951,9 +2951,8 @@ comment = _('Comment: %s') % comment sectext += '\n\n%s' % comment sectext += '\n\n' + _('Do you want to accept the invitation?') - - dialog = YesNoDialog(pritext, sectext) - if dialog.get_response() == gtk.RESPONSE_YES: + + def on_yes(checked): try: if self.is_continued: gajim.interface.join_gc_room(self.account, self.room_jid, @@ -2963,6 +2962,8 @@ except GajimGeneralException: pass + dialog = YesNoDialog(pritext, sectext, on_response_yes=on_yes) + class ProgressDialog: def __init__(self, title_text, during_text, messages_queue): '''during text is what to show during the procedure,

1 0

[commit-gajim] r10090 - trunk/src
by asterix＠gajim.org 31 Jul '08

31 Jul '08

Author: asterix Date: 2008-07-31 08:14:48 +0200 (Thu, 31 Jul 2008) New Revision: 10090 Modified: trunk/src/config.py trunk/src/dialogs.py trunk/src/gajim.py trunk/src/roster_window.py Log: use PassphraseDialog only asynchronously. see #4147 Modified: trunk/src/config.py =================================================================== --- trunk/src/config.py 2008-07-30 19:59:24 UTC (rev 10089) +++ trunk/src/config.py 2008-07-31 06:14:48 UTC (rev 10090) @@ -2553,16 +2553,19 @@ gajim.connections[self.account].change_status('offline', 'offline') if self.remove_and_unregister_radiobutton.get_active(): if not gajim.connections[self.account].password: - passphrase = '' + def on_ok(passphrase, checked): + if passphrase == -1: + # We don't remove account cause we canceled pw window + return + gajim.connections[self.account].password = passphrase + gajim.connections[self.account].unregister_account( + self._on_remove_success) + w = dialogs.PassphraseDialog( _('Password Required'), _('Enter your password for account %s') % self.account, - _('Save password')) - passphrase, save = w.run() - if passphrase == -1: - # We don't remove account cause we canceled pw window - return - gajim.connections[self.account].password = passphrase + _('Save password'), ok_handler=on_ok) + return gajim.connections[self.account].unregister_account( self._on_remove_success) else: @@ -2572,7 +2575,7 @@ dialog = dialogs.ConfirmationDialog( _('Account "%s" is connected to the server') % self.account, _('If you remove it, the connection will be lost.'), - on_response_ok = remove) + on_response_ok=remove) else: remove() @@ -3737,4 +3740,4 @@ window.set_title(title) window.show_all() -# vim: se ts=3: \ No newline at end of file +# vim: se ts=3: Modified: trunk/src/dialogs.py =================================================================== --- trunk/src/dialogs.py 2008-07-30 19:59:24 UTC (rev 10089) +++ trunk/src/dialogs.py 2008-07-31 06:14:48 UTC (rev 10090) @@ -199,26 +199,8 @@ class PassphraseDialog: '''Class for Passphrase dialog''' - def run(self): - '''Wait for OK button to be pressed and return passphrase/password''' - rep = self.window.run() - if rep == gtk.RESPONSE_OK: - passphrase = self.passphrase_entry.get_text().decode('utf-8') - else: - passphrase = -1 - - if self.check: - save_passphrase_checkbutton = self.xml.\ - get_widget('save_passphrase_checkbutton') - checked = save_passphrase_checkbutton.get_active() - else: - checked = False - - self.window.destroy() - return passphrase, checked - - def __init__(self, titletext, labeltext, checkbuttontext=None, is_modal=True, - ok_handler = None, cancel_handler = None): + def __init__(self, titletext, labeltext, checkbuttontext=None, + ok_handler=None, cancel_handler=None): self.xml = gtkgui_helpers.get_glade('passphrase_dialog.glade') self.window = self.xml.get_widget('passphrase_dialog') self.passphrase_entry = self.xml.get_widget('passphrase_entry') @@ -229,13 +211,11 @@ self.ok = False self.cancel_handler = cancel_handler - self.is_modal = is_modal - if not is_modal and ok_handler is not None: - self.ok_handler = ok_handler - okbutton = self.xml.get_widget('ok_button') - okbutton.connect('clicked', self.on_okbutton_clicked) - cancelbutton = self.xml.get_widget('cancel_button') - cancelbutton.connect('clicked', self.on_cancelbutton_clicked) + self.ok_handler = ok_handler + okbutton = self.xml.get_widget('ok_button') + okbutton.connect('clicked', self.on_okbutton_clicked) + cancelbutton = self.xml.get_widget('cancel_button') + cancelbutton.connect('clicked', self.on_cancelbutton_clicked) self.xml.signal_autoconnect(self) self.window.show_all() @@ -248,6 +228,9 @@ checkbutton.hide() def on_okbutton_clicked(self, widget): + if not self.ok_handler: + return + passph = self.passphrase_entry.get_text().decode('utf-8') if self.check: Modified: trunk/src/gajim.py =================================================================== --- trunk/src/gajim.py 2008-07-30 19:59:24 UTC (rev 10089) +++ trunk/src/gajim.py 2008-07-31 06:14:48 UTC (rev 10090) @@ -1440,12 +1440,11 @@ # ask again dialogs.PassphraseDialog(_('Wrong Passphrase'), _('Please retype your GPG passphrase or press Cancel.'), - is_modal=False, ok_handler=(_ok, count), cancel_handler=_cancel) + ok_handler=(_ok, count), cancel_handler=_cancel) - dialogs.PassphraseDialog(title, second, - is_modal=False, ok_handler=(_ok, 0), cancel_handler=_cancel) + dialogs.PassphraseDialog(title, second, ok_handler=(_ok, 0), + cancel_handler=_cancel) - def handle_event_roster_info(self, account, array): #('ROSTER_INFO', account, (jid, name, sub, ask, groups)) jid = array[0] Modified: trunk/src/roster_window.py =================================================================== --- trunk/src/roster_window.py 2008-07-30 19:59:24 UTC (rev 10089) +++ trunk/src/roster_window.py 2008-07-31 06:14:48 UTC (rev 10090) @@ -1932,7 +1932,7 @@ if gajim.interface.systray_enabled: gajim.interface.systray.change_status('connecting') - def send_status(self, account, status, txt, auto = False, to = None): + def send_status(self, account, status, txt, auto=False, to=None): child_iterA = self._get_account_iter(account, self.model) if status != 'offline': if to is None: @@ -1950,27 +1950,39 @@ 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: + def on_ok(passphrase, save): + gajim.connections[account].password = passphrase + if save: + gajim.config.set_per('accounts', account, 'savepass', True) + passwords.save_password(account, passphrase) + keyid = gajim.config.get_per('accounts', account, 'keyid') + if keyid and not gajim.connections[account].gpg: + dialog = dialogs.WarningDialog(_('GPG is not usable'), + _('You will be connected to %s without OpenPGP.') % \ + account) + self.send_status_continue(account, status, txt, auto, to) + + def on_cancel(): if child_iterA: 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() - return - gajim.connections[account].password = passphrase - if save: - gajim.config.set_per('accounts', account, 'savepass', True) - passwords.save_password(account, passphrase) + w = dialogs.PassphraseDialog(_('Password Required'), text, + _('Save password'), ok_handler=on_ok, + cancel_handler=on_cancel) + return + keyid = gajim.config.get_per('accounts', account, 'keyid') if keyid and not gajim.connections[account].gpg: dialog = dialogs.WarningDialog(_('GPG is not usable'), _('You will be connected to %s without OpenPGP.') % account) + self.send_status_continue(account, status, txt, auto, to) + + def send_status_continue(self, account, status, txt, auto, to): if gajim.account_is_connected(account): if status == 'online' and gajim.interface.sleeper.getState() != \ common.sleepy.STATE_UNKNOWN: @@ -6338,4 +6350,4 @@ self.setup_for_osx() -# vim: se ts=3: \ No newline at end of file +# vim: se ts=3:

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 July 2008