diff options
| author | Yann Leboulanger <asterix@lagaule.org> | 2010-03-18 15:31:12 +0300 |
|---|---|---|
| committer | Yann Leboulanger <asterix@lagaule.org> | 2010-03-18 15:31:12 +0300 |
| commit | 6d24ff27269353c873310fd666947f3b161021d4 (patch) | |
| tree | c77d95bae958936d021414216ef3220f9cd6d12b | |
| parent | 413988d6ba4976184cb7d8c1381d66cc610bd24e (diff) | |
Check that there is an argument to gajim-remove handle_uri function. Fixes #5660
| -rw-r--r-- | src/config.py | 32 | ||||
| -rw-r--r-- | src/gajim-remote.py | 2 |
2 files changed, 18 insertions, 16 deletions
diff --git a/src/config.py b/src/config.py index daa9fc909..6696cd975 100644 --- a/src/config.py +++ b/src/config.py @@ -2764,23 +2764,23 @@ class RemoveAccountWindow: 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 --git a/src/gajim-remote.py b/src/gajim-remote.py index 8926cf341..d3bdd9f8e 100644 --- a/src/gajim-remote.py +++ b/src/gajim-remote.py @@ -513,6 +513,8 @@ class GajimRemote: 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:] |