Commits December 2007

commits@gajim.org

6 participants
149 discussions

[commit-gajim] r9209 - trunk/src
by steve-e＠gajim.org 28 Dec '07

28 Dec '07

Author: steve-e Date: 2007-12-28 16:13:41 +0100 (Fri, 28 Dec 2007) New Revision: 9209 Modified: trunk/src/config.py trunk/src/dialogs.py Log: Remove useless import and fix GPG private key dialog. Do not fail when no key is selected. Modified: trunk/src/config.py =================================================================== --- trunk/src/config.py 2007-12-28 10:23:41 UTC (rev 9208) +++ trunk/src/config.py 2007-12-28 15:13:41 UTC (rev 9209) @@ -1362,8 +1362,6 @@ self.accounts_treeview = self.xml.get_widget('accounts_treeview') self.remove_button = self.xml.get_widget('remove_button') self.rename_button = self.xml.get_widget('rename_button') - #FIXME: I don't understand why this import is necessary - import os path_to_kbd_input_img = os.path.join(gajim.DATA_DIR, 'pixmaps', 'kbd_input.png') img = self.xml.get_widget('rename_image') Modified: trunk/src/dialogs.py =================================================================== --- trunk/src/dialogs.py 2007-12-28 10:23:41 UTC (rev 9208) +++ trunk/src/dialogs.py 2007-12-28 15:13:41 UTC (rev 9209) @@ -351,10 +351,10 @@ def run(self): rep = self.window.run() - if rep == gtk.RESPONSE_OK: - selection = self.keys_treeview.get_selection() - (model, iter) = selection.get_selected() - keyID = [ model[iter][0].decode('utf-8'), + selection = self.keys_treeview.get_selection() + (model, iter) = selection.get_selected() + if iter and rep == gtk.RESPONSE_OK: + keyID = [ model[iter][0].decode('utf-8'), model[iter][1].decode('utf-8') ] else: keyID = None

1 0

[commit-gajim] r9208 - trunk/src
by asterix＠gajim.org 28 Dec '07

28 Dec '07

