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