Commits July 2008

commits@gajim.org

7 participants
229 discussions

[commit-gajim] r9889 - in trunk/src: . common
by asterix＠gajim.org 05 Jul '08

05 Jul '08

Author: asterix Date: 2008-07-05 21:04:27 +0200 (Sat, 05 Jul 2008) New Revision: 9889 Modified: trunk/src/common/contacts.py trunk/src/dialogs.py trunk/src/filetransfers_window.py trunk/src/gajim.py trunk/src/roster_window.py trunk/src/session.py Log: fix arguments order in contacts.py, some coding standards. should fix #4081 Modified: trunk/src/common/contacts.py =================================================================== --- trunk/src/common/contacts.py 2008-07-05 18:25:39 UTC (rev 9888) +++ trunk/src/common/contacts.py 2008-07-05 19:04:27 UTC (rev 9889) @@ -186,17 +186,20 @@ sub='', ask='', resource='', priority=0, keyID='', our_chatstate=None, chatstate=None, last_status_time=None, composing_xep=None, mood={}, tune={}, activity={}): - return Contact(jid, name, groups, show, status, sub, ask, resource, - priority, keyID, our_chatstate, chatstate, last_status_time, - None, composing_xep, mood, tune, activity) + return Contact(jid=jid, name=name, groups=groups, show=show, + status=status, sub=sub, ask=ask, resource=resource, priority=priority, + keyID=keyID, chatstate=our_chatstate, chatstate=chatstate, + last_status_time=last_status_time, composing_xep=composing_xep, + mood=mood, tune=tune, activity=activity) def copy_contact(self, contact): - return self.create_contact(jid = contact.jid, name = contact.name, - groups = contact.groups, show = contact.show, status = - contact.status, sub = contact.sub, ask = contact.ask, resource = contact.resource, - priority = contact.priority, keyID = contact.keyID, - our_chatstate = contact.our_chatstate, chatstate = contact.chatstate, - last_status_time = contact.last_status_time) + return self.create_contact(jid=contact.jid, name=contact.name, + groups=contact.groups, show=contact.show, status=contact.status, + sub=contact.sub, ask=contact.ask, resource=contact.resource, + priority=contact.priority, keyID=contact.keyID, + caps_node=contact.caps_node, caps_hash_method=contact.caps_hash_method, + caps_hash=contact.caps_hash, our_chatstate=contact.our_chatstate, + chatstate=contact.chatstate, last_status_time=contact.last_status_time) def add_contact(self, account, contact): # No such account before ? Modified: trunk/src/dialogs.py =================================================================== --- trunk/src/dialogs.py 2008-07-05 18:25:39 UTC (rev 9888) +++ trunk/src/dialogs.py 2008-07-05 19:04:27 UTC (rev 9889) @@ -1602,7 +1602,7 @@ if gajim.interface.instances[self.account]['infos'].has_key(self.jid): gajim.interface.instances[self.account]['infos'][self.jid].window.present() else: - contact = gajim.contacts.create_contact(jid = self.jid, name='', + contact = gajim.contacts.create_contact(jid=self.jid, name='', groups=[], show='', status='', sub='', ask='', resource='', priority=5, keyID='', our_chatstate=None, chatstate=None) gajim.interface.instances[self.account]['infos'][self.jid] = \ Modified: trunk/src/filetransfers_window.py =================================================================== --- trunk/src/filetransfers_window.py 2008-07-05 18:25:39 UTC (rev 9888) +++ trunk/src/filetransfers_window.py 2008-07-05 19:04:27 UTC (rev 9889) @@ -276,8 +276,7 @@ if contact.find('/') == -1: return (jid, resource) = contact.split('/', 1) - contact = gajim.contacts.create_contact(jid = jid, - resource = resource) + contact = gajim.contacts.create_contact(jid=jid, resource=resource) (file_dir, file_name) = os.path.split(file_path) file_props = self.get_send_file_props(account, contact, file_path, file_name, file_desc) Modified: trunk/src/gajim.py =================================================================== --- trunk/src/gajim.py 2008-07-05 18:25:39 UTC (rev 9888) +++ trunk/src/gajim.py 2008-07-05 19:04:27 UTC (rev 9889) @@ -673,11 +673,10 @@ # Create SelfContact and add to roster if resource == gajim.connections[account].server_resource: return - contact1 = gajim.contacts.create_contact(jid = ji, - name = gajim.nicks[account], groups = ['self_contact'], - show = array[1], status = status_message, sub = 'both', - ask = 'none', priority = priority, keyID = keyID, - resource = resource) + contact1 = gajim.contacts.create_contact(jid=ji, + name=gajim.nicks[account], groups=['self_contact'], + show=array[1], status=status_message, sub='both', ask='none', + priority=priority, keyID=keyID, resource=resource) old_show = 0 gajim.contacts.add_contact(account, contact1) lcontact.append(contact1) @@ -869,9 +868,9 @@ keyID = attached_keys[attached_keys.index(jid) + 1] name = jid.split('@', 1)[0] name = name.split('%', 1)[0] - contact1 = gajim.contacts.create_contact(jid = jid, name = name, - groups = [], show = 'online', status = 'online', - ask = 'to', resource = array[1], keyID = keyID) + contact1 = gajim.contacts.create_contact(jid=jid, name=name, + groups=[], show='online', status='online', + ask='to', resource=array[1], keyID=keyID) gajim.contacts.add_contact(account, contact1) self.roster.add_contact(jid, account) dialogs.InformationDialog(_('Authorization accepted'), @@ -1401,8 +1400,8 @@ if sub == 'remove': return # Add new contact to roster - contact = gajim.contacts.create_contact(jid = jid, name = name, - groups = groups, show = 'offline', sub = sub, ask = ask) + contact = gajim.contacts.create_contact(jid=jid, name=name, + groups=groups, show='offline', sub=sub, ask=ask) gajim.contacts.add_contact(account, contact) self.roster.add_contact(jid, account) else: @@ -1540,9 +1539,9 @@ 'attached_gpg_keys').split() if jid in attached_keys: keyID = attached_keys[attached_keys.index(jid) + 1] - contact = gajim.contacts.create_contact(jid = jid, name = '', - groups = [_('Not in Roster')], show = 'not in roster', status = '', - sub = 'none', keyID = keyID) + contact = gajim.contacts.create_contact(jid=jid, name='', + groups=[_('Not in Roster')], show='not in roster', status='', + sub='none', keyID=keyID) gajim.contacts.add_contact(account, contact) self.roster.add_contact(contact.jid, account) file_props = array[1] @@ -2484,7 +2483,7 @@ return if minimize and not minimized_control_exists and \ not self.msg_win_mgr.has_window(room_jid, account): - contact = gajim.contacts.create_contact(jid = room_jid, name = nick) + contact = gajim.contacts.create_contact(jid=room_jid, name=nick) gc_control = GroupchatControl(None, contact, account) self.minimized_controls[account][room_jid] = gc_control gajim.connections[account].join_gc(nick, room_jid, password) @@ -2508,7 +2507,7 @@ def new_room(self, room_jid, nick, account, is_continued=False): # Get target window, create a control, and associate it with the window - contact = gajim.contacts.create_contact(jid = room_jid, name = nick) + contact = gajim.contacts.create_contact(jid=room_jid, name=nick) mw = self.msg_win_mgr.get_window(contact.jid, account) if not mw: mw = self.msg_win_mgr.create_window(contact, account, Modified: trunk/src/roster_window.py =================================================================== --- trunk/src/roster_window.py 2008-07-05 18:25:39 UTC (rev 9888) +++ trunk/src/roster_window.py 2008-07-05 19:04:27 UTC (rev 9889) @@ -731,9 +731,8 @@ else: show = 'offline' status = '' - contact = gajim.contacts.create_contact(jid = jid, name = jid, - groups = [_('Groupchats')], show = show, - status = status, sub = 'none') + contact = gajim.contacts.create_contact(jid=jid, name=jid, + groups=[_('Groupchats')], show=show, status=status, sub='none') gajim.contacts.add_contact(account, contact) self.add_contact(jid, account) else: @@ -758,9 +757,9 @@ Return the added contact instance.''' contact = gajim.contacts.get_contact_with_highest_priority(account, jid) if contact is None: - contact = gajim.contacts.create_contact(jid = jid, name = jid, - groups = [_('Transports')], show = 'offline', - status = 'offline', sub = 'from') + contact = gajim.contacts.create_contact(jid=jid, name=jid, + groups=[_('Transports')], show='offline', status='offline', + sub='from') gajim.contacts.add_contact(account, contact) self.add_contact(jid, account) return contact @@ -856,9 +855,9 @@ 'attached_gpg_keys').split() if jid in attached_keys: keyID = attached_keys[attached_keys.index(jid) + 1] - contact = gajim.contacts.create_contact(jid = jid, name = nick, - groups = [_('Not in Roster')], show = 'not in roster', status = '', - sub = 'none', resource = resource, keyID = keyID) + contact = gajim.contacts.create_contact(jid=jid, name=nick, + groups=[_('Not in Roster')], show='not in roster', status='', + sub='none', resource=resource, keyID=keyID) gajim.contacts.add_contact(account, contact) self.add_contact(contact.jid, account) return contact @@ -1483,10 +1482,10 @@ if gajim.jid_is_transport(jid): array[jid]['groups'] = [_('Transports')] - contact1 = gajim.contacts.create_contact(jid = ji, name = name, - groups = array[jid]['groups'], show = show, status = status, - sub = array[jid]['subscription'], ask = array[jid]['ask'], - resource = resource, keyID = keyID) + contact1 = gajim.contacts.create_contact(jid=ji, name=name, + groups=array[jid]['groups'], show=show, status=status, + sub=array[jid]['subscription'], ask=array[jid]['ask'], + resource=resource, keyID=keyID) gajim.contacts.add_contact(account, contact1) if gajim.config.get('ask_avatars_on_startup'): @@ -1690,9 +1689,9 @@ 'attached_gpg_keys').split() if jid in attached_keys: keyID = attached_keys[attached_keys.index(jid) + 1] - contact = gajim.contacts.create_contact(jid = jid, name = nickname, - groups = groups, show = 'requested', status = '', ask = 'none', - sub = 'subscribe', keyID = keyID) + contact = gajim.contacts.create_contact(jid=jid, name=nickname, + groups=groups, show='requested', status='', ask='none', + sub='subscribe', keyID=keyID) gajim.contacts.add_contact(account, contact) else: if not _('Not in Roster') in contact.get_shown_groups(): @@ -2218,14 +2217,11 @@ account_name = account if gajim.account_is_connected(account): account_name += ' (%s/%s)' % (repr(nbr_on), repr(nbr_total)) - contact = gajim.contacts.create_contact(jid = jid, - name = account_name, show = connection.get_status(), sub = '', - status = connection.status, - resource = connection.server_resource, - priority = connection.priority, - mood = connection.mood, - tune = connection.tune, - activity = connection.activity) + contact = gajim.contacts.create_contact(jid=jid, name=account_name, + show=connection.get_status(), sub='', status=connection.status, + resource=connection.server_resource, + priority=connection.priority, mood=connection.mood, + tune=connection.tune, activity=connection.activity) if gajim.connections[account].gpg: contact.keyID = gajim.config.get_per('accounts', connection.name, 'keyid') @@ -2250,11 +2246,11 @@ show = roster.getShow(jid+'/'+resource) if not show: show = 'online' - contact = gajim.contacts.create_contact(jid = jid, - name = account, groups = ['self_contact'], show = show, - status = roster.getStatus(jid+'/'+resource), - resource = resource, - priority = roster.getPriority(jid+'/'+resource)) + contact = gajim.contacts.create_contact(jid=jid, + name=account, groups=['self_contact'], show=show, + status=roster.getStatus(jid + '/' + resource), + resource=resource, + priority=roster.getPriority(jid + '/' + resource)) contacts.append(contact) if self.tooltip.timeout == 0 or self.tooltip.id != props[0]: self.tooltip.id = row @@ -4542,7 +4538,7 @@ service_discovery_menuitem.connect('activate', self.on_service_disco_menuitem_activate, account) hostname = gajim.config.get_per('accounts', account, 'hostname') - contact = gajim.contacts.create_contact(jid = hostname) # Fake contact + contact = gajim.contacts.create_contact(jid=hostname) # Fake contact execute_command_menuitem.connect('activate', self.on_execute_command, contact, account) Modified: trunk/src/session.py =================================================================== --- trunk/src/session.py 2008-07-05 18:25:39 UTC (rev 9888) +++ trunk/src/session.py 2008-07-05 19:04:27 UTC (rev 9889) @@ -449,8 +449,8 @@ contact = gajim.contacts.get_contact(account, self.jid, resource) if not contact: - contact = gajim.contacts.create_contact(jid = jid, - resource = resource, show = self.conn.get_status()) + contact = gajim.contacts.create_contact(jid=jid, + resource=resource, show=self.conn.get_status()) gajim.interface.new_chat(contact, account, resource = resource, session = self)

