Changeset 6248 for trunk/licq/src/user.cpp

Timestamp:

06/11/08 04:31:51 (7 months ago)

Author:

eugene

Message:

Introduced the default user encoding setting.

Files:

• trunk/licq/src/user.cpp (modified) (5 diffs)

trunk/licq/src/user.cpp

@@ -487 +487 @@
 
 //=====CUserManager=============================================================
-CUserManager::CUserManager() : m_hUsers(USER_HASH_SIZE)
+CUserManager::CUserManager()
+  : m_hUsers(USER_HASH_SIZE),
+    m_szDefaultEncoding(NULL)
 {
   // Set up the basic all users and new users group
@@ -530 +532 @@
   pthread_rdwr_destroy_np(&mutex_userlist);
   pthread_rdwr_destroy_np(&mutex_grouplist);
+
+  if (m_szDefaultEncoding != NULL)
+    free(m_szDefaultEncoding);
 }
 
@@ -614 +619 @@
   licqConf.ClearFlag(INI_FxFATAL);
   licqConf.ReadNum("NewUserGroup", m_nNewUserGroup, 0);
+  licqConf.SetFlag(INI_FxFATAL);
+
+  char szTemp[MAX_LINE_LEN];
+  licqConf.SetSection("network");
+  licqConf.ClearFlag(INI_FxFATAL);
+  licqConf.ReadStr("DefaultUserEncoding", szTemp, "");
+  SetString(&m_szDefaultEncoding, szTemp);
   licqConf.SetFlag(INI_FxFATAL);
   licqConf.CloseFile();
@@ -1638 +1650 @@
   u->RemoveFromGroup(GROUPS_USER, _nGroup);
   DropUser(u);
+}
+
+
+void CUserManager::SetDefaultUserEncoding(const char* defaultEncoding)
+{
+  SetString(&m_szDefaultEncoding, defaultEncoding);
 }
 
@@ -2513 +2531 @@
 }
 
+char* ICQUser::UserEncoding()
+{
+  if (m_szEncoding == NULL || m_szEncoding[0] == '\0')
+    return gUserManager.DefaultUserEncoding();
+  else
+    return m_szEncoding;
+}