Author: asterix Date: 2007-12-28 11:23:41 +0100 (Fri, 28 Dec 2007) New Revision: 9208 Modified: trunk/src/roster_window.py Log: coding standards, empty line don't need tabs, no space at the end of lines Modified: trunk/src/roster_window.py =================================================================== --- trunk/src/roster_window.py 2007-12-28 10:20:41 UTC (rev 9207) +++ trunk/src/roster_window.py 2007-12-28 10:23:41 UTC (rev 9208) @@ -3,11 +3,11 @@ ## ## Copyright (C) 2003-2007 Yann Leboulanger <asterix(a)lagaule.org> ## Copyright (C) 2005-2007 Nikos Kouremenos <kourem(a)gmail.com> -## Travis Shirk <travis(a)pobox.com> +## Travis Shirk <travis(a)pobox.com> ## Copyright (C) 2005-2006 Dimitur Kirov <dkirov(a)gmail.com> ## Copyright (C) 2007 Lukas Petrovicky <lukas(a)petrovicky.net> ## Copyright (C) 2007 Julien Pivotto <roidelapluie(a)gmail.com> -## Copyright (C) 2007 Stephan Erb <steve-e(a)h3c.de> +## Copyright (C) 2007 Stephan Erb <steve-e(a)h3c.de> ## ## This file is part of Gajim. ## @@ -1244,7 +1244,7 @@ gc_sub_menu.append(item) # user has at least one bookmark - if len(gajim.connections[account].bookmarks) > 0: + if len(gajim.connections[account].bookmarks) > 0: item = gtk.SeparatorMenuItem() # separator gc_sub_menu.append(item) @@ -1944,7 +1944,7 @@ if os.path.isfile(path_to_file): stat = os.stat(path_to_file) if stat[6] == 0: - invalid_file = True + invalid_file = True msg = _('File is empty') else: invalid_file = True @@ -2034,7 +2034,7 @@ contact = gajim.contacts.get_contact_with_highest_priority(account, jid) if not contact: return - + # Zeroconf Account if gajim.config.get_per('accounts', account, 'is_zeroconf'): xml = gtkgui_helpers.get_glade('zeroconf_contact_context_menu.glade') @@ -2190,7 +2190,7 @@ jid in gajim.interface.status_sent_to_users[account]: send_custom_status_menuitem.set_image( self.load_icon(gajim.interface.status_sent_to_users[account][jid])) - else: + else: icon = gtk.image_new_from_stock(gtk.STOCK_NETWORK, gtk.ICON_SIZE_MENU) send_custom_status_menuitem.set_image(icon) @@ -2502,7 +2502,7 @@ menu.append(send_group_message_item) send_group_message_item.connect('activate', self.on_send_single_message_menuitem_activate, account, list_) - + # Invite to Groupchat invite_item = gtk.ImageMenuItem(_('In_vite to')) muc_icon = self.load_icon('muc_active') @@ -2559,7 +2559,7 @@ manage_contacts_submenu = gtk.Menu() item.set_submenu(manage_contacts_submenu) menu.append(item) - + # Edit Groups edit_groups_item = gtk.ImageMenuItem(_('Edit _Groups')) icon = gtk.image_new_from_stock(gtk.STOCK_EDIT, gtk.ICON_SIZE_MENU) @@ -2587,7 +2587,7 @@ if not gajim.connections[account].privacy_rules_supported: block_menuitem.set_sensitive(False) - # Remove + # Remove remove_item = gtk.ImageMenuItem(_('_Remove')) icon = gtk.image_new_from_stock(gtk.STOCK_REMOVE, gtk.ICON_SIZE_MENU) remove_item.set_image(icon) @@ -2620,17 +2620,17 @@ maximize_menuitem.connect('activate', self.on_groupchat_maximized, \ jid, account) menu.append(maximize_menuitem) - + disconnect_menuitem = gtk.ImageMenuItem(_('_Disconnect')) disconnect_icon = gtk.image_new_from_stock(gtk.STOCK_DISCONNECT, \ gtk.ICON_SIZE_MENU) disconnect_menuitem.set_image(disconnect_icon) disconnect_menuitem .connect('activate', self.on_disconnect, jid, account) - menu.append(disconnect_menuitem) - + menu.append(disconnect_menuitem) + item = gtk.SeparatorMenuItem() # separator menu.append(item) - + history_menuitem = gtk.ImageMenuItem(_('_History')) history_icon = gtk.image_new_from_stock(gtk.STOCK_JUSTIFY_FILL, \ gtk.ICON_SIZE_MENU) @@ -2751,7 +2751,7 @@ status_menuitem.set_image(icon) status_menuitems.append(status_menuitem) menu.append(send_custom_status_menuitem) - + # there is no singlemessage and custom status for zeroconf if gajim.config.get_per('accounts', account, 'is_zeroconf'): send_custom_status_menuitem.set_sensitive(False) @@ -2804,11 +2804,11 @@ menu.append(remove_item) remove_item.connect('activate', self.on_remove_group_item_activated, group, account) - + # unsensitive if account is not connected if gajim.connections[account].connected < 2: rename_item.set_sensitive(False) - + # General group cannot be changed if group == _('General'): rename_item.set_sensitive(False) @@ -2832,7 +2832,7 @@ menu = gtk.Menu() # Connect/Didconnect - show = contact.show + show = contact.show if (show != 'offline' and show != 'error') or\ gajim.account_is_disconnected(account): # Log Off @@ -2849,10 +2849,10 @@ menu.append(item) if show == 'error': item.set_sensitive(False) - + item = gtk.SeparatorMenuItem() # separator menu.append(item) - + # Send single message item = gtk.ImageMenuItem(_('Send Single Message')) icon = gtk.image_new_from_stock(gtk.STOCK_NEW, gtk.ICON_SIZE_MENU) @@ -2886,7 +2886,7 @@ status_menuitem.set_image(icon) status_menuitems.append(status_menuitem) menu.append(send_custom_status_menuitem) - + item = gtk.SeparatorMenuItem() # separator menu.append(item) @@ -2929,7 +2929,7 @@ item.connect('activate', self.on_rename, iter, path) if gajim.account_is_disconnected(account): item.set_sensitive(False) - + item = gtk.SeparatorMenuItem() # separator manage_transport_submenu.append(item) @@ -2941,7 +2941,7 @@ item.connect('activate', self.on_remove_agent, [(contact, account)]) if gajim.account_is_disconnected(account): item.set_sensitive(False) - + item = gtk.SeparatorMenuItem() # separator menu.append(item) @@ -3639,7 +3639,7 @@ status = model[active][2].decode('utf-8') statuses_unified = helpers.statuses_unified() # status "desync'ed" or not if (active == 7 and statuses_unified) or (active == 9 and not statuses_unified): - # 'Change status message' selected: + # 'Change status message' selected: # do not change show, just show change status dialog status = model[self.previous_status_combobox_active][2].decode('utf-8') dlg = dialogs.ChangeStatusMessageDialog(status) @@ -3859,7 +3859,7 @@ uf_show = helpers.get_uf_show(show) liststore = self.status_combobox.get_model() liststore.prepend(['SEPARATOR', None, '', True]) - liststore.prepend([uf_show+" "+"(desync'ed)", + liststore.prepend([uf_show+" "+"(desync'ed)", self.jabber_state_images['16'][show], show, False]) self.status_combobox.set_active(0) self._change_awn_icon_status(show) @@ -4260,7 +4260,7 @@ gajim.config.set('roster_y-position', y) width, height = self.window.get_size() # For the width use the size of the vbox containing the tree and - # status combo, this will cancel out any hpaned width + # status combo, this will cancel out any hpaned width width = self.xml.get_widget('roster_vbox2').allocation.width gajim.config.set('roster_width', width) gajim.config.set('roster_height', height) @@ -5148,13 +5148,13 @@ type_source = model[iter_source][C_TYPE] account_source = model[iter_source][C_ACCOUNT].decode('utf-8') - # Only normal contacts can be dragged + # Only normal contacts can be dragged if type_source != 'contact': return if gajim.config.get_per('accounts', account_source, 'is_zeroconf'): return - # A contact was dropped + # A contact was dropped if gajim.config.get_per('accounts', account_dest, 'is_zeroconf'): # drop on zeroconf account, adding not possible return