1 0

[commit-gajim] r9888 - trunk/src/common
by asterix＠gajim.org 05 Jul '08

05 Jul '08

Author: asterix Date: 2008-07-05 20:25:39 +0200 (Sat, 05 Jul 2008) New Revision: 9888 Modified: trunk/src/common/connection.py Log: remove useless print Modified: trunk/src/common/connection.py =================================================================== --- trunk/src/common/connection.py 2008-07-05 18:25:09 UTC (rev 9887) +++ trunk/src/common/connection.py 2008-07-05 18:25:39 UTC (rev 9888) @@ -617,7 +617,6 @@ 'warn_when_plaintext_connection'): self.dispatch('PLAIN_CONNECTION', (con,)) return True - print hasattr(con.Connection, '_sslContext') if _con_type in ('tls', 'ssl') and not hasattr(con.Connection, '_sslContext') and gajim.config.get_per('accounts', self.name, 'warn_when_insecure_ssl_connection'):

1 0

[commit-gajim] r9887 - trunk/src/common
by asterix＠gajim.org 05 Jul '08

05 Jul '08

Author: asterix Date: 2008-07-05 20:25:09 +0200 (Sat, 05 Jul 2008) New Revision: 9887 Modified: trunk/src/common/connection.py Log: typo Modified: trunk/src/common/connection.py =================================================================== --- trunk/src/common/connection.py 2008-07-05 18:07:32 UTC (rev 9886) +++ trunk/src/common/connection.py 2008-07-05 18:25:09 UTC (rev 9887) @@ -617,8 +617,9 @@ 'warn_when_plaintext_connection'): self.dispatch('PLAIN_CONNECTION', (con,)) return True + print hasattr(con.Connection, '_sslContext') if _con_type in ('tls', 'ssl') and not hasattr(con.Connection, - '_sslcontext') and gajim.config.get_per('accounts', self.name, + '_sslContext') and gajim.config.get_per('accounts', self.name, 'warn_when_insecure_ssl_connection'): # Pyopenssl is not used self.dispatch('INSECURE_SSL_CONNECTION', (con, _con_type))

