From dbb838f4d0f197a97e5e6387ea9b175dbc59613b Mon Sep 17 00:00:00 2001
From: Jaquee <jaquee.monero@gmail.com>
Date: Sun, 8 Jan 2017 13:17:09 +0100
Subject: GUI cold signing

fix conflict
---
 src/wallet/api/wallet.h | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'src/wallet/api/wallet.h')

diff --git a/src/wallet/api/wallet.h b/src/wallet/api/wallet.h
index 41b3b22f3..5b4064e8e 100644
--- a/src/wallet/api/wallet.h
+++ b/src/wallet/api/wallet.h
@@ -43,6 +43,7 @@
 namespace Monero {
 class TransactionHistoryImpl;
 class PendingTransactionImpl;
+class UnsignedTransactionImpl;
 class AddressBookImpl;
 struct Wallet2CallbackImpl;
 
@@ -99,6 +100,8 @@ public:
                                         optional<uint64_t> amount, uint32_t mixin_count,
                                         PendingTransaction::Priority priority = PendingTransaction::Priority_Low);
     virtual PendingTransaction * createSweepUnmixableTransaction();
+    bool submitTransaction(const std::string &fileName);
+    virtual UnsignedTransaction * loadUnsignedTx(const std::string &unsigned_filename);
 
     virtual void disposeTransaction(PendingTransaction * t);
     virtual TransactionHistory * history() const;
@@ -126,6 +129,7 @@ private:
 
 private:
     friend class PendingTransactionImpl;
+    friend class UnsignedTransactionImpl;    
     friend class TransactionHistoryImpl;
     friend class Wallet2CallbackImpl;
     friend class AddressBookImpl;
-- 
cgit v1.2.3