[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdenetwork/kopete/protocols/irc
From:       Jason Keirstead <jason () keirstead ! org>
Date:       2005-01-21 1:48:52
Message-ID: 20050121014852.939C21CFD2 () office ! kde ! org
[Download RAW message or body]

CVS commit by brunes: 

Make editing an account's network function as expected.

Make opening a server tab not instantly connect you. Fix hostname in server tab.

BUG:93685


  M +12 -0     ircaccount.cpp   1.126
  M +1 -1      irccontact.cpp   1.193
  M +3 -1      ircservercontact.cpp   1.99
  M +1 -2      ui/irceditaccountwidget.cpp   1.41


--- kdenetwork/kopete/protocols/irc/ircaccount.cpp  #1.125:1.126
@@ -223,4 +223,5 @@ IRCAccount::IRCAccount(IRCProtocol *prot
         m_contactManager = new IRCContactManager(mNickName, this);
         setMyself( m_contactManager->mySelf() );
+        setAccountLabel(networkName);
         m_myServer = m_contactManager->myServer();
 }
@@ -257,4 +258,5 @@ void IRCAccount::setAltNick( const QStri
 {
         configGroup()->writeEntry(QString::fromLatin1( "altNick" ), altNick);
+        configGroup()->sync();
 }
 
@@ -276,4 +278,5 @@ void IRCAccount::setUserName( const QStr
         m_engine->setUserName(userName);
         configGroup()->writeEntry(CONFIG_USERNAME, userName);
+        configGroup()->sync();
 }
 
@@ -287,4 +290,5 @@ void IRCAccount::setRealName( const QStr
         m_engine->setRealName(userName);
         configGroup()->writeEntry(CONFIG_REALNAME, userName);
+        configGroup()->sync();
 }
 
@@ -301,4 +305,6 @@ void IRCAccount::setNetwork( const QStri
                 m_network = net;
                 configGroup()->writeEntry(CONFIG_NETWORKNAME, network);
+                configGroup()->sync();
+                setAccountLabel(network);
         }
         else
@@ -316,4 +322,6 @@ void IRCAccount::setNickName( const QStr
         mNickName = nick;
         configGroup()->writeEntry(CONFIG_NICKNAME, mNickName);
+        configGroup()->sync();
+
         if( mySelf() )
                 mySelf()->setNickName( mNickName );
@@ -325,4 +333,6 @@ void IRCAccount::setCodec( QTextCodec *c
         mCodec = codec;
         configGroup()->writeEntry(CONFIG_CODECMIB, codec->mibEnum());
+        configGroup()->sync();
+
         if( mCodec )
                 m_engine->setDefaultCodec( mCodec );
@@ -338,4 +348,5 @@ void IRCAccount::setDefaultPart( const Q
 {
         configGroup()->writeEntry( QString::fromLatin1( "defaultPart" ), defaultPart \
); +        configGroup()->sync();
 }
 
@@ -344,4 +355,5 @@ void IRCAccount::setDefaultQuit( const Q
 {
         configGroup()->writeEntry( QString::fromLatin1( "defaultQuit" ), defaultQuit \
); +        configGroup()->sync();
 }
 

--- kdenetwork/kopete/protocols/irc/irccontact.cpp  #1.192:1.193
@@ -131,5 +131,5 @@ Kopete::ChatSession *IRCContact::manager
         if (canCreate == Kopete::Contact::CanCreate && !m_chatSession)
         {
-                if (engine->status() == KIRC::Engine::Idle)
+                if( engine->status() == KIRC::Engine::Idle && \
dynamic_cast<IRCServerContact*>(this) == 0 )  account->connect();
 

--- kdenetwork/kopete/protocols/irc/ircservercontact.cpp  #1.98:1.99
@@ -74,4 +74,6 @@ void IRCServerContact::updateStatus()
                 case KIRC::Engine::Idle:
                 case KIRC::Engine::Connecting:
+                        if( m_chatSession )
+                                m_chatSession->setDisplayName( caption() );
                         setOnlineStatus( m_protocol->m_ServerStatusOffline );
                         break;
@@ -91,5 +93,5 @@ void IRCServerContact::updateStatus()
 const QString IRCServerContact::caption() const
 {
-        return i18n("%1 @ \
%2").arg(ircAccount()->mySelf()->nickName()).arg(kircEngine()->currentHost()); +      \
return i18n("%1 @ %2").arg(ircAccount()->mySelf()->nickName() ).arg( \
kircEngine()->currentHost() );  }
 

--- kdenetwork/kopete/protocols/irc/ui/irceditaccountwidget.cpp  #1.40:1.41
@@ -233,5 +233,4 @@ Kopete::Account *IRCEditAccountWidget::a
                 setAccount( new IRCAccount( mProtocol, \
generateAccountId(networkName) ) );  
-                account()->setNetwork( networkName );
         }
 
@@ -242,5 +241,5 @@ Kopete::Account *IRCEditAccountWidget::a
         account()->setUserName( mUserName->text() );
         account()->setRealName( m_realNameLineEdit->text() );
-
+        account()->setNetwork( networkName );
         account()->setDefaultPart( partMessage->text() );
         account()->setDefaultQuit( quitMessage->text() );


[prev in list] [next in list] [prev in thread] [next in thread]