[Konversation-devel] [Bug 121768] konvi 0.19 autojoins when using Quick Connect, 0.18 did not

[Eike Hein]

------- You are receiving this mail because: -------
You are the assignee for the bug, or are watching the assignee.
         
http://bugs.kde.org/show_bug.cgi?id=121768         
sho eikehein com changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|UNCONFIRMED                 |RESOLVED
         Resolution|                            |FIXED



------- Additional Comments From sho eikehein com  2006-08-19 23:05 -------
SVN commit 574682 by hein:

Fix quick connect auto-joining the channels of the network
the server is recognized as being part of. This is a pile-on
patch fix; we need to refactor this to look better when we
have more time to spare (but we knew that already).
BUG:121768


 M  +12 -2     server.cpp  
 M  +2 -0      server.h  


--- trunk/extragear/network/konversation/src/server.cpp #574681:574682
 @ -59,6 +59,8  @
 
 Server::Server(ViewContainer* viewContainer, int serverGroupId, bool clearQuickServerList)
 {
+    quickConnect = false;
+
     m_serverGroup = Preferences::serverGroupById(serverGroupId);
 
     if (clearQuickServerList)
 @ -67,12 +69,14  @
     bot = getIdentity()->getBot();
     botPassword = getIdentity()->getPassword();
 
-    init(viewContainer, getIdentity()->getNickname(0),"");
+    init(viewContainer, getIdentity()->getNickname(0), "");
 }
 
 Server::Server(ViewContainer* viewContainer,const QString& hostName,const QString& port,
 const QString& channel,const QString& _nick, QString password,const bool& useSSL)
 {
+    quickConnect = true;
+
     QString nick( _nick );
 
     m_quickServer.setServer(hostName);
 @ -101,7 +105,7  @
     if (nick.isEmpty())
         nick = getIdentity()->getNickname(0);
 
-    init(viewContainer, nick, channel);
+    init (viewContainer, nick, channel);
 }
 
 void Server::doPreShellCommand()
 @ -3056,6 +3060,12  @
 {
     Konversation::ChannelList tmpList = m_serverGroup->channelList();
 
+    if (quickConnect && channel.isEmpty())
+    {
+        setAutoJoin(false);
+        return;
+    }
+
     if(!channel.isEmpty())
         tmpList.push_front(channel);
 
--- trunk/extragear/network/konversation/src/server.h #574681:574682
 @ -581,6 +581,8  @
         bool autoReconnect;
         bool deliberateQuit;
 
+        bool quickConnect;
+
         QString autoJoinChannel;
         QString autoJoinChannelKey;