re-enable hiding taskbar button on minimize on linux, though it doesn't work cleanly

diff --git a/main.cpp b/main.cpp
index 0f33376..e21d490 100644 (file)
--- a/main.cpp
+++ b/main.cpp
@@ -2725,7 +2725,7 @@ void BitcoinMiner()
                     string strStatus = strprintf("    %.0f khash/s", dHashesPerSec/1000.0);\r
                     UIThreadCall(bind(CalledSetStatusBar, strStatus, 0));\r
                     static int64 nLogTime;\r
-                    if (GetTime() - nLogTime > 60 * 60)\r
+                    if (GetTime() - nLogTime > 30 * 60)\r
                     {\r
                         nLogTime = GetTime();\r
                         printf("%s ", DateTimeStrFormat("%x %H:%M", GetTime()).c_str());\r

diff --git a/ui.cpp b/ui.cpp
index e51c1e2..42da9ca 100644 (file)
--- a/ui.cpp
+++ b/ui.cpp
@@ -375,13 +375,13 @@ void CMainFrame::OnIconize(wxIconizeEvent& event)
     // to get rid of the deprecated warning.  Just ignore it.\r
     if (!event.Iconized())\r
         fClosedToTray = false;\r
-#ifdef __WXMSW__\r
+//#ifdef __WXMSW__\r
     // The tray icon sometimes disappears on ubuntu karmic\r
-    // Hiding the taskbar button doesn't work reliably on ubuntu lucid\r
+    // Hiding the taskbar button doesn't work cleanly on ubuntu lucid\r
     if (fMinimizeToTray && event.Iconized())\r
         fClosedToTray = true;\r
     Show(!fClosedToTray);\r
-#endif\r
+//#endif\r
     ptaskbaricon->Show(fMinimizeToTray || fClosedToTray);\r
 }\r
 \r
@@ -2437,7 +2437,7 @@ void CMyTaskBarIcon::Show(bool fShow)
         {\r
             strlcpy(pszPrevTip, strTooltip.c_str(), sizeof(pszPrevTip));\r
 #ifdef __WXMSW__\r
-            // somehow it'll choose the wrong icon and scale it down if\r
+            // somehow it'll choose the wrong size and scale it down if\r
             // we use the main icon, so we hand it one with only 16x16\r
             SetIcon(wxICON(favicon), strTooltip);\r
 #else\r