--- kdenetwork-3.5.7/kopete~/protocols/oscar/icq/ui/icqeditaccountwidget.cpp 2007-08-06 16:27:30 +0400 +++ kdenetwork-3.5.7/kopete/protocols/oscar/icq/ui/icqeditaccountwidget.cpp 2007-08-06 16:40:49 +0400 @@ -87,7 +87,7 @@ ICQEditAccountWidget::ICQEditAccountWidg configValue = mAccount->configGroup()->readBoolEntry( "WebAware", false ); mAccountSettings->chkWebAware->setChecked( configValue ); - int encodingValue = mAccount->configGroup()->readNumEntry( "DefaultEncoding", 4 ); + int encodingValue = mAccount->configGroup()->readNumEntry( "DefaultEncoding", 2251 ); mProtocol->setComboFromTable( mAccountSettings->encodingCombo, mProtocol->encodings(), encodingValue ); @@ -99,7 +99,7 @@ ICQEditAccountWidget::ICQEditAccountWidg { mProtocol->setComboFromTable( mAccountSettings->encodingCombo, mProtocol->encodings(), - 4 ); + 2251 ); } QObject::connect(mAccountSettings->buttonRegister, SIGNAL(clicked()), this, SLOT(slotOpenRegister())); --- kdenetwork-3.5.7/kopete~/protocols/oscar/oscaraccount.cpp 2007-08-06 16:27:31 +0400 +++ kdenetwork-3.5.7/kopete/protocols/oscar/oscaraccount.cpp 2007-08-06 16:39:42 +0400 @@ -442,7 +442,7 @@ void OscarAccount::setServerPort(int por QTextCodec* OscarAccount::defaultCodec() const { - return QTextCodec::codecForMib( configGroup()->readNumEntry( "DefaultEncoding", 4 ) ); + return QTextCodec::codecForMib( configGroup()->readNumEntry( "DefaultEncoding", 2251 ) ); } QTextCodec* OscarAccount::contactCodec( const OscarContact* contact ) const --- kdenetwork-3.5.7/kopete~/protocols/oscar/oscarencodingselectiondialog.cpp 2007-08-06 16:27:31 +0400 +++ kdenetwork-3.5.7/kopete/protocols/oscar/oscarencodingselectiondialog.cpp 2007-08-06 16:39:42 +0400 @@ -84,13 +84,15 @@ OscarEncodingSelectionDialog::OscarEncod if( (initialEncodingIndex = m_encodings.keys().findIndex(initialEncoding)) == -1 ) { kdWarning() << k_funcinfo << "Requested encoding mib " << initialEncoding - << " not in encoding list - defaulting to first encoding item" - << " in list to be shown in combobox initially" << endl; - /* initialEncodingIndex = position in combobox, value 0 currently - * corresponds to ISO-8859-1, generally to the first item in combobox, - * which usually is the default - */ - initialEncodingIndex = 0; + << " not in encoding list - defaulting to Windows-1251 cyrillic" + << endl; + if ( (initialEncodingIndex = m_encodings.keys().findIndex(2251)) == -1) { + kdWarning() << k_funcinfo << "Requested encoding mib " << 2251 + << " not in encoding list - defaulting to the first encoding item" + << " in list to be shown in combobox initially" << endl; + + initialEncodingIndex = 0; + } } m_encodingUI->encodingCombo->setCurrentItem( initialEncodingIndex ); setMainWidget( m_encodingUI ); --- kdenetwork-3.5.7/kopete~/protocols/oscar/oscarencodingselectiondialog.h 2007-08-06 16:27:31 +0400 +++ kdenetwork-3.5.7/kopete/protocols/oscar/oscarencodingselectiondialog.h 2007-08-06 16:39:42 +0400 @@ -28,7 +28,7 @@ class KOPETE_EXPORT OscarEncodingSelecti { Q_OBJECT public: - OscarEncodingSelectionDialog( QWidget* parent = 0, int initialEncoding = 4); + OscarEncodingSelectionDialog( QWidget* parent = 0, int initialEncoding = 2251); ~OscarEncodingSelectionDialog() {} int selectedEncoding() const;