From f0b5e9e116a1eb8b19b3676e7f8b125e912a78f3 Mon Sep 17 00:00:00 2001
From: "Wladimir J. van der Laan" <laanwj@gmail.com>
Date: Sat, 24 Mar 2012 19:11:39 +0100
Subject: remove unused CalledSetStatusBar and UIThreadCall notifications

---
 src/main.cpp | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'src/main.cpp')

diff --git a/src/main.cpp b/src/main.cpp
index ca75b9fdb..ca589e54f 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -3450,8 +3450,6 @@ void static BitcoinMiner(CWallet *pwallet)
                         dHashesPerSec = 1000.0 * nHashCounter / (GetTimeMillis() - nHPSTimerStart);
                         nHPSTimerStart = GetTimeMillis();
                         nHashCounter = 0;
-                        string strStatus = strprintf("    %.0f khash/s", dHashesPerSec/1000.0);
-                        UIThreadCall(boost::bind(CalledSetStatusBar, strStatus, 0));
                         static int64 nLogTime;
                         if (GetTime() - nLogTime > 30 * 60)
                         {
@@ -3508,7 +3506,6 @@ void static ThreadBitcoinMiner(void* parg)
         vnThreadsRunning[THREAD_MINER]--;
         PrintException(NULL, "ThreadBitcoinMiner()");
     }
-    UIThreadCall(boost::bind(CalledSetStatusBar, "", 0));
     nHPSTimerStart = 0;
     if (vnThreadsRunning[THREAD_MINER] == 0)
         dHashesPerSec = 0;
-- 
cgit v1.2.3


From 1a3f0da9229a8e524d1010cdc8bd3b9da71fe529 Mon Sep 17 00:00:00 2001
From: "Wladimir J. van der Laan" <laanwj@gmail.com>
Date: Sun, 25 Mar 2012 20:17:59 +0200
Subject: support RPC stop and encryptwallet with UI

---
 src/main.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/main.cpp')

diff --git a/src/main.cpp b/src/main.cpp
index ca589e54f..19a6c08f8 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1812,7 +1812,7 @@ bool CheckDiskSpace(uint64 nAdditionalBytes)
         strMiscWarning = strMessage;
         printf("*** %s\n", strMessage.c_str());
         ThreadSafeMessageBox(strMessage, "Bitcoin", wxOK | wxICON_EXCLAMATION);
-        CreateThread(Shutdown, NULL);
+        QueueShutdown();
         return false;
     }
     return true;
-- 
cgit v1.2.3


From 7cfbe1fee465e82ddbdc8ed17dfcce791bd765f5 Mon Sep 17 00:00:00 2001
From: "Wladimir J. van der Laan" <laanwj@gmail.com>
Date: Sun, 25 Mar 2012 20:47:33 +0200
Subject: qtui.h/noui.h interface cleanup

- rename wxMessageBox, remove redundant arguments to noui/qtui calls
- also, add flag to force blocking, modal dialog box for disk space warning etc
- clarify function naming
- no more special MessageBox needed from AppInit2, as window object is created before calling AppInit2
---
 src/main.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/main.cpp')

diff --git a/src/main.cpp b/src/main.cpp
index 19a6c08f8..7c49316b4 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1811,7 +1811,7 @@ bool CheckDiskSpace(uint64 nAdditionalBytes)
         string strMessage = _("Warning: Disk space is low  ");
         strMiscWarning = strMessage;
         printf("*** %s\n", strMessage.c_str());
-        ThreadSafeMessageBox(strMessage, "Bitcoin", wxOK | wxICON_EXCLAMATION);
+        ThreadSafeMessageBox(strMessage, "Bitcoin", wxOK | wxICON_EXCLAMATION | wxMODAL);
         QueueShutdown();
         return false;
     }
-- 
cgit v1.2.3