Changeset 3476 for branches/protocol_plugin_1_3_0

Timestamp:

05/02/03 09:06:55 (6 years ago)

Author:

emostar

Message:

Now everyone can use this. Load the owner from owner.Licq

Files:

• branches/protocol_plugin_1_3_0/licq/src/user.cpp (modified) (8 diffs)

branches/protocol_plugin_1_3_0/licq/src/user.cpp

@@ -149 +149 @@
 {
   //FIXME load owner of protocol plugins that are currently loaded
-  AddOwner("16325723", LICQ_PPID);
+  AddOwner("", LICQ_PPID);
   gLog.Info("%sUser configuration.\n", L_INITxSTR);
 
@@ -1602 +1602 @@
 
 void ICQUser::Init(unsigned long _nUin)
-{  
+{
   char szUin[24];
   sprintf(szUin, "%ld", _nUin);
@@ -1669 +1669 @@
   
   // gui plugin compat
-  if (m_nPPID == LICQ_PPID)
+  if (m_nPPID == LICQ_PPID && m_szId)
     m_nUin = strtoul(m_szId, (char **)NULL, 10);
   else
@@ -2815 +2815 @@
 ICQOwner::ICQOwner(const char *_szId, unsigned long _nPPID)
 {
-  gLog.Info("%sOwner configuration for %s.\n", L_INITxSTR, _szId);
   char szTemp[MAX_LINE_LEN];
   char filename[MAX_FILENAME_LEN];
@@ -2822 +2821 @@
   m_szPassword = NULL;
 
-  Init(_szId, _nPPID);
-  //SetOnContactList(true);
-  m_bOnContactList = true;
-
   // Get data from the config file
   char *p = PPIDSTRING(_nPPID);
@@ -2838 +2833 @@
   }
 
+  // Get the id before init
   m_fConf.SetFileName(filename);
+  m_fConf.ReloadFile();
+  m_fConf.SetFlags(0);
+  m_fConf.SetSection("user");
+  m_fConf.ReadStr("Uin", szTemp, "", false);
+  
+  // Now we can init
+  Init(szTemp, _nPPID);
+  m_bOnContactList = true;
+
+  // And finally our favorite function
   LoadInfo();
   m_fConf.ReadStr("Password", szTemp, "", false);
@@ -2852 +2858 @@
   m_fConf.CloseFile();
 
+  gLog.Info("%sOwner configuration for %s.\n", L_INITxSTR, m_szId);
+
   snprintf(filename, MAX_FILENAME_LEN - 1, "%s/%s/owner.%s.%s.history", BASE_DIR, HISTORY_DIR,
-           _szId, p);
+           m_szId, p);
   SetHistoryFile(filename);
 
@@ -2924 +2932 @@
   }
   m_fConf.SetSection("user");
-  m_fConf.WriteNum("Uin", Uin());
+  m_fConf.WriteStr("Uin", IdString());
   m_fConf.WriteBool("WebPresence", WebAware());
   m_fConf.WriteBool("HideIP", HideIp());