1 0

[commit-gajim] r9886 - in trunk/src: . common
by asterix＠gajim.org 05 Jul '08

05 Jul '08

Author: asterix Date: 2008-07-05 20:07:32 +0200 (Sat, 05 Jul 2008) New Revision: 9886 Modified: trunk/src/common/config.py trunk/src/common/connection.py trunk/src/config.py trunk/src/gajim.py Log: warn before connecting without PyOpenSSL. fixes #4065 Modified: trunk/src/common/config.py =================================================================== --- trunk/src/common/config.py 2008-07-05 16:44:27 UTC (rev 9885) +++ trunk/src/common/config.py 2008-07-05 18:07:32 UTC (rev 9886) @@ -277,7 +277,8 @@ 'gpg_sign_presence': [ opt_bool, True, _('If disabled, don\'t sign presences with GPG key, even if GPG is configured.') ], 'keyname': [ opt_str, '', '', True ], 'connection_types': [ opt_str, 'tls ssl plain', _('Ordered list (space separated) of connection type to try. Can contain tls, ssl or plain')], - 'warn_when_insecure_connection': [ opt_bool, True, _('Show a warning dialog before sending password on an insecure connection.') ], + 'warn_when_plaintext_connection': [ opt_bool, True, _('Show a warning dialog before sending password on an plaintext connection.') ], + 'warn_when_insecure_ssl_connection': [ opt_bool, True, _('Show a warning dialog before using standard SSL library.') ], 'ssl_fingerprint_sha1': [ opt_str, '', '', True ], 'ignore_ssl_errors': [ opt_str, '', _('Space separated list of ssl errors to ignore.') ], 'use_srv': [ opt_bool, True, '', True ], Modified: trunk/src/common/connection.py =================================================================== --- trunk/src/common/connection.py 2008-07-05 16:44:27 UTC (rev 9885) +++ trunk/src/common/connection.py 2008-07-05 18:07:32 UTC (rev 9886) @@ -614,9 +614,15 @@ self.connect_to_next_type() return if _con_type == 'plain' and gajim.config.get_per('accounts', self.name, - 'warn_when_insecure_connection'): + 'warn_when_plaintext_connection'): self.dispatch('PLAIN_CONNECTION', (con,)) return True + if _con_type in ('tls', 'ssl') and not hasattr(con.Connection, + '_sslcontext') and gajim.config.get_per('accounts', self.name, + 'warn_when_insecure_ssl_connection'): + # Pyopenssl is not used + self.dispatch('INSECURE_SSL_CONNECTION', (con, _con_type)) + return True return self.connection_accepted(con, con_type) def connection_accepted(self, con, con_type): Modified: trunk/src/config.py =================================================================== --- trunk/src/config.py 2008-07-05 16:44:27 UTC (rev 9885) +++ trunk/src/config.py 2008-07-05 18:07:32 UTC (rev 9886) @@ -1566,10 +1566,10 @@ use_env_http_proxy) self.xml.get_widget('proxy_hbox1').set_sensitive(not use_env_http_proxy) - warn_when_insecure = gajim.config.get_per('accounts', account, - 'warn_when_insecure_connection') + warn_when_insecure_ssl = gajim.config.get_per('accounts', account, + 'warn_when_insecure_ssl_connection') self.xml.get_widget('warn_when_insecure_connection_checkbutton1').\ - set_active(warn_when_insecure) + set_active(warn_when_insecure_ssl) self.xml.get_widget('send_keepalive_checkbutton1').set_active( gajim.config.get_per('accounts', account, 'keep_alives_enabled')) @@ -1939,7 +1939,7 @@ if self.ignore_events: return - self.on_checkbutton_toggled(widget, 'warn_when_insecure_connection', + self.on_checkbutton_toggled(widget, 'warn_when_insecure_ssl_connection', account=self.current_account) def on_send_keepalive_checkbutton1_toggled(self, widget): Modified: trunk/src/gajim.py =================================================================== --- trunk/src/gajim.py 2008-07-05 16:44:27 UTC (rev 9885) +++ trunk/src/gajim.py 2008-07-05 18:07:32 UTC (rev 9886) @@ -1933,21 +1933,49 @@ def handle_event_plain_connection(self, account, data): # ('PLAIN_CONNECTION', account, (connection)) server = gajim.config.get_per('accounts', account, 'hostname') - def on_yes(is_checked): - if is_checked: + def on_ok(is_checked): + if not is_checked[0]: + on_cancel() + return + if is_checked[1]: gajim.config.set_per('accounts', account, - 'warn_when_insecure_connection', False) + 'warn_when_plaintext_connection', False) gajim.connections[account].connection_accepted(data[0], 'tcp') - def on_no(): + def on_cancel(): gajim.connections[account].disconnect(on_purpose=True) self.handle_event_status(account, 'offline') pritext = _('Insecure connection') - sectext = _('You are about to send your password on an insecure ' + sectext = _('You are about to send your password on an unencrypted ' 'connection. Are you sure you want to do that?') - checktext = _('Do _not ask me again') - dialog = dialogs.YesNoDialog(pritext, sectext, checktext, - on_response_yes=on_yes, on_response_no=on_no) + checktext1 = _('Yes, I really want to connect insecurely') + checktext2 = _('Do _not ask me again') + dialog = dialogs.ConfirmationDialogDubbleCheck(pritext, sectext, + checktext1, checktext2, on_response_ok=on_ok, + on_response_cancel=on_cancel, is_modal=False) + def handle_event_insecure_ssl_connection(self, account, data): + # ('INSECURE_SSL_CONNECTION', account, (connection, connection_type)) + server = gajim.config.get_per('accounts', account, 'hostname') + def on_ok(is_checked): + if not is_checked[0]: + on_cancel() + return + if is_checked[1]: + gajim.config.set_per('accounts', account, + 'warn_when_insecure_ssl_connection', False) + gajim.connections[account].connection_accepted(data[0], data[1]) + def on_cancel(): + gajim.connections[account].disconnect(on_purpose=True) + self.handle_event_status(account, 'offline') + pritext = _('Insecure connection') + sectext = _('You are about to send your password on an insecure ' + 'connection. You should install PyOpenSSL to prevent that. Are you sure you want to do that?') + checktext1 = _('Yes, I really want to connect insecurely') + checktext2 = _('Do _not ask me again') + dialog = dialogs.ConfirmationDialogDubbleCheck(pritext, sectext, + checktext1, checktext2, on_response_ok=on_ok, + on_response_cancel=on_cancel, is_modal=False) + def handle_event_pubsub_node_removed(self, account, data): # ('PUBSUB_NODE_REMOVED', account, (jid, node)) if self.instances[account].has_key('pep_services'): @@ -2037,6 +2065,7 @@ 'SSL_ERROR': self.handle_event_ssl_error, 'FINGERPRINT_ERROR': self.handle_event_fingerprint_error, 'PLAIN_CONNECTION': self.handle_event_plain_connection, + 'INSECURE_SSL_CONNECTION': self.handle_event_insecure_ssl_connection, 'PUBSUB_NODE_REMOVED': self.handle_event_pubsub_node_removed, 'PUBSUB_NODE_NOT_REMOVED': self.handle_event_pubsub_node_not_removed, }

