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

Timestamp:

07/01/08 18:58:01 (5 months ago)

Author:

flynd

Message:

Marked old owner functions in user manager as deprecated. Updated daemon to use newer owner calls.

Files:

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

trunk/licq/src/fifo.cpp

@@ -154 +154 @@
 StringToStatus(char *_szStatus)
 {
-  ICQOwner *o = gUserManager.FetchOwner(LOCK_R);
+  ICQOwner* o = gUserManager.FetchOwner(LICQ_PPID, LOCK_R);
   unsigned long nStatus = o->AddStatusFlags(0);
   int i =0;
@@ -172 +172 @@
     { NULL,       0                      }
   };
-  gUserManager.DropOwner();
+  gUserManager.DropOwner(o);
   if (_szStatus[0] == '*')
   {
@@ -335 +335 @@
 static int fifo_status( int argc, const char *const *argv, void *data)
 {
-  ICQOwner *o;
   CICQDaemon *d= (CICQDaemon *) data;
   const char *szStatus = argv[1];
@@ -348 +347 @@
 
   // Determine the status to go to
-  o = gUserManager.FetchOwner(LOCK_R);
+  ICQOwner* o = gUserManager.FetchOwner(LICQ_PPID, LOCK_R);
   bOffline = o->StatusOffline();
-  gUserManager.DropOwner();
+  gUserManager.DropOwner(o);
   nStatus = StringToStatus(const_cast<char *>(szStatus));
 
@@ -374 +373 @@
   if( argc > 2 )
   {
-    ICQOwner *o = gUserManager.FetchOwner(LOCK_W);
+    ICQOwner* o = gUserManager.FetchOwner(LICQ_PPID, LOCK_W);
     o->SetAutoResponse(argv[2]);
-    gUserManager.DropOwner();
+    gUserManager.DropOwner(o);
   }
 
@@ -386 +385 @@
 static int fifo_auto_response( int argc, const char *const *argv, void* /* data */)
 {
-  ICQOwner *o; 
-
   if( argc == 1 )
   {
@@ -394 +391 @@
   }
 
-  o = gUserManager.FetchOwner(LOCK_W);
+  ICQOwner* o = gUserManager.FetchOwner(LICQ_PPID, LOCK_W);
   o->SetAutoResponse(argv[1]);
-  gUserManager.DropOwner();
+  gUserManager.DropOwner(o);
 
   return 0;
@@ -504 +501 @@
   }
 
-  ICQUser *owner = gUserManager.FetchOwner(LOCK_R);
+  ICQOwner* owner = gUserManager.FetchOwner(LICQ_PPID, LOCK_R);
   d->icqSendSms(argv[1], argv[2], owner->Uin());
-  gUserManager.DropOwner();
+  gUserManager.DropOwner(owner);
   return 0;
 }