From: Luke Dashjr <luke-jr+git@utopios.org>
Date: Wed, 4 Apr 2012 19:41:07 +0000 (-0400)
Subject: Merge branch '0.5.0.x' into 0.5.x
X-Git-Tag: v0.4.0-unstable~129^2~1^2~18^2~10^2~8
X-Git-Url: https://git.novaco.in/?a=commitdiff_plain;h=658cf0b1be93e08eee400b0bd1e9d3485313475d;p=novacoin.git

Merge branch '0.5.0.x' into 0.5.x

Conflicts:
	src/qt/bitcoingui.h
---

658cf0b1be93e08eee400b0bd1e9d3485313475d
diff --cc src/qt/bitcoingui.h
index a0905e4,efe3e9c..0fcb72a
--- a/src/qt/bitcoingui.h
+++ b/src/qt/bitcoingui.h
@@@ -112,15 -100,10 +112,15 @@@ public slots
      /** Set the status bar text if there are any warnings (removes sync progress bar if applicable) */
      void refreshStatusBar();
  
 +    /** Notify the user of an error in the network or transaction handling code. */
-     void error(const QString &title, const QString &message);
+     void error(const QString &title, const QString &message, bool modal = false);
 -    /* It is currently not possible to pass a return value to another thread through
 -       BlockingQueuedConnection, so use an indirected pointer.
 +    /** Asks the user whether to pay the transaction fee or to cancel the transaction.
 +       It is currently not possible to pass a return value to another thread through
 +       BlockingQueuedConnection, so an indirected pointer is used.
         http://bugreports.qt.nokia.com/browse/QTBUG-10440
 +
 +      @param[in] nFeeRequired       the required fee
 +      @param[out] payFee            true to pay the fee, false to not pay the fee
      */
      void askFee(qint64 nFeeRequired, bool *payFee);