1 0

[commit-gajim] r9885 - branches/plugin-system/src/plugins
by vardo＠gajim.org 05 Jul '08

05 Jul '08

Author: vardo Date: 2008-07-05 18:44:27 +0200 (Sat, 05 Jul 2008) New Revision: 9885 Modified: branches/plugin-system/src/plugins/gui.py branches/plugin-system/src/plugins/plugin.py Log: Small sync commit. Modified: branches/plugin-system/src/plugins/gui.py =================================================================== --- branches/plugin-system/src/plugins/gui.py 2008-07-05 06:33:49 UTC (rev 9884) +++ branches/plugin-system/src/plugins/gui.py 2008-07-05 16:44:27 UTC (rev 9885) @@ -196,18 +196,15 @@ @log_calls('GajimPluginConfigDialog') def __init__(self, plugin, **kwargs): - # TRANSLATORS: The window title for the generic configuration dialog of plugins - gtk.Dialog.__init__(self, '%s : %s'%(_('Configuration'), plugin.name), **kwargs) + gtk.Dialog.__init__(self, '%s %s'%(plugin.name, _('Configuration')), **kwargs) self.plugin = plugin self.add_button('gtk-close', gtk.RESPONSE_CLOSE) - self.main = self.child - self.main.set_spacing(3) + self.child.set_spacing(3) - # TRANSLATORS: Short text stating which plugin a configuration dialog is for - label = gtk.Label(_('<b>%s Configuration</b>') % (plugin.name)) - label.set_markup(label.get_label()) - self.main.pack_start(label, False, False) + #label = gtk.Label(_('<b>%s Configuration</b>') % (plugin.name)) + #label.set_markup(label.get_label()) + #self.child.pack_start(label, False, False) @log_calls('GajimPluginConfigDialog') def run(self, parent=None): Modified: branches/plugin-system/src/plugins/plugin.py =================================================================== --- branches/plugin-system/src/plugins/plugin.py 2008-07-05 06:33:49 UTC (rev 9884) +++ branches/plugin-system/src/plugins/plugin.py 2008-07-05 16:44:27 UTC (rev 9885) @@ -26,9 +26,12 @@ import os -from plugins.helpers import log_calls +from common import gajim + +from plugins.helpers import log_calls, log from plugins.gui import GajimPluginConfigDialog + class GajimPlugin(object): ''' Base class for implementing Gajim plugins. @@ -97,7 +100,7 @@ @log_calls('GajimPlugin') def __init__(self): - self.config = GajimPluginConfig() + self.config = GajimPluginConfig(self) ''' Plug-in configuration dictionary. @@ -136,12 +139,22 @@ @log_calls('GajimPlugin') def deactivate(self): pass + +import shelve class GajimPluginConfig(dict): @log_calls('GajimPluginConfig') + def __init__(self, plugin): + self.plugin = plugin + self.FILE_PATH = gajim.HOME_DIR + log.debug('FILE_PATH = %s'%(self.FILE_PATH)) + #self.data = shelve.open(self.FILE_PATH) + + @log_calls('GajimPluginConfig') def save(self): pass @log_calls('GajimPluginConfig') def load(self): pass + \ No newline at end of file

