tfix for deleting an alias - electrum - Electrum Bitcoin wallet
HTML git clone https://git.parazyd.org/electrum
DIR Log
DIR Files
DIR Refs
DIR Submodules
---
DIR commit 6461a3c613ead967d4edcd149e0891106d478ff6
DIR parent 89a0509079345413957c69162acd672ce8f11404
HTML Author: ThomasV <thomasv@gitorious>
Date: Sat, 9 Jun 2012 17:32:52 +0200
fix for deleting an alias
Diffstat:
M lib/gui_qt.py | 15 ++++++++++-----
1 file changed, 10 insertions(+), 5 deletions(-)
---
DIR diff --git a/lib/gui_qt.py b/lib/gui_qt.py
t@@ -665,11 +665,14 @@ class ElectrumWindow(QMainWindow):
self.payto_e.setText(addr)
self.amount_e.setFocus()
- def delete_contact(self, addr):
+ def delete_contact(self, addr, is_alias):
if self.question("Do you want to remove %s from your list of contacts?"%addr):
- self.wallet.addressbook.remove(addr)
- if addr in self.wallet.labels.keys():
- self.wallet.labels.pop(addr)
+ if not is_alias and addr in self.wallet.addressbook:
+ self.wallet.addressbook.remove(addr)
+ if addr in self.wallet.labels.keys():
+ self.wallet.labels.pop(addr)
+ elif is_alias and addr in self.wallet.aliases:
+ self.wallet.aliases.pop(addr)
self.update_history_tab()
self.update_contacts_tab()
self.update_completions()
t@@ -687,7 +690,9 @@ class ElectrumWindow(QMainWindow):
label = unicode( item.text(1) )
if label not in self.wallet.aliases.keys():
menu.addAction(_("Edit label"), lambda: self.edit_label(False))
- menu.addAction(_("Delete"), lambda: self.delete_contact(addr))
+ menu.addAction(_("Delete"), lambda: self.delete_contact(addr,False))
+ else:
+ menu.addAction(_("Delete"), lambda: self.delete_contact(label,True))
menu.exec_(self.contacts_list.viewport().mapToGlobal(position))