Changeset 6405 for trunk/licq/src/fifo.cpp

Timestamp:

07/03/08 22:13:49 (5 months ago)

Author:

flynd

Message:

More UIN removed.

Files:

• trunk/licq/src/fifo.cpp (modified) (4 diffs)

trunk/licq/src/fifo.cpp

@@ -28 +28 @@
 #include <cstring>
 #include <cctype>
+#include <string>
 #include <sys/types.h>
 #include <unistd.h>
@@ -57 +58 @@
 #include "licq_icqd.h"
 
+using std::string;
 
 #define ReportMissingParams(cmdname) \
@@ -469 +471 @@
       if (u != NULL)
       {
-        const char *szNumber = u->GetCellularNumber();
-        if (strlen(szNumber))
-          d->icqSendSms(szNumber, argv[2], u->Uin() );
+        string number = u->GetCellularNumber();
+        gUserManager.DropUser(u);
+        if (!number.empty())
+          d->icqSendSms(szId, nPPID, number.c_str(), argv[2]);
         else
           gLog.Error("%sUnable to send SMS to %s, no SMS number found.\n",
                      L_ERRORxSTR, szId);
-
-        gUserManager.DropUser(u);
       }
     }
@@ -501 +502 @@
   }
 
-  ICQOwner* owner = gUserManager.FetchOwner(LICQ_PPID, LOCK_R);
-  d->icqSendSms(argv[1], argv[2], owner->Uin());
-  gUserManager.DropOwner(owner);
+  string id = gUserManager.OwnerId(LICQ_PPID);
+  d->icqSendSms(id.c_str(), LICQ_PPID, argv[1], argv[2]);
   return 0;
 }