CVS commit by psn: 

* Fix bug 89660: Hide menu not saved
* Remove unused code

CCMAIL: 89660-close@bugs.kde.org


  M +8 -9      konversationmainwindow.cpp   1.135
  M +1 -1      konversationmainwindow.h   1.55
  M +3 -22     server.cpp   1.308
  M +0 -3      server.h   1.148


--- kdeextragear-2/konversation/konversation/konversationmainwindow.cpp  #1.134:1.135
@@ -159,7 +159,4 @@ KonversationMainWindow::KonversationMain
   statusBar()->setItemAlignment(StatusText,QLabel::AlignLeft);
 
-  // Initialize KMainWindow->menuBar()
-  showMenubar();
-
 #ifdef USE_MDI
   connect(this,SIGNAL (viewActivated(KMdiChildView*)),this,SLOT (changeToView(KMdiChildView*)) );
@@ -193,5 +190,5 @@ KonversationMainWindow::KonversationMain
   setAutoSaveSettings();
   showMenuBarAction->setChecked(KonversationApplication::preferences.getShowMenuBar());
-  showMenubar();
+  showMenubar(true);
 
   // set up KABC with a nice gui error dialog
@@ -282,13 +279,15 @@ void KonversationMainWindow::showToolbar
 }
 
-void KonversationMainWindow::showMenubar()
+void KonversationMainWindow::showMenubar(bool dontShowWarning)
 {
   if(showMenuBarAction->isChecked()) menuBar()->show();
   else
   {
+    if(!dontShowWarning) {
     QString accel=showMenuBarAction->shortcut().toString();
     KMessageBox::information(this,i18n("<qt>This will hide the menu bar completely."
                                        "You can show it again by typing %1.</qt>").arg(accel),
                                        "Hide menu bar","HideMenuBarWarning");
+    }
     menuBar()->hide();
   }

--- kdeextragear-2/konversation/konversation/konversationmainwindow.h  #1.54:1.55
@@ -137,5 +137,5 @@ class KonversationMainWindow : public MA
     void showToolbar();
     void showStatusbar();
-    void showMenubar();
+    void showMenubar(bool dontShowWarning = false);
 
     void changeView(QWidget* view);

--- kdeextragear-2/konversation/konversation/server.cpp  #1.307:1.308
@@ -42,5 +42,4 @@ using namespace KNetwork;
 #include <kstringhandler.h>
 #include <kdeversion.h>
-#include <kssl.h>
 
 #include "server.h"
@@ -153,5 +152,4 @@ Server::Server(KonversationMainWindow* m
     
   emit serverOnline(false);
- 
 }
 
@@ -245,5 +241,4 @@ void Server::init(KonversationMainWindow
   connecting = false;
   m_serverISON = 0;
-  m_ssl = 0;
   lastDccDir = QString::null;
 
@@ -563,19 +558,5 @@ void Server::ircServerConnectionSuccess(
 {
   reconnectCounter=0;
-/*  
-  if() {
-    if(KSSL::doesSSLWork()) {
-      if(!m_ssl) {
-        m_ssl = new KSSL();
-        m_ssl->connect(serverSocket->socketDevice());
-      } else {
-        m_ssl->reInitialize();
-      }
-    } else {
-      // FIXME show error msg and disconnect here!
-      kdDebug() << k_funcinfo << "SSL doesn't work!" << endl;
-    }
-  }
-*/
+
   connect(this,SIGNAL (nicknameChanged(const QString&)),statusView,SLOT (setNickname(const QString&)) );
   statusView->appendServerMessage(i18n("Info"),i18n("Connected; logging in..."));

--- kdeextragear-2/konversation/konversation/server.h  #1.147:1.148
@@ -47,5 +47,4 @@ class ChannelListPanel;
 class ScriptLauncher;
 class ServerISON;
-class KSSL;
 
 class Server : public QObject
@@ -573,6 +572,4 @@ class Server : public QObject
     /// List of nicks in Queries.
     NickInfoMap m_queryNicks;
-    
-    KSSL* m_ssl;
 };