electrum

commit 656560be7220ead454059e7ac6f82ef84cf6df30
parent 414d0e1fa10e1d6f0ef7d027c3ccc869961b8744
Author: ThomasV <thomasv@gitorious>
Date:   Thu,  7 May 2015 16:09:39 +0200

show many address labels in tx default label. fixes #1200

Diffstat:
M
lib/wallet.py
 | 
5
+++--

1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/lib/wallet.py b/lib/wallet.py
@@ -802,11 +802,12 @@ class Abstract_Wallet(object):
     def get_default_label(self, tx_hash):
         if self.txi.get(tx_hash) == {}:
             d = self.txo.get(tx_hash, {})
+            labels = []
             for addr in d.keys():
-                assert self.is_mine(addr)
                 label = self.labels.get(addr)
                 if label:
-                    return label
+                    labels.append(label)
+            return ', '.join(labels)
         return ''
 
     def get_tx_fee(self, tx):