Commits December 2007

commits@gajim.org

6 participants
149 discussions

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

03 Dec '07

Author: asterix Date: 2007-12-03 19:53:24 +0100 (Mon, 03 Dec 2007) New Revision: 9088 Modified: trunk/src/history_window.py Log: correctly decode utf-8 names in history window. fixes #3552 Modified: trunk/src/history_window.py =================================================================== --- trunk/src/history_window.py 2007-12-02 22:37:08 UTC (rev 9087) +++ trunk/src/history_window.py 2007-12-03 18:53:24 UTC (rev 9088) @@ -155,7 +155,7 @@ self.window.destroy() def on_jid_entry_activate(self, widget): - self.jid = self.jid_entry.get_text() + self.jid = self.jid_entry.get_text().decode('utf-8') if self.completion_dict.has_key(self.jid): # a full qualified jid or a contact name was entered contact = self.completion_dict[self.jid]

1 0

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

02 Dec '07

Author: asterix Date: 2007-12-02 23:37:08 +0100 (Sun, 02 Dec 2007) New Revision: 9087 Modified: trunk/src/common/connection.py trunk/src/config.py Log: create new account in 2 steps: 1/ connect, get form and disconnect 2/ re-connect, get form, check it and send filled form Modified: trunk/src/common/connection.py =================================================================== --- trunk/src/common/connection.py 2007-12-02 19:29:22 UTC (rev 9086) +++ trunk/src/common/connection.py 2007-12-02 22:37:08 UTC (rev 9087) @@ -119,6 +119,7 @@ self.time_to_reconnect = None self.last_time_to_reconnect = None self.new_account_info = None + self.new_account_form = None self.bookmarks = [] self.annotations = {} self.on_purpose = False @@ -184,7 +185,7 @@ self.retrycount = 0 # We are doing disconnect at so many places, better use one function in all - def disconnect(self, on_purpose = False): + def disconnect(self, on_purpose=False): self.on_purpose = on_purpose self.connected = 0 self.time_to_reconnect = None @@ -259,8 +260,47 @@ return is_form = data[2] conf = data[1] - self.dispatch('NEW_ACC_CONNECTED', (conf, is_form)) - return + if self.new_account_form: + def _on_register_result(result): + if not common.xmpp.isResultNode(result): + self.dispatch('ACC_NOT_OK', (result.getError())) + return + if USE_GPG: + self.gpg = GnuPG.GnuPG(gajim.config.get( + 'use_gpg_agent')) + self.dispatch('ACC_OK', (self.new_account_info)) + self.new_account_info = None + self.new_account_form = None + if self.connection: + self.connection.UnregisterDisconnectHandler( + self._on_new_account) + self.disconnect(on_purpose=True) + # it's the second time we get the form, we have info user + # typed, so send them + if is_form: + #TODO: Check if form has changed + iq = Iq('set', NS_REGISTER, to=self._hostname) + iq.setTag('query').addChild(node=self.new_account_form) + self.connection.SendAndCallForResponse(iq, + _on_register_result) + else: + if self.new_account_form.keys().sort() != \ + conf.keys().sort(): + # requested config has changed since first connection + self.dispatch('ACC_NOT_OK', (_( + 'Server %s provided a different registration form')\ + % data[0])) + return + common.xmpp.features_nb.register(self.connection, + self._hostname, self.new_account_form, + _on_register_result) + return + else: + self.dispatch('NEW_ACC_CONNECTED', (conf, is_form)) + self.connection.UnregisterDisconnectHandler( + self._on_new_account) + self.disconnect(on_purpose=True) + return if not data[1]: # wrong answer self.dispatch('ERROR', (_('Invalid answer'), _('Transport %s answered wrongly to register request: %s') % \ @@ -1029,18 +1069,6 @@ groups = groups) def send_new_account_infos(self, form, is_form): - def _on_register_result(result): - if not common.xmpp.isResultNode(result): - self.dispatch('ACC_NOT_OK', (result.getError())) - return - if USE_GPG: - self.gpg = GnuPG.GnuPG(gajim.config.get('use_gpg_agent')) - gajim.connections[self.name] = self - self.dispatch('ACC_OK', (self.new_account_info)) - self.new_account_info = None - if self.connection: - self.connection.UnregisterDisconnectHandler(self._on_new_account) - self.disconnect(on_purpose=True) if is_form: # Get username and password and put them in new_account_info for field in self._data_form.iter_fields(): @@ -1048,17 +1076,14 @@ self.new_account_info['name'] = field.value if field.var == 'password': self.new_account_info['password'] = field.value - iq=Iq('set', NS_REGISTER, to = self._hostname) - iq.setTag('query').addChild(node = form) - self.connection.SendAndCallForResponse(iq, _on_register_result) else: # Get username and password and put them in new_account_info if form.has_key('username'): self.new_account_info['name'] = form['username'] if form.has_key('password'): self.new_account_info['password'] = form['password'] - common.xmpp.features_nb.register(self.connection, self._hostname, - form, _on_register_result) + self.new_account_form = form + self.new_account(self.name, self.new_account_info) def new_account(self, name, config, sync = False): # If a connection already exist we cannot create a new account Modified: trunk/src/config.py =================================================================== --- trunk/src/config.py 2007-12-02 19:29:22 UTC (rev 9086) +++ trunk/src/config.py 2007-12-02 22:37:08 UTC (rev 9087) @@ -3088,6 +3088,7 @@ self.notebook.set_current_page(5) # show finish page self.show_vcard_checkbutton.set_active(False) elif cur_page == 2: + # We are creating a new account server = self.xml.get_widget('server_comboboxentry1').child.get_text()\ .decode('utf-8') @@ -3172,7 +3173,7 @@ return True # loop forever def new_acc_connected(self, form, is_form): - '''connection to server succeded, present the form to the user''' + '''connection to server succeded, present the form to the user.''' if self.update_progressbar_timeout_id is not None: gobject.source_remove(self.update_progressbar_timeout_id) self.back_button.show()