1 0

[commit-gajim] r9207 - trunk/src
by asterix＠gajim.org 28 Dec '07

28 Dec '07

Author: asterix Date: 2007-12-28 11:20:41 +0100 (Fri, 28 Dec 2007) New Revision: 9207 Modified: trunk/src/gajim.py Log: ask GPG passphrases one by one for each account. fix #3644 Modified: trunk/src/gajim.py =================================================================== --- trunk/src/gajim.py 2007-12-27 23:33:05 UTC (rev 9206) +++ trunk/src/gajim.py 2007-12-28 10:20:41 UTC (rev 9207) @@ -1410,14 +1410,19 @@ gajim.connections[account].gpg_passphrase(self.gpg_passphrase[keyid]) callback() return + if self.gpg_dialog: + # A GPG dialog is already open, retry in 0.5 second + gobject.timeout_add(500, self.handle_event_gpg_password_required, + account, array) + return password_ok = False count = 0 title = _('Passphrase Required') second = _('Enter GPG key passphrase for account %s.') % account while not password_ok and count < 3: count += 1 - w = dialogs.PassphraseDialog(title, second, '') - passphrase, save = w.run() + self.gpg_dialog = dialogs.PassphraseDialog(title, second, '') + passphrase, save = self.gpg_dialog.run() if passphrase == -1: # User pressed cancel passphrase = None @@ -1427,6 +1432,7 @@ test_gpg_passphrase(passphrase) title = _('Wrong Passphrase') second = _('Please retype your GPG passphrase or press Cancel.') + self.gpg_dialog = None if passphrase != None: self.gpg_passphrase[keyid] = passphrase gobject.timeout_add(30000, self.forget_gpg_passphrase, keyid) @@ -2697,6 +2703,7 @@ self.status_sent_to_users = {} self.status_sent_to_groups = {} self.gpg_passphrase = {} + self.gpg_dialog = None self.default_colors = { 'inmsgcolor': gajim.config.get('inmsgcolor'), 'outmsgcolor': gajim.config.get('outmsgcolor'),

1 0

[commit-gajim] r9206 - in trunk/src: . common
by asterix＠gajim.org 27 Dec '07

27 Dec '07

Author: asterix Date: 2007-12-28 00:33:05 +0100 (Fri, 28 Dec 2007) New Revision: 9206 Modified: trunk/src/common/connection.py trunk/src/dialogs.py Log: how SSL error message in bold. fixes #720 Modified: trunk/src/common/connection.py =================================================================== --- trunk/src/common/connection.py 2007-12-27 22:28:40 UTC (rev 9205) +++ trunk/src/common/connection.py 2007-12-27 23:33:05 UTC (rev 9206) @@ -584,7 +584,7 @@ text = _('The authenticity of the %s certificate could be invalid.') %\ hostname if errnum in ssl_error: - text += _('\nSSL Error: %s') % ssl_error[errnum] + text += _('\nSSL Error: <b>%s</b>') % ssl_error[errnum] else: text += _('\nUnknown SSL error: %d') % errnum self.dispatch('SSL_ERROR', (text, errnum, con.Connection.ssl_cert_pem, Modified: trunk/src/dialogs.py =================================================================== --- trunk/src/dialogs.py 2007-12-27 22:28:40 UTC (rev 9205) +++ trunk/src/dialogs.py 2007-12-27 23:33:05 UTC (rev 9206) @@ -1041,7 +1041,7 @@ gtk.DIALOG_DESTROY_WITH_PARENT | gtk.DIALOG_MODAL, type, buttons, message_format = pritext) - self.format_secondary_text(sectext) + self.format_secondary_markup(sectext) buttons = self.action_area.get_children() possible_responses = {gtk.STOCK_OK: on_response_ok,

