Changeset 6372 for trunk/console/src/console.cpp

Timestamp:

07/01/08 05:59:12 (5 months ago)

Author:

flynd

Message:

More uin usage removed from console plugin.

Files:

• trunk/console/src/console.cpp (modified) (12 diffs)

trunk/console/src/console.cpp

@@ -299 +299 @@
     if (o->Password()[0] == '\0')
     {
-      gUserManager.DropOwner();
+      gUserManager.DropOwner(o);
       UserSelect();
     }
     else
-      gUserManager.DropOwner();
+      gUserManager.DropOwner(o);
   }
 
@@ -517 +517 @@
       for (unsigned short i = 0; i < MAX_CON; i++)
       {
-        if (s->Uin() == winCon[i]->nLastUin)
-          winCon[i]->nLastUin = 0;
+        if (s->Id() == winCon[i]->myLastId)
+          winCon[i]->myLastId.clear();
       }
     }
@@ -639 +639 @@
     // Needs to be better dealt with...
     // How's this then?
-    winMain->wprintf("Registration complete!\nYour UIN is %ld\n",
-                     gUserManager.OwnerUin());
+      winMain->wprintf("Registration complete!\nYour UIN is %s\n",
+          gUserManager.OwnerId(LICQ_PPID).c_str());
     winMain->fProcessInput = &CLicqConsole::InputCommand;
     PrintStatus();
@@ -815 +815 @@
         if (e->SubResult() == ICQ_TCPxACK_RETURN)
         {
-          u = gUserManager.FetchUser(e->Uin(), LOCK_R);
+          u = gUserManager.FetchUser(e->Id(), e->PPID(), LOCK_R);
           win->wprintf("%s is in %s mode:\n%s\n[Send \"urgent\" ('.u') to ignore]\n",
                        u->GetAlias(), u->StatusStr(), u->AutoResponse());
@@ -822 +822 @@
         else if (e->SubResult() == ICQ_TCPxACK_REFUSE)
         {
-          u = gUserManager.FetchUser(e->Uin(), LOCK_R);
+          u = gUserManager.FetchUser(e->Id(), e->PPID(), LOCK_R);
           win->wprintf("%s refused %s.\n",
                        u->GetAlias(), ue->Description());
@@ -839 +839 @@
           if(!ea->Accepted())
           {
-            u = gUserManager.FetchUser(e->Uin(), LOCK_R);
+            u = gUserManager.FetchUser(e->Id(), e->PPID(), LOCK_R);
             win->wprintf("%s refused file: %s\n",
                          u->GetAlias(), ea->Response());
@@ -906 +906 @@
         else
         {
-          u = gUserManager.FetchUser(e->Uin(), LOCK_R);
+          u = gUserManager.FetchUser(e->Id(), e->PPID(), LOCK_R);
           if (u != NULL && u->Away() && u->ShowAwayMsg())
           {
@@ -2149 +2149 @@
     {
       *sz = '\0';
-      ICQOwner *o = gUserManager.FetchOwner(LOCK_W);
+      ICQOwner* o = gUserManager.FetchOwner(LICQ_PPID, LOCK_W);
       o->SetAutoResponse(data->szRsp);
-      gUserManager.DropOwner();
+      gUserManager.DropOwner(o);
       winMain->wprintf("%C%AAuto-response set.\n",
                        m_cColorInfo->nColor, m_cColorInfo->nAttr);
@@ -3037 +3037 @@
             winMain->wprintf("Registration complete for user %s\n",data->szUin);
             gUserManager.SetOwnerUin(atol(data->szUin));
-            ICQOwner *owner = gUserManager.FetchOwner(LOCK_W);
+            ICQOwner* owner = gUserManager.FetchOwner(LICQ_PPID, LOCK_W);
             owner->SetPassword(data->szPassword1);
-            gUserManager.DropOwner();
+            gUserManager.DropOwner(owner);
 
             winMain->wprintf("Save password? (y/N) ");
@@ -3052 +3052 @@
       break;
     }
-  
+
   case STATE_QUERY:
   {
-    ICQOwner *o = gUserManager.FetchOwner(LOCK_W);
+    ICQOwner* o = gUserManager.FetchOwner(LICQ_PPID, LOCK_W);
     o->SetSavePassword(tolower(cIn) == 'y');
-    gUserManager.DropOwner();
-    
+    gUserManager.DropOwner(o);
+
     if (data->szOption[0] == '1')
     {
@@ -3251 +3251 @@
   winMain->state = STATE_LE;
 
-  char sz[20];
   //TODO which owner
-  sprintf(sz, "%lu", gUserManager.OwnerUin());
-  
-  winMain->data = new DataUserSelect(sz, LICQ_PPID); 
-  
-  ICQOwner *o = gUserManager.FetchOwner(LOCK_R);
+  winMain->data = new DataUserSelect(gUserManager.OwnerId(LICQ_PPID).c_str(), LICQ_PPID);
+
+  ICQOwner* o = gUserManager.FetchOwner(LICQ_PPID, LOCK_R);
   winMain->wprintf("%A%CEnter your password for %s (%s):%C%Z\n", A_BOLD,
                    COLOR_GREEN, o->GetAlias(), o->IdString(), COLOR_WHITE, A_BOLD);
-  gUserManager.DropOwner();
+  gUserManager.DropOwner(o);
 }
 
@@ -3288 +3285 @@
     case STATE_QUERY:
     {
-      ICQOwner *o = gUserManager.FetchOwner(LOCK_W);
+      ICQOwner* o = gUserManager.FetchOwner(LICQ_PPID, LOCK_W);
       o->SetSavePassword(tolower(cIn) == 'y');
       o->SetPassword(data->szPassword);
-      gUserManager.DropOwner();
+      gUserManager.DropOwner(o);
 
       if (winMain->data)