1 0

[commit-gajim] r9884 - in trunk/src: . common
by steve-e＠gajim.org 05 Jul '08

05 Jul '08

Author: steve-e Date: 2008-07-05 08:33:49 +0200 (Sat, 05 Jul 2008) New Revision: 9884 Modified: trunk/src/common/contacts.py trunk/src/roster_window.py Log: Correctly count metacontacts in non merged accounts mode if we have metacontacts over several accounts. Modified: trunk/src/common/contacts.py =================================================================== --- trunk/src/common/contacts.py 2008-07-04 21:29:46 UTC (rev 9883) +++ trunk/src/common/contacts.py 2008-07-05 06:33:49 UTC (rev 9884) @@ -326,8 +326,8 @@ _('Transports') in groups: # do not count transports continue - if self.has_brother(account, jid) and not \ - self.is_big_brother(account, jid): + if self.has_brother(account, jid, accounts) and not \ + self.is_big_brother(account, jid, accounts): # count metacontacts only once continue contact = self.get_contact_with_highest_priority(account, jid) @@ -402,26 +402,30 @@ self._metacontacts_tags[account]) break - def has_brother(self, account, jid): + def has_brother(self, account, jid, accounts): tag = self.get_metacontacts_tag(account, jid) if not tag: return False - meta_jids = self.get_metacontacts_jids(tag) + meta_jids = self.get_metacontacts_jids(tag, accounts) return len(meta_jids) > 1 or len(meta_jids[account]) > 1 - def is_big_brother(self, account, jid): + def is_big_brother(self, account, jid, accounts): family = self.get_metacontacts_family(account, jid) if family: - bb_data = self.get_metacontacts_big_brother(family) + nearby_family = [data for data in family + if account in accounts] + bb_data = self.get_metacontacts_big_brother(nearby_family) if bb_data['jid'] == jid and bb_data['account'] == account: return True return False - def get_metacontacts_jids(self, tag): + def get_metacontacts_jids(self, tag, accounts): '''Returns all jid for the given tag in the form {acct: [jid1, jid2],.}''' answers = {} for account in self._metacontacts_tags: if tag in self._metacontacts_tags[account]: + if account not in accounts: + continue answers[account] = [] for data in self._metacontacts_tags[account][tag]: answers[account].append(data['jid']) Modified: trunk/src/roster_window.py =================================================================== --- trunk/src/roster_window.py 2008-07-04 21:29:46 UTC (rev 9883) +++ trunk/src/roster_window.py 2008-07-05 06:33:49 UTC (rev 9884) @@ -3785,7 +3785,8 @@ return # Is the contact we drag a meta contact? - is_big_brother = gajim.contacts.is_big_brother(account_source, jid_source) + accounts = (self.regroup and gajim.contacts.get_accounts()) or account_source + is_big_brother = gajim.contacts.is_big_brother(account_source, jid_source, accounts) # Contact drop on group row or between two contacts if type_dest == 'group' or position == gtk.TREE_VIEW_DROP_BEFORE or \