1 0

[commit-gajim] r9205 - in trunk/src: . common/xmpp
by steve-e＠gajim.org 27 Dec '07

27 Dec '07

Author: steve-e Date: 2007-12-27 23:28:40 +0100 (Thu, 27 Dec 2007) New Revision: 9205 Modified: trunk/src/common/xmpp/transports_nb.py trunk/src/dialogs.py Log: Improving readability (little) by shifting some boolean checks to a lambda function. Modified: trunk/src/common/xmpp/transports_nb.py =================================================================== --- trunk/src/common/xmpp/transports_nb.py 2007-12-27 21:52:45 UTC (rev 9204) +++ trunk/src/common/xmpp/transports_nb.py 2007-12-27 22:28:40 UTC (rev 9205) @@ -1030,7 +1030,7 @@ # use the IPv4 address request even if remote resolving was specified. try: self.ipaddr = socket.inet_aton(self.server[0]) - req = req + "\x01" + ipaddr + req = req + "\x01" + self.ipaddr except socket.error: # Well it's not an IP number, so it's probably a DNS name. # if self.__proxy[3]==True: Modified: trunk/src/dialogs.py =================================================================== --- trunk/src/dialogs.py 2007-12-27 21:52:45 UTC (rev 9204) +++ trunk/src/dialogs.py 2007-12-27 22:28:40 UTC (rev 9205) @@ -3536,6 +3536,15 @@ self.guests_treeview.get_selection().set_mode(gtk.SELECTION_MULTIPLE) + # All contacts beside the following can be invited: + # transports, zeroconf contacts, minimized groupchats + invitable = lambda contact, contact_transport = None:\ + contact.jid not in self.auto_jids and\ + contact.jid != gajim.get_jid_from_account(self.account) and\ + contact.jid not in gajim.interface.minimized_controls[account] and\ + not contact.is_transport() and\ + not contact_transport + # set jabber id and pseudos for account in gajim.contacts.get_accounts(): if gajim.connections[account].is_zeroconf: @@ -3544,24 +3553,20 @@ contact = \ gajim.contacts.get_contact_with_highest_priority(account, jid) contact_transport = gajim.get_transport_name_from_jid(jid) - # do not add transports, zeroconf contacs, minimized groupchats - # and selfjid to list of invitable jids - if contact.jid not in self.auto_jids and contact.jid != \ - gajim.get_jid_from_account(self.account) and not contact_transport \ - and not contact.is_transport() and contact.jid not in \ - gajim.interface.minimized_controls[account]: - if contact.show not in ('offline', 'error'): - img = gajim.interface.roster.jabber_state_images['16'][ - contact.show] - name = contact.name - if name == '': - name = jid.split('@')[0] - iter = self.store.append([img.get_pixbuf(), name, jid]) - # preselect treeview rows - if self.preselected_jids and jid in self.preselected_jids: - path = self.store.get_path(iter) - self.guests_treeview.get_selection().\ - select_path(path) + # Add contact if it can be invited + if invitable(contact, contact_transport) and \ + contact.show not in ('offline', 'error'): + img = gajim.interface.roster.jabber_state_images['16'][ + contact.show] + name = contact.name + if name == '': + name = jid.split('@')[0] + iter = self.store.append([img.get_pixbuf(), name, jid]) + # preselect treeview rows + if self.preselected_jids and jid in self.preselected_jids: + path = self.store.get_path(iter) + self.guests_treeview.get_selection().\ + select_path(path) # show all self.window.show_all() @@ -3579,7 +3584,6 @@ server = self.server_list_comboboxentry.get_active_text() if server == '': return - room_id = gajim.nicks[self.account] + str(randrange(9999999)) gajim.connections[self.account].check_unique_room_id_support(server, self) def unique_room_id_supported(self, server, room_id):