1 0

[commit-gajim] r9086 - trunk/src/common
by asterix＠gajim.org 02 Dec '07

02 Dec '07

Author: asterix Date: 2007-12-02 20:29:22 +0100 (Sun, 02 Dec 2007) New Revision: 9086 Modified: trunk/src/common/commands.py Log: [Dicson] make a string translatable. fixes #3594 Modified: trunk/src/common/commands.py =================================================================== --- trunk/src/common/commands.py 2007-12-02 16:03:32 UTC (rev 9085) +++ trunk/src/common/commands.py 2007-12-02 19:29:22 UTC (rev 9086) @@ -167,7 +167,7 @@ class LeaveGroupchatsCommand(AdHocCommand): commandnode = 'leave-groupchats' - commandname = 'Leave Groupchats' + commandname = _('Leave Groupchats') @staticmethod def isVisibleFor(samejid):

1 0

[commit-gajim] r9085 - branches/gajim_0.11.3-bugfixes/src/common
by asterix＠gajim.org 02 Dec '07

02 Dec '07

Author: asterix Date: 2007-12-02 17:03:32 +0100 (Sun, 02 Dec 2007) New Revision: 9085 Modified: branches/gajim_0.11.3-bugfixes/src/common/contacts.py Log: typo contact1 -> contact2 Modified: branches/gajim_0.11.3-bugfixes/src/common/contacts.py =================================================================== --- branches/gajim_0.11.3-bugfixes/src/common/contacts.py 2007-12-02 16:02:32 UTC (rev 9084) +++ branches/gajim_0.11.3-bugfixes/src/common/contacts.py 2007-12-02 16:03:32 UTC (rev 9085) @@ -404,7 +404,7 @@ else: show1 = show_list.index(contact1.show) priority1 = contact1.priority - if not contact1: + if not contact2: show2 = 0 priority2 = 0 else:

1 0

