Commits March 2010

commits@gajim.org

4 participants
98 discussions

gajim: remove useless print
by Yann Leboulanger 19 Mar '10

19 Mar '10

changeset 18254a32fdd7 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=18254a32fdd7 description: remove useless print diffstat: src/common/connection.py | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diffs (11 lines): diff -r be585cee6a58 -r 18254a32fdd7 src/common/connection.py --- a/src/common/connection.py Fri Mar 19 08:20:58 2010 +0100 +++ b/src/common/connection.py Fri Mar 19 08:21:57 2010 +0100 @@ -514,7 +514,6 @@ groupchat_jid is used when we want to send a request to a real jid and act as if the answer comes from the groupchat_jid """ - print 'request_last_status_time', self.connection if not self.connection: return to_whom_jid = jid

1 0

gajim: fix call to notify_another_way
by Yann Leboulanger 19 Mar '10

19 Mar '10

changeset be585cee6a58 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=be585cee6a58 description: fix call to notify_another_way diffstat: src/notify.py | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diffs (25 lines): diff -r 863dabb43577 -r be585cee6a58 src/notify.py --- a/src/notify.py Tue Mar 16 07:09:44 2010 +0100 +++ b/src/notify.py Fri Mar 19 08:20:58 2010 +0100 @@ -630,8 +630,8 @@ dbus.UInt32(timeout*1000), reply_handler=self.attach_by_id, error_handler=self.notify_another_way) - except Exception: - self.notify_another_way() + except Exception, e: + self.notify_another_way(e) else: try: self.notif.Notify( @@ -645,8 +645,8 @@ dbus.UInt32(timeout*1000), reply_handler=self.attach_by_id, error_handler=self.notify_another_way) - except Exception: - self.notify_another_way() + except Exception, e: + self.notify_another_way(e) def attach_by_id(self, id_): self.id = id_

1 0

gajim: Contracted @documentation to @doc
by Alexander Cherniuk 19 Mar '10

19 Mar '10

changeset adfeda7de463 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=adfeda7de463 description: Contracted @documentation to @doc diffstat: src/command_system/framework.py | 2 +- src/command_system/implementation/custom.py | 4 +- src/command_system/implementation/standard.py | 54 +++++++++++++------------- 3 files changed, 30 insertions(+), 30 deletions(-) diffs (254 lines): diff -r 439ccdbe2561 -r adfeda7de463 src/command_system/framework.py --- a/src/command_system/framework.py Thu Mar 18 14:40:00 2010 +0100 +++ b/src/command_system/framework.py Fri Mar 19 03:22:17 2010 +0200 @@ -330,7 +330,7 @@ return decorator -def documentation(text): +def doc(text): """ This decorator is used to bind a documentation (a help) to a command. diff -r 439ccdbe2561 -r adfeda7de463 src/command_system/implementation/custom.py --- a/src/command_system/implementation/custom.py Thu Mar 18 14:40:00 2010 +0100 +++ b/src/command_system/implementation/custom.py Fri Mar 19 03:22:17 2010 +0200 @@ -21,7 +21,7 @@ be executed and commands defined here will not be detected. """ -from ..framework import CommandContainer, command, documentation +from ..framework import CommandContainer, command, doc from hosts import ChatCommands, PrivateChatCommands, GroupChatCommands class CustomCommonCommands(CommandContainer): @@ -58,7 +58,7 @@ HOSTS = (ChatCommands,) - @documentation(_("The same as using a doc-string, except it supports translation")) + @doc(_("The same as using a doc-string, except it supports translation")) @command def sing(self): return "Are you phreaking kidding me? Buy yourself a damn stereo..." diff -r 439ccdbe2561 -r adfeda7de463 src/command_system/implementation/standard.py --- a/src/command_system/implementation/standard.py Thu Mar 18 14:40:00 2010 +0100 +++ b/src/command_system/implementation/standard.py Fri Mar 19 03:22:17 2010 +0200 @@ -27,7 +27,7 @@ from common.logger import Constants from ..errors import CommandError -from ..framework import CommandContainer, command, documentation +from ..framework import CommandContainer, command, doc from ..mapping import generate_usage from hosts import ChatCommands, PrivateChatCommands, GroupChatCommands @@ -45,18 +45,18 @@ HOSTS = (ChatCommands, PrivateChatCommands, GroupChatCommands) @command - @documentation(_("Clear the text window")) + @doc(_("Clear the text window")) def clear(self): self.conv_textview.clear() @command - @documentation(_("Hide the chat buttons")) + @doc(_("Hide the chat buttons")) def compact(self): new_status = not self.hide_chat_buttons self.chat_buttons_set_visible(new_status) @command(overlap=True) - @documentation(_("Show help on a given command or a list of available commands if -(-a)ll is given")) + @doc(_("Show help on a given command or a list of available commands if -(-a)ll is given")) def help(self, command=None, all=False): if command: command = self.get_command(command) @@ -83,17 +83,17 @@ self.echo(help(self, 'help')) @command(raw=True) - @documentation(_("Send a message to the contact")) + @doc(_("Send a message to the contact")) def say(self, message): self.send(message) @command(raw=True) - @documentation(_("Send action (in the third person) to the current chat")) + @doc(_("Send action (in the third person) to the current chat")) def me(self, action): self.send("/me %s" % action) @command('lastlog', overlap=True) - @documentation(_("Show logged messages which mention given text")) + @doc(_("Show logged messages which mention given text")) def grep(self, text, limit=None): results = gajim.logger.get_search_results_for_query(self.contact.jid, text, self.account) @@ -129,7 +129,7 @@ self.echo(formatted) @command(raw=True, empty=True) - @documentation(_(""" + @doc(_(""" Set current the status Status can be given as one of the following values: online, away, @@ -142,7 +142,7 @@ connection.change_status(status, message) @command(raw=True, empty=True) - @documentation(_("Set the current status to away")) + @doc(_("Set the current status to away")) def away(self, message): if not message: message = _("Away") @@ -150,7 +150,7 @@ connection.change_status('away', message) @command('back', raw=True, empty=True) - @documentation(_("Set the current status to online")) + @doc(_("Set the current status to online")) def online(self, message): if not message: message = _("Available") @@ -166,19 +166,19 @@ HOSTS = (ChatCommands, PrivateChatCommands) @command - @documentation(_("Toggle the GPG encryption")) + @doc(_("Toggle the GPG encryption")) def gpg(self): self._toggle_gpg() @command - @documentation(_("Send a ping to the contact")) + @doc(_("Send a ping to the contact")) def ping(self): if self.account == gajim.ZEROCONF_ACC_NAME: raise CommandError(_('Command is not supported for zeroconf accounts')) gajim.connections[self.account].sendPing(self.contact) @command - @documentation(_("Send DTMF events through an open audio session")) + @doc(_("Send DTMF events through an open audio session")) def dtmf(self, events): if not self.audio_sid: raise CommandError(_("There is no open audio session with this contact")) @@ -193,7 +193,7 @@ raise CommandError(_("No valid DTMF event specified")) @command - @documentation(_("Toggle audio session")) + @doc(_("Toggle audio session")) def audio(self): if self.audio_state == self.JINGLE_STATE_NOT_AVAILABLE: raise CommandError(_("Video sessions are not available")) @@ -204,7 +204,7 @@ self._audio_button.set_active(not state) @command - @documentation(_("Toggle video session")) + @doc(_("Toggle video session")) def video(self): if self.video_state == self.JINGLE_STATE_NOT_AVAILABLE: raise CommandError(_("Video sessions are not available")) @@ -239,7 +239,7 @@ HOSTS = (GroupChatCommands,) @command(raw=True) - @documentation(_("Change your nickname in a group chat")) + @doc(_("Change your nickname in a group chat")) def nick(self, new_nick): try: new_nick = helpers.parse_resource(new_nick) @@ -249,7 +249,7 @@ self.new_nick = new_nick @command('query', raw=True) - @documentation(_("Open a private chat window with a specified occupant")) + @doc(_("Open a private chat window with a specified occupant")) def chat(self, nick): nicks = gajim.contacts.get_nick_list(self.account, self.room_jid) if nick in nicks: @@ -258,7 +258,7 @@ raise CommandError(_("Nickname not found")) @command('msg', raw=True) - @documentation(_("Open a private chat window with a specified occupant and send him a message")) + @doc(_("Open a private chat window with a specified occupant and send him a message")) def message(self, nick, a_message): nicks = gajim.contacts.get_nick_list(self.account, self.room_jid) if nick in nicks: @@ -267,7 +267,7 @@ raise CommandError(_("Nickname not found")) @command(raw=True, empty=True) - @documentation(_("Display or change a group chat topic")) + @doc(_("Display or change a group chat topic")) def topic(self, new_topic): if new_topic: self.connection.send_gc_subject(self.room_jid, new_topic) @@ -275,13 +275,13 @@ return self.subject @command(raw=True, empty=True) - @documentation(_("Invite a user to a room for a reason")) + @doc(_("Invite a user to a room for a reason")) def invite(self, jid, reason): self.connection.send_invite(self.room_jid, jid, reason) return _("Invited %s to %s") % (jid, self.room_jid) @command(raw=True, empty=True) - @documentation(_("Join a group chat given by a jid, optionally using given nickname")) + @doc(_("Join a group chat given by a jid, optionally using given nickname")) def join(self, jid, nick): if not nick: nick = self.nick @@ -298,12 +298,12 @@ pass @command('part', 'close', raw=True, empty=True) - @documentation(_("Leave the groupchat, optionally giving a reason, and close tab or window")) + @doc(_("Leave the groupchat, optionally giving a reason, and close tab or window")) def leave(self, reason): self.parent_win.remove_tab(self, self.parent_win.CLOSE_COMMAND, reason) @command(raw=True, empty=True) - @documentation(_(""" + @doc(_(""" Ban user by a nick or a jid from a groupchat If given nickname is not found it will be treated as a jid. @@ -315,14 +315,14 @@ self.connection.gc_set_affiliation(self.room_jid, who, 'outcast', reason or str()) @command(raw=True, empty=True) - @documentation(_("Kick user by a nick from a groupchat")) + @doc(_("Kick user by a nick from a groupchat")) def kick(self, who, reason): if not who in gajim.contacts.get_nick_list(self.account, self.room_jid): raise CommandError(_("Nickname not found")) self.connection.gc_set_role(self.room_jid, who, 'none', reason or str()) @command - @documentation(_("Display names of all group chat occupants")) + @doc(_("Display names of all group chat occupants")) def names(self, verbose=False): get_contact = lambda nick: gajim.contacts.get_gc_contact(self.account, self.room_jid, nick) nicks = gajim.contacts.get_nick_list(self.account, self.room_jid) @@ -343,11 +343,11 @@ return ', '.join(nicks) @command('ignore', raw=True) - @documentation(_("Forbid an occupant to send you public or private messages")) + @doc(_("Forbid an occupant to send you public or private messages")) def block(self, who): self.on_block(None, who) @command('unignore', raw=True) - @documentation(_("Allow an occupant to send you public or private messages")) + @doc(_("Allow an occupant to send you public or private messages")) def unblock(self, who): self.on_unblock(None, who)

1 0

gajim: Check that there is an argument to gajim-remove handle_ur...
by Yann Leboulanger 18 Mar '10

18 Mar '10

changeset 1e64734c26ef in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=1e64734c26ef description: Check that there is an argument to gajim-remove handle_uri function. Fixes #5660 diffstat: src/config.py | 32 ++++++++++++++++---------------- src/gajim-remote.py | 2 ++ 2 files changed, 18 insertions(+), 16 deletions(-) diffs (55 lines): diff -r 15f6a54fcd73 -r 1e64734c26ef src/config.py --- a/src/config.py Tue Mar 16 07:09:44 2010 +0100 +++ b/src/config.py Thu Mar 18 13:31:12 2010 +0100 @@ -2764,23 +2764,23 @@ gajim.config.del_per('accounts', self.account) gajim.interface.save_config() del gajim.interface.instances[self.account] - if self.account in gajim.nicks: + if self.account in gajim.nicks: del gajim.interface.minimized_controls[self.account] - del gajim.nicks[self.account] - del gajim.block_signed_in_notifications[self.account] - del gajim.groups[self.account] - gajim.contacts.remove_account(self.account) - del gajim.gc_connected[self.account] - del gajim.automatic_rooms[self.account] - del gajim.to_be_removed[self.account] - del gajim.newly_added[self.account] - del gajim.sleeper_state[self.account] - del gajim.encrypted_chats[self.account] - del gajim.last_message_time[self.account] - del gajim.status_before_autoaway[self.account] - del gajim.transport_avatar[self.account] - del gajim.gajim_optional_features[self.account] - del gajim.caps_hash[self.account] + del gajim.nicks[self.account] + del gajim.block_signed_in_notifications[self.account] + del gajim.groups[self.account] + gajim.contacts.remove_account(self.account) + del gajim.gc_connected[self.account] + del gajim.automatic_rooms[self.account] + del gajim.to_be_removed[self.account] + del gajim.newly_added[self.account] + del gajim.sleeper_state[self.account] + del gajim.encrypted_chats[self.account] + del gajim.last_message_time[self.account] + del gajim.status_before_autoaway[self.account] + del gajim.transport_avatar[self.account] + del gajim.gajim_optional_features[self.account] + del gajim.caps_hash[self.account] if len(gajim.connections) >= 2: # Do not merge accounts if only one exists gajim.interface.roster.regroup = gajim.config.get('mergeaccounts') else: diff -r 15f6a54fcd73 -r 1e64734c26ef src/gajim-remote.py --- a/src/gajim-remote.py Tue Mar 16 07:09:44 2010 +0100 +++ b/src/gajim-remote.py Thu Mar 18 13:31:12 2010 +0100 @@ -513,6 +513,8 @@ self.arguments += ['']*(len(args)-i) def handle_uri(self): + if len(sys.argv) < 3: + send_error(_('No uri given')) if not sys.argv[2].startswith('xmpp:'): send_error(_('Wrong uri')) sys.argv[2] = sys.argv[2][5:]

1 0

gajim: [MattJ] don't send an authorization identity in SASL PLAI...
by Yann Leboulanger 18 Mar '10

18 Mar '10

changeset 15f6a54fcd73 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=15f6a54fcd73 description: [MattJ] don't send an authorization identity in SASL PLAIN. Fixes #5658 diffstat: src/common/xmpp/auth_nb.py | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diffs (13 lines): diff -r 7b0a6b2ee12e -r 15f6a54fcd73 src/common/xmpp/auth_nb.py --- a/src/common/xmpp/auth_nb.py Sun Mar 14 00:12:18 2010 +0100 +++ b/src/common/xmpp/auth_nb.py Tue Mar 16 07:09:44 2010 +0100 @@ -358,8 +358,7 @@ '\r', '').replace('\n', '') node = Node('response', attrs={'xmlns':NS_SASL}, payload=[sasl_data]) elif self.mechanism == 'PLAIN': - sasl_data = u'%s\x00%s\x00%s' % (self.username + '@' + \ - self._owner.Server, self.username, self.password) + sasl_data = u'\x00%s\x00%s' % (self.username, self.password) sasl_data = sasl_data.encode('utf-8').encode('base64').replace( '\n', '') node = Node('auth', attrs={'xmlns': NS_SASL, 'mechanism': 'PLAIN'},

1 0

gajim: don't fail when notification-daemon doesn't follow specif...
by Yann Leboulanger 18 Mar '10

18 Mar '10

changeset 7b0a6b2ee12e in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=7b0a6b2ee12e description: don't fail when notification-daemon doesn't follow specifications. Fixes #5638 diffstat: src/notify.py | 90 +++++++++++++++++++++++++++++++++------------------------- 1 files changed, 51 insertions(+), 39 deletions(-) diffs (115 lines): diff -r bd93a4313ec9 -r 7b0a6b2ee12e src/notify.py --- a/src/notify.py Wed Mar 10 22:43:55 2010 +0100 +++ b/src/notify.py Sun Mar 14 00:12:18 2010 +0100 @@ -543,21 +543,24 @@ 'text': self.text, 'image': self.path_to_image} gajim_icon = os.path.abspath(os.path.join(gajim.DATA_DIR, 'pixmaps', 'gajim.png')) - self.notif.Notify( - dbus.String(_('Gajim')), # app_name (string) - dbus.UInt32(0), # replaces_id (uint) - ntype, # event_id (string) - dbus.String(gajim_icon), # app_icon (string) - dbus.String(''), # summary (string) - dbus.String(notification_text), # body (string) - # actions (stringlist) - (dbus.String('default'), dbus.String(self.event_type), - dbus.String('ignore'), dbus.String(_('Ignore'))), - [], # hints (not used in KDE yet) - dbus.UInt32(timeout*1000), # timeout (int), in ms - reply_handler=self.attach_by_id, - error_handler=self.notify_another_way) - return + try: + self.notif.Notify( + dbus.String(_('Gajim')), # app_name (string) + dbus.UInt32(0), # replaces_id (uint) + ntype, # event_id (string) + dbus.String(gajim_icon), # app_icon (string) + dbus.String(''), # summary (string) + dbus.String(notification_text), # body (string) + # actions (stringlist) + (dbus.String('default'), dbus.String(self.event_type), + dbus.String('ignore'), dbus.String(_('Ignore'))), + [], # hints (not used in KDE yet) + dbus.UInt32(timeout*1000), # timeout (int), in ms + reply_handler=self.attach_by_id, + error_handler=self.notify_another_way) + return + except Exception: + pass version = self.version if version[:2] == [0, 2]: actions = {} @@ -603,29 +606,35 @@ actions = () if 'actions' in self.capabilities: actions = (dbus.String('default'), dbus.String(self.event_type)) - self.notif.Notify( - dbus.String(_('Gajim')), - dbus.UInt32(0), # this notification does not replace other - dbus.String(self.path_to_image), - dbus.String(self.title), - dbus.String(text), - actions, - hints, - dbus.UInt32(timeout*1000), - reply_handler=self.attach_by_id, - error_handler=self.notify_another_way) + try: + self.notif.Notify( + dbus.String(_('Gajim')), + dbus.UInt32(0), # this notification does not replace other + dbus.String(self.path_to_image), + dbus.String(self.title), + dbus.String(text), + actions, + hints, + dbus.UInt32(timeout*1000), + reply_handler=self.attach_by_id, + error_handler=self.notify_another_way) + except Exception, e: + self.notify_another_way(e) else: - self.notif.Notify( - dbus.String(_('Gajim')), - dbus.String(self.path_to_image), - dbus.UInt32(0), - dbus.String(self.title), - dbus.String(self.text), - dbus.String(''), - hints, - dbus.UInt32(timeout*1000), - reply_handler=self.attach_by_id, - error_handler=self.notify_another_way) + try: + self.notif.Notify( + dbus.String(_('Gajim')), + dbus.String(self.path_to_image), + dbus.UInt32(0), + dbus.String(self.title), + dbus.String(self.text), + dbus.String(''), + hints, + dbus.UInt32(timeout*1000), + reply_handler=self.attach_by_id, + error_handler=self.notify_another_way) + except Exception, e: + self.notify_another_way(e) def attach_by_id(self, id_): self.id = id_ @@ -633,8 +642,11 @@ notification_response_manager.add_pending(self.id, self) def notify_another_way(self,e): - gajim.log.debug(str(e)) - gajim.log.debug('Need to implement a new way of falling back') + gajim.log.debug('Error when trying to use notification daemon: %s' % \ + str(e)) + instance = dialogs.PopupNotificationWindow(self.event_type, self.jid, + self.account, self.msg_type, self.path_to_image, self.title, self.text) + gajim.interface.roster.popup_notification_windows.append(instance) def on_action_invoked(self, id_, reason): if self.notif is None:

1 0

gajim: don't disconnect an account that is not fully connected. ...
by Yann Leboulanger 18 Mar '10

18 Mar '10

changeset bd93a4313ec9 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=bd93a4313ec9 description: don't disconnect an account that is not fully connected. Fixes #5648 diffstat: src/roster_window.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r aea349158914 -r bd93a4313ec9 src/roster_window.py --- a/src/roster_window.py Wed Mar 10 13:51:55 2010 +0100 +++ b/src/roster_window.py Wed Mar 10 22:43:55 2010 +0100 @@ -2343,7 +2343,7 @@ self.quit_on_next_offline = 0 accounts_to_disconnect = [] for acct in accounts: - if gajim.connections[acct].connected: + if gajim.connections[acct].connected > 1: self.quit_on_next_offline += 1 accounts_to_disconnect.append(acct)

1 0

gajim: don't traceback when remove a disabled account. Fixes #5647
by Yann Leboulanger 18 Mar '10

18 Mar '10

changeset aea349158914 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=aea349158914 description: don't traceback when remove a disabled account. Fixes #5647 diffstat: src/config.py | 61 +++++++++++++++++++++++++++++++++++----------------------- 1 files changed, 37 insertions(+), 24 deletions(-) diffs (112 lines): diff -r 5fecaef990ba -r aea349158914 src/config.py --- a/src/config.py Tue Mar 09 21:48:57 2010 +0100 +++ b/src/config.py Wed Mar 10 13:51:55 2010 +0100 @@ -1740,9 +1740,9 @@ return win_opened = False - if gajim.interface.msg_win_mgr.get_controls(acct = account): + if gajim.interface.msg_win_mgr.get_controls(acct=account): win_opened = True - else: + elif account in gajim.interface.instances: for key in gajim.interface.instances[account]: if gajim.interface.instances[account][key] and key != \ 'remove_account': @@ -1750,10 +1750,13 @@ break # Detect if we have opened windows for this account def remove(account): - if 'remove_account' in gajim.interface.instances[account]: + if account in gajim.interface.instances and \ + 'remove_account' in gajim.interface.instances[account]: gajim.interface.instances[account]['remove_account'].window.\ present() else: + if not account in gajim.interface.instances: + gajim.interface.instances[account] = {} gajim.interface.instances[account]['remove_account'] = \ RemoveAccountWindow(account) if win_opened: @@ -2706,12 +2709,19 @@ def on_remove_button_clicked(self, widget): def remove(): - if gajim.connections[self.account].connected and \ + if self.account in gajim.connections and \ + gajim.connections[self.account].connected and \ not self.remove_and_unregister_radiobutton.get_active(): # change status to offline only if we will not remove this JID from # server gajim.connections[self.account].change_status('offline', 'offline') if self.remove_and_unregister_radiobutton.get_active(): + if not self.account in gajim.connections: + dialogs.ErrorDialog( + _('Account is disabled'), + _('To unregister from a server, account must be ' + 'enabled.')) + return if not gajim.connections[self.account].password: def on_ok(passphrase, checked): if passphrase == -1: @@ -2731,7 +2741,8 @@ else: self._on_remove_success(True) - if gajim.connections[self.account].connected: + if self.account in gajim.connections and \ + gajim.connections[self.account].connected: dialogs.ConfirmationDialog( _('Account "%s" is connected to the server') % self.account, _('If you remove it, the connection will be lost.'), @@ -2745,29 +2756,31 @@ if not res: return # Close all opened windows - gajim.interface.roster.close_all(self.account, force = True) - gajim.connections[self.account].disconnect(on_purpose = True) - del gajim.connections[self.account] + gajim.interface.roster.close_all(self.account, force=True) + if self.account in gajim.connections: + gajim.connections[self.account].disconnect(on_purpose=True) + del gajim.connections[self.account] gajim.logger.remove_roster(gajim.get_jid_from_account(self.account)) gajim.config.del_per('accounts', self.account) gajim.interface.save_config() del gajim.interface.instances[self.account] - del gajim.interface.minimized_controls[self.account] - del gajim.nicks[self.account] - del gajim.block_signed_in_notifications[self.account] - del gajim.groups[self.account] - gajim.contacts.remove_account(self.account) - del gajim.gc_connected[self.account] - del gajim.automatic_rooms[self.account] - del gajim.to_be_removed[self.account] - del gajim.newly_added[self.account] - del gajim.sleeper_state[self.account] - del gajim.encrypted_chats[self.account] - del gajim.last_message_time[self.account] - del gajim.status_before_autoaway[self.account] - del gajim.transport_avatar[self.account] - del gajim.gajim_optional_features[self.account] - del gajim.caps_hash[self.account] + if self.account in gajim.nicks: + del gajim.interface.minimized_controls[self.account] + del gajim.nicks[self.account] + del gajim.block_signed_in_notifications[self.account] + del gajim.groups[self.account] + gajim.contacts.remove_account(self.account) + del gajim.gc_connected[self.account] + del gajim.automatic_rooms[self.account] + del gajim.to_be_removed[self.account] + del gajim.newly_added[self.account] + del gajim.sleeper_state[self.account] + del gajim.encrypted_chats[self.account] + del gajim.last_message_time[self.account] + del gajim.status_before_autoaway[self.account] + del gajim.transport_avatar[self.account] + del gajim.gajim_optional_features[self.account] + del gajim.caps_hash[self.account] if len(gajim.connections) >= 2: # Do not merge accounts if only one exists gajim.interface.roster.regroup = gajim.config.get('mergeaccounts') else:

1 0

gajim: don't print a second DB error message if a first one is a...
by Yann Leboulanger 18 Mar '10

18 Mar '10

changeset 5fecaef990ba in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=5fecaef990ba description: don't print a second DB error message if a first one is already shown. Fixes #5637 diffstat: src/common/connection.py | 3 ++- src/common/connection_handlers.py | 18 +++++++++--------- src/gajim.py | 11 +++++++++++ 3 files changed, 22 insertions(+), 10 deletions(-) diffs (132 lines): diff -r 2b4dd2bf4300 -r 5fecaef990ba src/common/connection.py --- a/src/common/connection.py Tue Mar 09 20:28:25 2010 +0100 +++ b/src/common/connection.py Tue Mar 09 21:48:57 2010 +0100 @@ -1367,13 +1367,14 @@ try: gajim.logger.write(kind, jid, log_msg) except exceptions.PysqliteOperationalError, e: - self.dispatch('ERROR', (_('Disk Write Error'), str(e))) + self.dispatch('DB_ERROR', (_('Disk Write Error'), str(e))) except exceptions.DatabaseMalformed: pritext = _('Database Error') sectext = _('The database file (%s) cannot be read. Try to ' 'repair it (see http://trac.gajim.org/wiki/DatabaseBackup)' ' or remove it (all history will be lost).') % \ common.logger.LOG_DB_PATH + self.dispatch('DB_ERROR', (pritext, sectext)) self.dispatch('MSGSENT', (jid, msg, keyID)) if callback: diff -r 2b4dd2bf4300 -r 5fecaef990ba src/common/connection_handlers.py --- a/src/common/connection_handlers.py Tue Mar 09 20:28:25 2010 +0100 +++ b/src/common/connection_handlers.py Tue Mar 09 21:48:57 2010 +0100 @@ -987,7 +987,7 @@ fil.write(str(card)) fil.close() except IOError, e: - self.dispatch('ERROR', (_('Disk Write Error'), str(e))) + self.dispatch('DB_ERROR', (_('Disk Write Error'), str(e))) def get_cached_vcard(self, fjid, is_fake_jid = False): '''return the vcard as a dict @@ -2075,13 +2075,13 @@ gajim.logger.write('error', frm, error_msg, tim=tim, subject=subject) except exceptions.PysqliteOperationalError, e: - self.dispatch('ERROR', (_('Disk Write Error'), str(e))) + self.dispatch('DB_ERROR', (_('Disk Write Error'), str(e))) except exceptions.DatabaseMalformed: pritext = _('Database Error') sectext = _('The database file (%s) cannot be read. Try to repair ' 'it (see http://trac.gajim.org/wiki/DatabaseBackup) or remove ' 'it (all history will be lost).') % common.logger.LOG_DB_PATH - self.dispatch('ERROR', (pritext, sectext)) + self.dispatch('DB_ERROR', (pritext, sectext)) self.dispatch('MSGERROR', (frm, msg.getErrorCode(), error_msg, msgtxt, tim, session)) @@ -2121,13 +2121,13 @@ try: gajim.logger.write('gc_msg', frm, msgtxt, tim=tim) except exceptions.PysqliteOperationalError, e: - self.dispatch('ERROR', (_('Disk Write Error'), str(e))) + self.dispatch('DB_ERROR', (_('Disk Write Error'), str(e))) except exceptions.DatabaseMalformed: pritext = _('Database Error') sectext = _('The database file (%s) cannot be read. Try to repair ' 'it (see http://trac.gajim.org/wiki/DatabaseBackup) or remove ' 'it (all history will be lost).') % common.logger.LOG_DB_PATH - self.dispatch('ERROR', (pritext, sectext)) + self.dispatch('DB_ERROR', (pritext, sectext)) def dispatch_invite_message(self, invite, frm): item = invite.getTag('invite') @@ -2369,14 +2369,14 @@ try: gajim.logger.write('gcstatus', who, st, show) except exceptions.PysqliteOperationalError, e: - self.dispatch('ERROR', (_('Disk Write Error'), str(e))) + self.dispatch('DB_ERROR', (_('Disk Write Error'), str(e))) except exceptions.DatabaseMalformed: pritext = _('Database Error') sectext = _('The database file (%s) cannot be read. Try to ' 'repair it (see http://trac.gajim.org/wiki/DatabaseBackup)' ' or remove it (all history will be lost).') % \ common.logger.LOG_DB_PATH - self.dispatch('ERROR', (pritext, sectext)) + self.dispatch('DB_ERROR', (pritext, sectext)) if avatar_sha or avatar_sha == '': if avatar_sha == '': # contact has no avatar @@ -2511,14 +2511,14 @@ try: gajim.logger.write('status', jid_stripped, status, show) except exceptions.PysqliteOperationalError, e: - self.dispatch('ERROR', (_('Disk Write Error'), str(e))) + self.dispatch('DB_ERROR', (_('Disk Write Error'), str(e))) except exceptions.DatabaseMalformed: pritext = _('Database Error') sectext = _('The database file (%s) cannot be read. Try to ' 'repair it (see http://trac.gajim.org/wiki/DatabaseBackup) ' 'or remove it (all history will be lost).') % \ common.logger.LOG_DB_PATH - self.dispatch('ERROR', (pritext, sectext)) + self.dispatch('DB_ERROR', (pritext, sectext)) our_jid = gajim.get_jid_from_account(self.name) if jid_stripped == our_jid and resource == self.server_resource: # We got our own presence diff -r 2b4dd2bf4300 -r 5fecaef990ba src/gajim.py --- a/src/gajim.py Tue Mar 09 20:28:25 2010 +0100 +++ b/src/gajim.py Tue Mar 09 21:48:57 2010 +0100 @@ -514,6 +514,15 @@ #('ERROR', account, (title_text, section_text)) dialogs.ErrorDialog(data[0], data[1]) + def handle_event_db_error(self, unused, data): + #('DB_ERROR', account, (title_text, section_text)) + if self.db_error_dialog: + return + self.db_error_dialog = dialogs.ErrorDialog(data[0], data[1]) + def destroyed(win): + self.db_error_dialog = None + self.db_error_dialog.connect('destroy', destroyed) + def handle_event_information(self, unused, data): #('INFORMATION', account, (title_text, section_text)) dialogs.InformationDialog(data[0], data[1]) @@ -2296,6 +2305,7 @@ 'ROSTER': self.handle_event_roster, 'WARNING': self.handle_event_warning, 'ERROR': self.handle_event_error, + 'DB_ERROR': self.handle_event_db_error, 'INFORMATION': self.handle_event_information, 'ERROR_ANSWER': self.handle_event_error_answer, 'STATUS': self.handle_event_status, @@ -3433,6 +3443,7 @@ self.status_sent_to_groups = {} self.gpg_passphrase = {} self.pass_dialog = {} + self.db_error_dialog = None self.default_colors = { 'inmsgcolor': gajim.config.get('inmsgcolor'), 'outmsgcolor': gajim.config.get('outmsgcolor'),

1 0

gajim: don't traceback when we get disconnected wile we parse st...
by Yann Leboulanger 18 Mar '10

18 Mar '10

changeset 2b4dd2bf4300 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=2b4dd2bf4300 description: don't traceback when we get disconnected wile we parse stream features. Fixes #5574 diffstat: src/common/xmpp/client_nb.py | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diffs (13 lines): diff -r 692a9ab62448 -r 2b4dd2bf4300 src/common/xmpp/client_nb.py --- a/src/common/xmpp/client_nb.py Fri Feb 26 22:51:42 2010 +0100 +++ b/src/common/xmpp/client_nb.py Tue Mar 09 20:28:25 2010 +0100 @@ -351,6 +351,9 @@ supported and desired. ''' self.stream_started = True + if not hasattr(self, 'onreceive'): + # we may already have been disconnected + return self.onreceive(None) if self.connected == 'plain':

1 0

← Newer
1
2
3
4
5
6
7
8
9
10
Older →

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits March 2010