1 0

[commit-gajim] r9204 - in trunk/src: . common
by jim++＠gajim.org 27 Dec '07

27 Dec '07

Author: jim++ Date: 2007-12-27 22:52:45 +0100 (Thu, 27 Dec 2007) New Revision: 9204 Modified: trunk/src/common/connection.py trunk/src/common/connection_handlers.py trunk/src/common/pubsub.py trunk/src/common/stanza_session.py trunk/src/disco.py trunk/src/features_window.py trunk/src/gajim.py trunk/src/lastfm.py trunk/src/roster_window.py Log: pyflakes checks, remove unused imports, mainly Modified: trunk/src/common/connection.py =================================================================== --- trunk/src/common/connection.py 2007-12-27 19:04:09 UTC (rev 9203) +++ trunk/src/common/connection.py 2007-12-27 21:52:45 UTC (rev 9204) @@ -56,8 +56,6 @@ import logging log = logging.getLogger('gajim.c.connection') -import gtkgui_helpers - ssl_error = { 2: _("Unable to get issuer certificate"), 3: _("Unable to get certificate CRL"), Modified: trunk/src/common/connection_handlers.py =================================================================== --- trunk/src/common/connection_handlers.py 2007-12-27 19:04:09 UTC (rev 9203) +++ trunk/src/common/connection_handlers.py 2007-12-27 21:52:45 UTC (rev 9204) @@ -1281,7 +1281,7 @@ reply.setType('error') reply.addChild(feature) - reply.addChild(node=xmpp.ErrorNode('service-unavailable', typ='cancel')) + reply.addChild(node=common.xmpp.ErrorNode('service-unavailable', typ='cancel')) con.send(reply) Modified: trunk/src/common/pubsub.py =================================================================== --- trunk/src/common/pubsub.py 2007-12-27 19:04:09 UTC (rev 9203) +++ trunk/src/common/pubsub.py 2007-12-27 21:52:45 UTC (rev 9204) @@ -1,6 +1,5 @@ import xmpp import gajim -import dataforms import connection_handlers class ConnectionPubSub: @@ -61,7 +60,7 @@ if configure: conf = c.addChild('configure') if configure_form is not None: - conf.addChild(node=configuration_form) + conf.addChild(node=configure_form) self.connection.send(query) Modified: trunk/src/common/stanza_session.py =================================================================== --- trunk/src/common/stanza_session.py 2007-12-27 19:04:09 UTC (rev 9203) +++ trunk/src/common/stanza_session.py 2007-12-27 21:52:45 UTC (rev 9204) @@ -1,7 +1,6 @@ from common import gajim from common import xmpp -from common import helpers from common import exceptions import random Modified: trunk/src/disco.py =================================================================== --- trunk/src/disco.py 2007-12-27 19:04:09 UTC (rev 9203) +++ trunk/src/disco.py 2007-12-27 21:52:45 UTC (rev 9204) @@ -46,7 +46,6 @@ import weakref import gobject import gtk -import gobject import pango import dialogs Modified: trunk/src/features_window.py =================================================================== --- trunk/src/features_window.py 2007-12-27 19:04:09 UTC (rev 9203) +++ trunk/src/features_window.py 2007-12-27 21:52:45 UTC (rev 9204) @@ -21,7 +21,6 @@ import os import sys import gtk -import gobject import gtkgui_helpers import dialogs Modified: trunk/src/gajim.py =================================================================== --- trunk/src/gajim.py 2007-12-27 19:04:09 UTC (rev 9203) +++ trunk/src/gajim.py 2007-12-27 21:52:45 UTC (rev 9204) @@ -44,7 +44,6 @@ # os.environ['GTK_BASEPATH'] = 'gtk' import sys -import urllib import logging consoleloghandler = logging.StreamHandler() @@ -222,7 +221,6 @@ import re import signal -import getopt import time import math Modified: trunk/src/lastfm.py =================================================================== --- trunk/src/lastfm.py 2007-12-27 19:04:09 UTC (rev 9203) +++ trunk/src/lastfm.py 2007-12-27 21:52:45 UTC (rev 9204) @@ -25,7 +25,7 @@ from urllib import urlopen from xml.dom import minidom -from time import time, strftime +from time import time class LastFM: # Where to fetch the played song information Modified: trunk/src/roster_window.py =================================================================== --- trunk/src/roster_window.py 2007-12-27 19:04:09 UTC (rev 9203) +++ trunk/src/roster_window.py 2007-12-27 21:52:45 UTC (rev 9204) @@ -30,7 +30,6 @@ import os import sys import time -import urllib import common.sleepy import history_window

1 0

[commit-gajim] r9203 - trunk/src
by jim++＠gajim.org 27 Dec '07

27 Dec '07

Author: jim++ Date: 2007-12-27 20:04:09 +0100 (Thu, 27 Dec 2007) New Revision: 9203 Modified: trunk/src/config.py Log: stupid parser... Modified: trunk/src/config.py =================================================================== --- trunk/src/config.py 2007-12-27 18:58:07 UTC (rev 9202) +++ trunk/src/config.py 2007-12-27 19:04:09 UTC (rev 9203) @@ -419,7 +419,7 @@ self.applications_combobox.set_active(2) elif gajim.config.get('openwith') == 'exo-open': self.applications_combobox.set_active(3) - elif ((sys.platform == 'darwin') and\ + elif ((sys.platform == 'darwin') and\ (gajim.config.get('openwith') == 'open')): self.applications_combobox.set_active(1) elif gajim.config.get('openwith') == 'custom':

1 0

[commit-gajim] r9202 - in trunk/src: . common
by jim++＠gajim.org 27 Dec '07

27 Dec '07

Author: jim++ Date: 2007-12-27 19:58:07 +0100 (Thu, 27 Dec 2007) New Revision: 9202 Modified: trunk/src/common/connection_handlers.py trunk/src/common/helpers.py trunk/src/common/stanza_session.py trunk/src/config.py trunk/src/conversation_textview.py trunk/src/dataforms_widget.py Log: CodingStandards : No space in indentation Modified: trunk/src/common/connection_handlers.py =================================================================== --- trunk/src/common/connection_handlers.py 2007-12-27 17:21:04 UTC (rev 9201) +++ trunk/src/common/connection_handlers.py 2007-12-27 18:58:07 UTC (rev 9202) @@ -189,7 +189,7 @@ ft_add_hosts_to_send = map(lambda e:e.strip(), ft_add_hosts_to_send.split(',')) for ft_host in ft_add_hosts_to_send: - ft_add_hosts.append(ft_host) + ft_add_hosts.append(ft_host) listener = gajim.socks5queue.start_listener(port, sha_str, self._result_socks5_sid, file_props['sid']) if listener == None: @@ -880,7 +880,7 @@ ext.append('xhtml') if gajim.config.get('outgoing_chat_state_notifactions') != 'disabled': ext.append('cstates') - + if len(ext): c.setAttr('ext', ' '.join(ext)) c.setAttr('ver', gajim.version.split('-', 1)[0]) Modified: trunk/src/common/helpers.py =================================================================== --- trunk/src/common/helpers.py 2007-12-27 17:21:04 UTC (rev 9201) +++ trunk/src/common/helpers.py 2007-12-27 18:58:07 UTC (rev 9202) @@ -429,8 +429,8 @@ command = 'kfmclient exec' elif gajim.config.get('openwith') == 'exo-open': command = 'exo-open' - elif ((sys.platform == 'darwin') and - (gajim.config.get('openwith') == 'open')): + elif ((sys.platform == 'darwin') and\ + (gajim.config.get('openwith') == 'open')): command = 'open' elif gajim.config.get('openwith') == 'custom': if kind == 'url': @@ -459,8 +459,8 @@ command = 'kfmclient exec' elif gajim.config.get('openwith') == 'exo-open': command = 'exo-open' - elif ((sys.platform == 'darwin') and - (gajim.config.get('openwith') == 'open')): + elif ((sys.platform == 'darwin') and\ + (gajim.config.get('openwith') == 'open')): command = 'open' elif gajim.config.get('openwith') == 'custom': command = gajim.config.get('custom_file_manager') Modified: trunk/src/common/stanza_session.py =================================================================== --- trunk/src/common/stanza_session.py 2007-12-27 17:21:04 UTC (rev 9201) +++ trunk/src/common/stanza_session.py 2007-12-27 18:58:07 UTC (rev 9202) @@ -571,9 +571,9 @@ self.d = crypto.powmod(g, self.y, p) to_add = { 'my_nonce': self.n_s, - 'dhkeys': crypto.encode_mpi(self.d), - 'counter': crypto.encode_mpi(self.c_o), - 'nonce': self.n_o } + 'dhkeys': crypto.encode_mpi(self.d), + 'counter': crypto.encode_mpi(self.c_o), + 'nonce': self.n_o } for name in to_add: b64ed = base64.b64encode(to_add[name]) Modified: trunk/src/config.py =================================================================== --- trunk/src/config.py 2007-12-27 17:21:04 UTC (rev 9201) +++ trunk/src/config.py 2007-12-27 18:58:07 UTC (rev 9202) @@ -419,8 +419,8 @@ self.applications_combobox.set_active(2) elif gajim.config.get('openwith') == 'exo-open': self.applications_combobox.set_active(3) - elif ((sys.platform == 'darwin') and - (gajim.config.get('openwith') == 'open')): + elif ((sys.platform == 'darwin') and\ + (gajim.config.get('openwith') == 'open')): self.applications_combobox.set_active(1) elif gajim.config.get('openwith') == 'custom': if sys.platform == 'darwin': Modified: trunk/src/conversation_textview.py =================================================================== --- trunk/src/conversation_textview.py 2007-12-27 17:21:04 UTC (rev 9201) +++ trunk/src/conversation_textview.py 2007-12-27 18:58:07 UTC (rev 9202) @@ -336,9 +336,9 @@ if None != self.smooth_id: # already scrolling return False self.smooth_id = gobject.timeout_add(self.SCROLL_DELAY, - self.smooth_scroll) + self.smooth_scroll) self.smooth_scroll_timer = Timer(self.MAX_SCROLL_TIME, - self.smooth_scroll_timeout) + self.smooth_scroll_timeout) self.smooth_scroll_timer.start() return False Modified: trunk/src/dataforms_widget.py =================================================================== --- trunk/src/dataforms_widget.py 2007-12-27 17:21:04 UTC (rev 9201) +++ trunk/src/dataforms_widget.py 2007-12-27 18:58:07 UTC (rev 9202) @@ -342,7 +342,7 @@ for value, label in field.iter_options(): radio = gtk.RadioButton(first_radio, label=label) radio.connect('toggled', - self.on_list_single_radiobutton_toggled, field, value) + self.on_list_single_radiobutton_toggled, field, value) if first_radio is None: first_radio = radio if field.value == '': # TODO: is None when done

1 0

[commit-gajim] r9201 - trunk/src
by steve-e＠gajim.org 27 Dec '07

27 Dec '07

Author: steve-e Date: 2007-12-27 18:21:04 +0100 (Thu, 27 Dec 2007) New Revision: 9201 Modified: trunk/src/roster_window.py Log: Honor coding standards Modified: trunk/src/roster_window.py =================================================================== --- trunk/src/roster_window.py 2007-12-27 17:06:30 UTC (rev 9200) +++ trunk/src/roster_window.py 2007-12-27 17:21:04 UTC (rev 9201) @@ -63,7 +63,6 @@ import dbus from lastfm_track_listener import LastFMTrackListener -import sys if sys.platform == 'darwin': from osx import syncmenu @@ -257,7 +256,7 @@ 'show_contacts_number'): nbr_on, nbr_total = gajim.contacts.get_nb_online_total_contacts( accounts = accounts) - account_name += ' (%s/%s)' % (repr(nbr_on),repr(nbr_total)) + account_name += ' (%s/%s)' % (repr(nbr_on), repr(nbr_total)) model[iter][C_NAME] = account_name def remove_newly_added(self, jid, account): @@ -1245,7 +1244,8 @@ item.connect('activate', self.on_join_gc_activate, account) gc_sub_menu.append(item) - if len(gajim.connections[account].bookmarks) > 0: # user has at least one bookmark + # user has at least one bookmark + if len(gajim.connections[account].bookmarks) > 0: item = gtk.SeparatorMenuItem() # separator gc_sub_menu.append(item) @@ -3342,7 +3342,6 @@ model, list_of_paths = self.tree.get_selection().get_selected_rows() except TypeError: list_of_paths = [] - pass if path not in list_of_paths: self.tree.get_selection().unselect_all() self.tree.get_selection().select_path(path) @@ -3353,7 +3352,6 @@ model, list_of_paths = self.tree.get_selection().get_selected_rows() except TypeError: list_of_paths = [] - pass if list_of_paths != [path]: self.tree.get_selection().unselect_all() self.tree.get_selection().select_path(path) @@ -3404,8 +3402,8 @@ # We just save on which row we press button, and open chat window on # button release to be able to do DND without opening chat window self.clicked_path = path + self.on_row_activated(widget, path) return - self.on_row_activated(widget, path) else: if type_ == 'group' and x < 27: # first cell in 1st column (the arrow SINGLE clicked) @@ -3508,7 +3506,8 @@ text = _('Enter your password for account %s') % account if passwords.USER_HAS_GNOMEKEYRING and \ not passwords.USER_USES_GNOMEKEYRING: - text += '\n' + _('Gnome Keyring is installed but not correctly started (environment variable probably not correctly set)') + text += '\n' + _('Gnome Keyring is installed but not correctly started\ + (environment variable probably not correctly set)') w = dialogs.PassphraseDialog(_('Password Required'), text, _('Save password')) passphrase, save = w.run() @@ -3639,9 +3638,9 @@ self.update_status_combobox() return status = model[active][2].decode('utf-8') - statuses_unified = helpers.statuses_unified() + statuses_unified = helpers.statuses_unified() # status "desync'ed" or not if (active == 7 and statuses_unified) or (active == 9 and not statuses_unified): - # We choose change status message (7 is that, or 9 if there is the "desync'ed" option) + # 'Change status message' selected: # do not change show, just show change status dialog status = model[self.previous_status_combobox_active][2].decode('utf-8') dlg = dialogs.ChangeStatusMessageDialog(status) @@ -3782,11 +3781,11 @@ if account == '': accounts = gajim.connections.keys() if music_track_info is None: - artist = '' - title = '' - source = '' - track = '' - length = '' + artist = '' + title = '' + source = '' + track = '' + length = '' elif hasattr(music_track_info, 'paused') and \ music_track_info.paused == 0: artist = '' @@ -3861,8 +3860,8 @@ uf_show = helpers.get_uf_show(show) liststore = self.status_combobox.get_model() liststore.prepend(['SEPARATOR', None, '', True]) - liststore.prepend([uf_show+" "+"(desync'ed)", self.jabber_state_images['16'][show], - show, False]) + liststore.prepend([uf_show+" "+"(desync'ed)", + self.jabber_state_images['16'][show], show, False]) self.status_combobox.set_active(0) self._change_awn_icon_status(show) self.combobox_callback_active = True @@ -5565,7 +5564,8 @@ self.draw_roster() if gajim.config.get('use_pep'): - self.enable_syncing_status_msg_from_current_music_track(gajim.config.get('publish_tune')) + self.enable_syncing_status_msg_from_current_music_track( + gajim.config.get('publish_tune')) else: ## Music Track notifications ## FIXME: we use a timeout because changing status of