[commit-gajim] r9084 - trunk/src/common
by asterix＠gajim.org 02 Dec '07

02 Dec '07

Author: asterix Date: 2007-12-02 17:02:32 +0100 (Sun, 02 Dec 2007) New Revision: 9084 Modified: trunk/src/common/contacts.py Log: typo: contact1 -> contact2 Modified: trunk/src/common/contacts.py =================================================================== --- trunk/src/common/contacts.py 2007-12-02 14:30:59 UTC (rev 9083) +++ trunk/src/common/contacts.py 2007-12-02 16:02:32 UTC (rev 9084) @@ -439,7 +439,7 @@ else: show1 = show_list.index(contact1.show) priority1 = contact1.priority - if not contact1: + if not contact2: show2 = 0 priority2 = 0 else:

1 0

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

02 Dec '07

Author: asterix Date: 2007-12-02 15:30:59 +0100 (Sun, 02 Dec 2007) New Revision: 9083 Modified: trunk/src/features_window.py Log: better description for libsexy Modified: trunk/src/features_window.py =================================================================== --- trunk/src/features_window.py 2007-12-01 13:22:39 UTC (rev 9082) +++ trunk/src/features_window.py 2007-12-02 14:30:59 UTC (rev 9083) @@ -105,7 +105,7 @@ _('Requires python-docutils.'), _('Requires python-docutils.')), _('libsexy'): (self.pysexy_available, - _('Ability to have clickable URLs in chat window.'), + _('Ability to have clickable URLs in chat and groupchat window banners.'), _('Requires python-sexy.'), _('Requires python-sexy.')), }

1 0

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

01 Dec '07

Author: asterix Date: 2007-12-01 14:22:39 +0100 (Sat, 01 Dec 2007) New Revision: 9082 Modified: trunk/src/common/connection.py trunk/src/gajim.py Log: re-create gpg instance in connection.py at each connection son use_gpg_agent current value of use_gpg_agent option is used warn user when he configured gajim to use gpg-agent but it returns a wrong passphrase. see #3592 Modified: trunk/src/common/connection.py =================================================================== --- trunk/src/common/connection.py 2007-12-01 12:47:41 UTC (rev 9081) +++ trunk/src/common/connection.py 2007-12-01 13:22:39 UTC (rev 9082) @@ -767,7 +767,7 @@ safe_substitute({ 'hostname': socket.gethostname() }) - if USE_GPG and not self.gpg: + if USE_GPG: self.gpg = GnuPG.GnuPG(gajim.config.get('use_gpg_agent')) self.connect_and_init(show, msg, sign_msg) Modified: trunk/src/gajim.py =================================================================== --- trunk/src/gajim.py 2007-12-01 12:47:41 UTC (rev 9081) +++ trunk/src/gajim.py 2007-12-01 13:22:39 UTC (rev 9082) @@ -1371,13 +1371,16 @@ return False def handle_event_bad_passphrase(self, account, array): + #('BAD_PASSPHRASE', account, ()) use_gpg_agent = gajim.config.get('use_gpg_agent') + sectext = '' if use_gpg_agent: - return + sectext = _('You configured Gajim to use GPG agent, but there is no ' + 'GPG agent running or it returned a wrong passphrase.\n') + sectext += _('You are currently connected without your OpenPGP key.') keyID = gajim.config.get_per('accounts', account, 'keyid') self.forget_gpg_passphrase(keyID) - dialogs.WarningDialog(_('Your passphrase is incorrect'), - _('You are currently connected without your OpenPGP key.')) + dialogs.WarningDialog(_('Your passphrase is incorrect'), sectext) def handle_event_gpg_password_required(self, account, array): #('GPG_PASSWORD_REQUIRED', account, (callback,))

1 0

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

01 Dec '07

