From 2e59feab3bda235e7fe8a8496317eea800367dff Mon Sep 17 00:00:00 2001 From: Stephan Erb Date: Fri, 28 Dec 2007 15:13:41 +0000 Subject: [PATCH] Remove useless import and fix GPG private key dialog. Do not fail when no key is selected. --- src/config.py | 2 -- src/dialogs.py | 8 ++++---- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/config.py b/src/config.py index a646bbb4e..8f92d5da0 100644 --- a/src/config.py +++ b/src/config.py @@ -1362,8 +1362,6 @@ class AccountsWindow: 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') diff --git a/src/dialogs.py b/src/dialogs.py index 6bb2b0e9f..32bf400a7 100644 --- a/src/dialogs.py +++ b/src/dialogs.py @@ -351,10 +351,10 @@ class ChooseGPGKeyDialog: 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