1 0

[commit-gajim] r9883 - in trunk/src: . common
by steve-e＠gajim.org 04 Jul '08

04 Jul '08

Author: steve-e Date: 2008-07-04 23:29:46 +0200 (Fri, 04 Jul 2008) New Revision: 9883 Modified: trunk/src/common/contacts.py trunk/src/roster_window.py Log: Count metacontacts only once. Remove timing information for roster drawing. Modified: trunk/src/common/contacts.py =================================================================== --- trunk/src/common/contacts.py 2008-07-04 10:18:40 UTC (rev 9882) +++ trunk/src/common/contacts.py 2008-07-04 21:29:46 UTC (rev 9883) @@ -323,9 +323,13 @@ if jid == our_jid: continue if common.gajim.jid_is_transport(jid) and not \ - _('Transports') in groups: + _('Transports') in groups: # do not count transports continue + if self.has_brother(account, jid) and not \ + self.is_big_brother(account, jid): + # count metacontacts only once + continue contact = self.get_contact_with_highest_priority(account, jid) if _('Not in roster') in contact.groups: continue @@ -355,7 +359,7 @@ def get_metacontacts_tag(self, account, jid): '''Returns the tag of a jid''' - if not self._metacontacts_tags.has_key(account): + if not account in self._metacontacts_tags: return None for tag in self._metacontacts_tags[account]: for data in self._metacontacts_tags[account][tag]: @@ -399,20 +403,17 @@ break def has_brother(self, account, jid): - for account in self._metacontacts_tags: - tag = self.get_metacontacts_tag(account, jid) - if tag and len(self._metacontacts_tags[account][tag]) > 1: - return True - return False + tag = self.get_metacontacts_tag(account, jid) + if not tag: + return False + meta_jids = self.get_metacontacts_jids(tag) + return len(meta_jids) > 1 or len(meta_jids[account]) > 1 def is_big_brother(self, account, jid): - tag = self.get_metacontacts_tag(account, jid) - if tag: - family = self.get_metacontacts_family(account, jid) + family = self.get_metacontacts_family(account, jid) + if family: bb_data = self.get_metacontacts_big_brother(family) - bb_jid = bb_data['jid'] - bb_account = bb_data['account'] - if bb_jid == jid and bb_account == account: + if bb_data['jid'] == jid and bb_data['account'] == account: return True return False @@ -420,7 +421,7 @@ '''Returns all jid for the given tag in the form {acct: [jid1, jid2],.}''' answers = {} for account in self._metacontacts_tags: - if self._metacontacts_tags[account].has_key(tag): + if tag in self._metacontacts_tags[account]: answers[account] = [] for data in self._metacontacts_tags[account][tag]: answers[account].append(data['jid']) @@ -435,7 +436,7 @@ return [] answers = [] for account in self._metacontacts_tags: - if self._metacontacts_tags[account].has_key(tag): + if tag in self._metacontacts_tags[account]: for data in self._metacontacts_tags[account][tag]: data['account'] = account answers.append(data) Modified: trunk/src/roster_window.py =================================================================== --- trunk/src/roster_window.py 2008-07-04 10:18:40 UTC (rev 9882) +++ trunk/src/roster_window.py 2008-07-04 21:29:46 UTC (rev 9883) @@ -285,15 +285,12 @@ '''Add all contacts and groups of the given account to roster, draw them and account. ''' - 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: self.add_contact(jid, account) - c6 = time.clock() self.tree.thaw_child_notify() # Do not freeze the GUI when drawing the contacts @@ -301,26 +298,13 @@ # Overhead is big, only invoke when needed self._idle_draw_jids_of_account(jids, account) - c9 = time.clock() # Draw all known groups for group in gajim.groups[account].keys(): self.draw_group(group, account) 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 "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. @@ -479,7 +463,7 @@ continue assert len(self._get_contact_iter(_jid, _account, _contact, self.model) - ) == 0, "%s already in roster. \n Family: " % (_jid, nearby_family) + ) == 0, "%s already in roster. \n Family: %s" % (_jid, nearby_family) self._add_entity(_contact, _account, big_brother_contact = \ big_brother_contact, big_brother_account=big_brother_account) brothers.append((_contact, _account)) @@ -1152,18 +1136,14 @@ jids -- a list of jids to draw account -- the corresponding account ''' - def _draw_all_contacts(jids, account, t): + def _draw_all_contacts(jids, account): for jid in jids: self.draw_contact(jid, account) self.draw_avatar(jid, account) yield True - print "--- Idle draw of %s -----------" % account - print "Draw contact and avatar", time.clock() - t - print "-------------------------------" yield False - t = time.clock() - task = _draw_all_contacts(jids, account, t) + task = _draw_all_contacts(jids, account) gobject.idle_add(task.next) def setup_and_draw_roster(self):