Author: asterix Date: 2007-12-01 13:47:41 +0100 (Sat, 01 Dec 2007) New Revision: 9081 Modified: trunk/src/config.py Log: fix GPG in zeroconf account Modified: trunk/src/config.py =================================================================== --- trunk/src/config.py 2007-12-01 11:46:46 UTC (rev 9080) +++ trunk/src/config.py 2007-12-01 12:47:41 UTC (rev 9081) @@ -1514,7 +1514,8 @@ # Personal tab gpg_key_label = self.xml.get_widget('gpg_key_label2') - if gajim.connections[gajim.ZEROCONF_ACC_NAME].gpg: + if gajim.connections.has_key(gajim.ZEROCONF_ACC_NAME) and \ + gajim.connections[gajim.ZEROCONF_ACC_NAME].gpg: self.xml.get_widget('gpg_choose_button2').set_sensitive(True) self.init_account_gpg() else: @@ -2133,6 +2134,9 @@ # enable (will create new account if not present) gajim.connections[gajim.ZEROCONF_ACC_NAME] = common.zeroconf.\ connection_zeroconf.ConnectionZeroconf(gajim.ZEROCONF_ACC_NAME) + if gajim.connections[gajim.ZEROCONF_ACC_NAME].gpg: + self.xml.get_widget('gpg_choose_button2').set_sensitive(True) + self.init_account_gpg() # update variables gajim.interface.instances[gajim.ZEROCONF_ACC_NAME] = {'infos': {}, 'disco': {}, 'gc_config': {}, 'search': {}}

1 0

[commit-gajim] r9080 - trunk/src/common
by asterix＠gajim.org 01 Dec '07

01 Dec '07

Author: asterix Date: 2007-12-01 12:46:46 +0100 (Sat, 01 Dec 2007) New Revision: 9080 Modified: trunk/src/common/commands.py trunk/src/common/connection_handlers.py Log: correctly answer on disco#items on our ad hoc commands Modified: trunk/src/common/commands.py =================================================================== --- trunk/src/common/commands.py 2007-11-30 15:25:26 UTC (rev 9079) +++ trunk/src/common/commands.py 2007-12-01 11:46:46 UTC (rev 9080) @@ -306,8 +306,8 @@ self.connection.send(iq) - def commandQuery(self, con, iq_obj): - ''' Send disco result for query for command (JEP-0050, example 6.). + def commandInfoQuery(self, con, iq_obj): + ''' Send disco#info result for query for command (JEP-0050, example 6.). Return True if the result was sent, False if not. ''' jid = helpers.get_full_jid_from_iq(iq_obj) node = iq_obj.getTagAttr('query', 'node') @@ -330,6 +330,22 @@ return False + def commandItemsQuery(self, con, iq_obj): + ''' Send disco#items result for query for command. + Return True if the result was sent, False if not. ''' + jid = helpers.get_full_jid_from_iq(iq_obj) + node = iq_obj.getTagAttr('query', 'node') + + if node not in self.__commands: return False + + cmd = self.__commands[node] + if cmd.isVisibleFor(self.isSameJID(jid)): + iq = iq_obj.buildReply('result') + self.connection.send(iq) + return True + + return False + def _CommandExecuteCB(self, con, iq_obj): jid = helpers.get_full_jid_from_iq(iq_obj) Modified: trunk/src/common/connection_handlers.py =================================================================== --- trunk/src/common/connection_handlers.py 2007-11-30 15:25:26 UTC (rev 9079) +++ trunk/src/common/connection_handlers.py 2007-12-01 11:46:46 UTC (rev 9080) @@ -711,6 +711,8 @@ def _DiscoverItemsGetCB(self, con, iq_obj): gajim.log.debug('DiscoverItemsGetCB') + if self.commandItemsQuery(con, iq_obj): + raise common.xmpp.NodeProcessed node = iq_obj.getTagAttr('query', 'node') if node is None: result = iq_obj.buildReply('result') @@ -725,7 +727,7 @@ q = iq_obj.getTag('query') node = q.getAttr('node') - if self.commandQuery(con, iq_obj): + if self.commandInfoQuery(con, iq_obj): raise common.xmpp.NodeProcessed else:

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