tMerge pull request #453 from tkhaew/master - electrum - Electrum Bitcoin wallet
  HTML git clone https://git.parazyd.org/electrum
   DIR Log
   DIR Files
   DIR Refs
   DIR Submodules
       ---
   DIR commit 68e874fd86332bb4d606ae5fa8f89a10e8f2d3a7
   DIR parent e96c229759d5c11f78dcb03af13efc22e3b178c5
  HTML Author: ThomasV <thomasv1@gmx.de>
       Date:   Sat, 23 Nov 2013 01:24:28 -0800
       
       Merge pull request #453 from tkhaew/master
       
       Add addr value to receive menu hook
       Diffstat:
         M gui/qt/main_window.py               |       2 +-
         M plugins/pointofsale.py              |       2 +-
       
       2 files changed, 2 insertions(+), 2 deletions(-)
       ---
   DIR diff --git a/gui/qt/main_window.py b/gui/qt/main_window.py
       t@@ -1163,7 +1163,7 @@ class ElectrumWindow(QMainWindow):
        
                menu.addAction(_("Send From"), lambda: self.send_from_addresses(addrs))
                    
       -        run_hook('receive_menu', menu)
       +        run_hook('receive_menu', menu, addr)
                menu.exec_(self.receive_list.viewport().mapToGlobal(position))
        
        
   DIR diff --git a/plugins/pointofsale.py b/plugins/pointofsale.py
       t@@ -251,7 +251,7 @@ class Plugin(BasePlugin):
                item.setFlags(Qt.ItemIsSelectable | Qt.ItemIsUserCheckable | Qt.ItemIsEnabled | Qt.ItemIsDragEnabled)
        
            
       -    def receive_menu(self, menu):
       +    def receive_menu(self, menu, addr):
                menu.addAction(_("Request amount"), self.edit_amount)
                menu.addAction(_("Show Invoice"), lambda: self.toggle_QR_window(True))