1 0

[commit-gajim] r9882 - trunk/data/glade
by js＠gajim.org 04 Jul '08

04 Jul '08

Author: js Date: 2008-07-04 12:18:40 +0200 (Fri, 04 Jul 2008) New Revision: 9882 Modified: trunk/data/glade/message_window.glade Log: Make the space wasted by the new button at least a bit less. Modified: trunk/data/glade/message_window.glade =================================================================== --- trunk/data/glade/message_window.glade 2008-07-04 00:30:07 UTC (rev 9881) +++ trunk/data/glade/message_window.glade 2008-07-04 10:18:40 UTC (rev 9882) @@ -127,7 +127,7 @@ </widget> <packing> <property name="expand">False</property> - <property name="padding">2</property> + <property name="padding">0</property> </packing> </child> <child>

1 0

[commit-gajim] r9881 - trunk/src
by bct＠gajim.org 04 Jul '08

04 Jul '08

Author: bct Date: 2008-07-04 02:30:07 +0200 (Fri, 04 Jul 2008) New Revision: 9881 Modified: trunk/src/chat_control.py trunk/src/message_control.py Log: fix GroupchatControl session-related TB Modified: trunk/src/chat_control.py =================================================================== --- trunk/src/chat_control.py 2008-07-03 23:19:44 UTC (rev 9880) +++ trunk/src/chat_control.py 2008-07-04 00:30:07 UTC (rev 9881) @@ -1119,7 +1119,6 @@ if not session: session = gajim.connections[self.account].find_controlless_session(self.contact.jid) - self.session = session if session: session.control = self Modified: trunk/src/message_control.py =================================================================== --- trunk/src/message_control.py 2008-07-03 23:19:44 UTC (rev 9880) +++ trunk/src/message_control.py 2008-07-04 00:30:07 UTC (rev 9881) @@ -43,6 +43,8 @@ self.hide_chat_buttons = False self.resource = resource + self.session = None + gajim.last_message_time[self.account][self.get_full_jid()] = 0 self.xml = gtkgui_helpers.get_glade('message_window.glade', widget_name)

