Ticket #150: boincmgr_150.patch

clientgui/BOINCTaskBar.cpp

@@ -145 +145 @@
 
     // Which icon should be displayed?
     if (!pDoc->IsConnected()) {
-        if (IsBalloonsSupported()) {
-            SetIcon(m_iconTaskBarDisconnected, wxEmptyString);
-        } else {
             SetIcon(m_iconTaskBarDisconnected, m_strDefaultTitle);
-        }
     } else {
         if (RUN_MODE_NEVER == status.task_mode) {
-            if (IsBalloonsSupported()) {
-                SetIcon(m_iconTaskBarSnooze, wxEmptyString);
-            } else {
                 SetIcon(m_iconTaskBarSnooze, m_strDefaultTitle);
-            }
         } else {
-            if (IsBalloonsSupported()) {
-                SetIcon(m_iconTaskBarNormal, wxEmptyString);
-            } else {
                 SetIcon(m_iconTaskBarNormal, m_strDefaultTitle);
-            }
         }
     }
 
@@ -448 +436 @@
 
 void CTaskBarIcon::ResetTaskBar() {
 #ifdef __WXMSW___
-    SetBalloon(m_iconTaskBarNormal, wxT(""), wxT(""));
+    SetBalloon(m_iconTaskBarNormal, m_strDefaultTitle, wxT(""));
 #else
     SetIcon(m_iconTaskBarNormal, wxT(""));
 #endif

clientgui/msw/taskbarex.cpp

@@ -141 +141 @@
     if (!IsOK())
         return false;
 
-    wxString strTip = wxEmptyString;
-
-    if (!IsBalloonsSupported())
-        strTip = title + wxT(" - ") + message;
-
     memset(&notifyData, 0, sizeof(notifyData));
     notifyData.cbSize           = sizeof(notifyData);
     notifyData.hWnd             = (HWND) m_hWnd;
@@ -162 +157 @@
         notifyData.hIcon = (HICON) icon.GetHICON();
     }
 
-    if (IsBalloonsSupported())
+    notifyData.uFlags |= NIF_TIP;
+        lstrcpyn(notifyData.szTip, WXSTRINGCAST title, sizeof(notifyData.szTip));
+
+        if (IsBalloonsSupported())
     {
-        notifyData.uFlags |= NIF_INFO | NIF_TIP;
+        notifyData.uFlags |= NIF_INFO;
         lstrcpyn(notifyData.szInfo, WXSTRINGCAST message, sizeof(notifyData.szInfo));
         lstrcpyn(notifyData.szInfoTitle, WXSTRINGCAST title, sizeof(notifyData.szInfoTitle));
-        lstrcpyn(notifyData.szTip, WXSTRINGCAST wxEmptyString, sizeof(notifyData.szTip));
     }
-    else
-    {
-        notifyData.uFlags |= NIF_TIP;
-        lstrcpyn(notifyData.szTip, WXSTRINGCAST strTip, sizeof(notifyData.szTip));
-    }
 
     if (m_iconAdded)
         return (Shell_NotifyIcon(NIM_MODIFY, & notifyData) != 0);