Changeset 6249 for trunk/qt4-gui/src/settings/chat.cpp

Timestamp:

06/11/08 05:31:29 (6 months ago)

Author:

eugene

Message:

Updated to use new daemon setting of default user encoding.

Files:

• trunk/qt4-gui/src/settings/chat.cpp (modified) (2 diffs)

trunk/qt4-gui/src/settings/chat.cpp

@@ -554 +554 @@
   mySendTNCheck->setChecked(gLicqDaemon->SendTypingNotification());
 
-  myDefaultEncodingCombo->setCurrentIndex(0);
-  // first combo myBox item is the locale encoding, so we skip it
-  for (int i = 1; i < myDefaultEncodingCombo->count(); i++)
+  QByteArray defaultEncoding = gUserManager.DefaultUserEncoding();
+  if (defaultEncoding.isEmpty())
+    myDefaultEncodingCombo->setCurrentIndex(0);
+  else
   {
-    if (UserCodec::encodingForName(myDefaultEncodingCombo->itemText(i)) == chatConfig->defaultEncoding())
+    for (int i = 1; i < myDefaultEncodingCombo->count(); i++)
     {
-       myDefaultEncodingCombo->setCurrentIndex(i);
-       break;
+      if (UserCodec::encodingForName(myDefaultEncodingCombo->itemText(i)) == defaultEncoding)
+      {
+        myDefaultEncodingCombo->setCurrentIndex(i);
+        break;
+      }
     }
   }
@@ -621 +625 @@
 
   if (myDefaultEncodingCombo->currentIndex() > 0)
-    chatConfig->setDefaultEncoding(UserCodec::encodingForName(myDefaultEncodingCombo->currentText()));
+    gUserManager.SetDefaultUserEncoding(UserCodec::encodingForName(myDefaultEncodingCombo->currentText()));
   else
-    chatConfig->setDefaultEncoding(QByteArray());
+    gUserManager.SetDefaultUserEncoding("");
   chatConfig->setShowAllEncodings(myShowAllEncodingsCheck->isChecked());