1 0

[commit-gajim] r9880 - trunk/src
by bct＠gajim.org 03 Jul '08

03 Jul '08

Author: bct Date: 2008-07-04 01:19:44 +0200 (Fri, 04 Jul 2008) New Revision: 9880 Modified: trunk/src/gajim.py trunk/src/groupchat_control.py trunk/src/session.py Log: sesison-related TB fixes Modified: trunk/src/gajim.py =================================================================== --- trunk/src/gajim.py 2008-07-03 21:43:28 UTC (rev 9879) +++ trunk/src/gajim.py 2008-07-03 23:19:44 UTC (rev 9880) @@ -2134,12 +2134,8 @@ if not contact: contact = highest_contact - if not session: - session = gajim.connections[account].get_or_create_session(fjid, None) + ctrl = self.new_chat(contact, account, resource = resource, session = session) - self.new_chat(contact, account, resource = resource, session = session) - ctrl = session.control - gajim.last_message_time[account][jid] = 0 # long time ago w = ctrl.parent_win Modified: trunk/src/groupchat_control.py =================================================================== --- trunk/src/groupchat_control.py 2008-07-03 21:43:28 UTC (rev 9879) +++ trunk/src/groupchat_control.py 2008-07-03 23:19:44 UTC (rev 9880) @@ -43,7 +43,6 @@ from common import gajim from common import helpers -from common.stanza_session import StanzaSession from chat_control import ChatControl from chat_control import ChatControlBase @@ -223,9 +222,6 @@ self.new_nick = '' self.name = self.room_jid.split('@')[0] - self.session = StanzaSession(gajim.connections[self.account], - self.room_jid, 'gc', 'gc') - compact_view = gajim.config.get('compact_view') self.chat_buttons_set_visible(compact_view) self.widget_set_visible(self.xml.get_widget('banner_eventbox'), Modified: trunk/src/session.py =================================================================== --- trunk/src/session.py 2008-07-03 21:43:28 UTC (rev 9879) +++ trunk/src/session.py 2008-07-03 23:19:44 UTC (rev 9880) @@ -96,7 +96,7 @@ msg_id = gajim.logger.write(log_type, full_jid_with_resource, msgtxt, tim=tim, subject=subject) except exceptions.PysqliteOperationalError, e: - gajim.dispatch('ERROR', (_('Disk WriteError'), str(e))) + self.conn.dispatch('ERROR', (_('Disk WriteError'), str(e))) treat_as = gajim.config.get('treat_incoming_messages') if treat_as: @@ -341,10 +341,7 @@ try: # bob responds if form.getType() == 'form' and 'security' in form.asDict(): - def continue_with_negotiation(*args): - if len(args): - self.dialog.destroy() - + def continue_with_negotiation(): # we don't support 3-message negotiation as the responder if 'dhkeys' in form.asDict(): self.fail_bad_negotiation('3 message negotiation not supported when responding', ('dhkeys',))

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