1 0

[commit-gajim] r9200 - trunk/src/common
by jim++＠gajim.org 27 Dec '07

27 Dec '07

Author: jim++ Date: 2007-12-27 18:06:30 +0100 (Thu, 27 Dec 2007) New Revision: 9200 Modified: trunk/src/common/connection_handlers.py Log: Don't process roster during gpg_passphrase dialog is showed. Fixes #3634, hopefully... :p Please test Modified: trunk/src/common/connection_handlers.py =================================================================== --- trunk/src/common/connection_handlers.py 2007-12-27 15:53:42 UTC (rev 9199) +++ trunk/src/common/connection_handlers.py 2007-12-27 17:06:30 UTC (rev 9200) @@ -2153,6 +2153,21 @@ raw_roster = roster.getRaw() roster = {} our_jid = helpers.parse_jid(gajim.get_jid_from_account(self.name)) + if self.connected > 1 and self.continue_connect_info: + msg = self.continue_connect_info[1] + sign_msg = self.continue_connect_info[2] + signed = '' + send_first_presence = True + if sign_msg: + signed = self.get_signed_presence(msg, self._send_first_presence) + if signed is None: + self.dispatch('GPG_PASSWORD_REQUIRED', + (self._send_first_presence,)) + # _send_first_presence will be called when user enter passphrase + send_first_presence = False + if send_first_presence: + self._send_first_presence(signed) + for jid in raw_roster: try: j = helpers.parse_jid(jid) @@ -2175,20 +2190,6 @@ self.dispatch('ROSTER', roster) - # continue connection - if self.connected > 1 and self.continue_connect_info: - msg = self.continue_connect_info[1] - sign_msg = self.continue_connect_info[2] - signed = '' - if sign_msg: - signed = self.get_signed_presence(msg, self._send_first_presence) - if signed is None: - self.dispatch('GPG_PASSWORD_REQUIRED', - (self._send_first_presence,)) - # _send_first_presence will be called when user enter passphrase - return - self._send_first_presence(signed) - def _send_first_presence(self, signed = ''): show = self.continue_connect_info[0] msg = self.continue_connect_info[1]

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 December 2007