Changeset 6143 for trunk/qt4-gui/src/core

Timestamp:

04/11/08 04:54:45 (8 months ago)

Author:

flynd

Message:

Changed 'Auto popup message' setting to be user configurable which statuses to allow it for. This closes #1416.

Files:

• trunk/qt4-gui/src/core/licqgui.cpp (modified) (2 diffs)

trunk/qt4-gui/src/core/licqgui.cpp

@@ -1480 +1480 @@
         break;
 
-      if (Config::Chat::instance()->autoPopup() && sig->Argument() > 0)
-      {
-        bool popCheck = false;
+      if (sig->Argument() > 0)
+      {
+        unsigned short popCheck = 99;
 
         ICQOwner* o = gUserManager.FetchOwner(ppid, LOCK_R);
@@ -1491 +1491 @@
             case ICQ_STATUS_ONLINE:
             case ICQ_STATUS_FREEFORCHAT:
-              popCheck = true;
-            default:
-              gUserManager.DropOwner(ppid);
+              popCheck = 1;
+              break;
+            case ICQ_STATUS_AWAY:
+              popCheck = 2;
+              break;
+            case ICQ_STATUS_NA:
+              popCheck = 3;
+              break;
+            case ICQ_STATUS_OCCUPIED:
+              popCheck = 4;
+              break;
+            case ICQ_STATUS_DND:
+              popCheck = 5;
+              break;
           }
+          gUserManager.DropOwner(ppid);
         }
 
-        if (popCheck)
+        if (Config::Chat::instance()->autoPopup() >= popCheck)
         {
           ICQUser* u = gUserManager.FetchUser(id.toLatin1(), ppid, LOCK_R);