wallet.get_label method

diff --git a/lib/gui.py b/lib/gui.py
index e6f58c4..99e1a9e 100644 (file)
--- a/lib/gui.py
+++ b/lib/gui.py
@@ -1235,9 +1235,7 @@ class ElectrumWindow:
                 conf_icon = gtk.STOCK_EXECUTE
             v = self.wallet.get_tx_value(tx_hash)
             balance += v 
-            label = self.wallet.labels.get(tx_hash)
-            is_default_label = (label == '') or (label is None)
-            if is_default_label: label = tx['default_label']
+            label, is_default_label = self.wallet.get_label(tx_hash)
             tooltip = tx_hash + "\n%d confirmations"%conf 
 
             inputs = map(lambda x: x.get('address'), tx['inputs'])

diff --git a/lib/gui_lite.py b/lib/gui_lite.py
index 641b503..307a0dc 100644 (file)
--- a/lib/gui_lite.py
+++ b/lib/gui_lite.py
@@ -440,10 +440,10 @@ class MiniWindow(QDialog):
     def update_history(self, tx_history):
         for tx in tx_history[-10:]:
             tx_hash = tx['tx_hash']
-            address = self.actuator.wallet.get_default_label(tx_hash)
+            label = self.actuator.wallet.get_label(tx_hash)[0]
             value = self.actuator.wallet.get_tx_value(tx_hash)
             amount = D(value) / 10**8
-            self.history_list.append(address, amount)
+            self.history_list.append(label, amount)
 
     def acceptbit(self):
         self.actuator.acceptbit(self.quote_currencies[0])

diff --git a/lib/gui_qt.py b/lib/gui_qt.py
index e98225d..05964ae 100644 (file)
--- a/lib/gui_qt.py
+++ b/lib/gui_qt.py
@@ -449,10 +449,7 @@ class ElectrumWindow(QMainWindow):
                 icon = QIcon(":icons/unconfirmed.png")
             v = self.wallet.get_tx_value(tx_hash)
             balance += v 
-            label = self.wallet.labels.get(tx_hash)
-            is_default_label = (label == '') or (label is None)
-            if is_default_label:
-                label = self.wallet.get_default_label(tx_hash)
+            label, is_default_label = self.wallet.get_label(tx_hash)
 
             item = QTreeWidgetItem( [ '', time_str, label, format_satoshis(v,True,self.wallet.num_zeros), format_satoshis(balance,False,self.wallet.num_zeros)] )
             item.setFont(2, QFont(MONOSPACE_FONT))

diff --git a/lib/gui_text.py b/lib/gui_text.py
index 7e28681..0b482a4 100644 (file)
--- a/lib/gui_text.py
+++ b/lib/gui_text.py
@@ -74,10 +74,7 @@ class ElectrumGui:
                 time_str = 'pending'
             tx_hash = tx['tx_hash']
 
-            label = self.wallet.labels.get(tx_hash)
-            is_default_label = (label == '') or (label is None)
-            if is_default_label: label = tx['default_label']
-
+            label, is_default_label = self.wallet.get_label(tx_hash)
             #label += ' '*(40 - len(label) )
             messages.append( format_str%( time_str, label, format_satoshis(v), format_satoshis(b) ) )
 

diff --git a/lib/wallet.py b/lib/wallet.py
index d0b2e63..6b0e261 100644 (file)
--- a/lib/wallet.py
+++ b/lib/wallet.py
@@ -572,6 +572,12 @@ class Wallet:
         return out
 
 
+    def get_label(self, tx_hash):
+        label = self.labels.get(tx_hash)
+        is_default = (label == '') or (label is None)
+        if is_default: label = self.get_default_label(tx_hash)
+        return label, is_default
+
     def get_default_label(self, tx_hash):
         tx = self.transactions.get(tx_hash)
         if tx: