Remove unnecessary code related to the simple login modal dialog.fix/issue-314

The showFancyLogin option controls the appearance of a simple modal dialog at login.
This dialog is disabled if a splash screen is used. The dialog would show up if:
1. no splash screen was used and a new unsaved session was started
2. the 'Unified' splash screen was used and a saved session was restored.
   In this case the dialog and the 'Unified' splash screen would both be shown, covering each other.

This is a partial revert of commit b971f9aae7 and resolves issue #314.

Signed-off-by: Michele Calgaro <[email protected]>

6 files changed, 3 insertions, 178 deletions

diff --git a/ksmserver/CMakeLists.txt b/ksmserver/CMakeLists.txt
index aa6681f28..c8ffea812 100644
--- a/ksmserver/CMakeLists.txt
+++ b/ksmserver/CMakeLists.txt
@@ -44,7 +44,7 @@ install( FILES move_session_config.sh DESTINATION ${KCONF_UPDATE_INSTALL_DIR} )
 
 tde_add_tdeinit_executable( ksmserver AUTOMOC
   SOURCES
-    main.cpp server.cpp shutdowndlg.cpp startupdlg.cpp
+    main.cpp server.cpp shutdowndlg.cpp
     legacy.cpp startup.cpp shutdown.cpp client.cpp
     KSMServerInterface.skel server.skel timed.ui
   LINK dmctl-static tdeui-shared tdersync-shared ${TDEHW_LIBRARIES}
diff --git a/ksmserver/server.cpp b/ksmserver/server.cpp
index dea7c0599..6e7ec0c7f 100644
--- a/ksmserver/server.cpp
+++ b/ksmserver/server.cpp
@@ -580,7 +580,7 @@ extern "C" int _IceTransNoListen(const char * protocol);
 #endif
 
 KSMServer::KSMServer( const TQString& windowManager, const TQString& windowManagerAddArgs, bool _only_local )
-  : DCOPObject("ksmserver"), startupNotifierIPDlg(0), shutdownNotifierIPDlg(0), sessionGroup( "" ), protectionTimerCounter(0)
+  : DCOPObject("ksmserver"), shutdownNotifierIPDlg(0), sessionGroup( "" ), protectionTimerCounter(0)
 {
     the_server = this;
     clean = false;
@@ -1030,4 +1030,4 @@ bool KSMServer::defaultSession() const
 bool KSMServer::startupCompleted()
 {
 	  return m_startupCompleted;
-}
\ No newline at end of file
+}
diff --git a/ksmserver/server.h b/ksmserver/server.h
index 511013dc7..baddcb028 100644
--- a/ksmserver/server.h
+++ b/ksmserver/server.h
@@ -209,7 +209,6 @@ private:
     void saveCurrentSession();
     void saveCurrentSessionAs(TQString);
 
-    TQWidget* startupNotifierIPDlg;
     TQWidget* shutdownNotifierIPDlg;
 
  private:
diff --git a/ksmserver/startup.cpp b/ksmserver/startup.cpp
index f3b0012ab..7ff64ff72 100644
--- a/ksmserver/startup.cpp
+++ b/ksmserver/startup.cpp
@@ -81,26 +81,15 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #include "server.h"
 #include "global.h"
-#include "startupdlg.h"
 #include "client.h"
 
 #include <kdebug.h>
 
-// shall we show a nice fancy login screen?
-bool showFancyLogin = FALSE;
-bool trinity_startup_main_sequence_done = FALSE;
-
 /*!  Restores the previous session. Ensures the window manager is
   running (if specified).
  */
 void KSMServer::restoreSession( TQString sessionName )
 {
-    showFancyLogin = TDEConfigGroup(TDEGlobal::config(), "Login").readBoolEntry("showFancyLogin", true);
-    TDEConfig ksplashcfg( "ksplashrc", true );
-    ksplashcfg.setGroup( "KSplash" );
-    if ( ksplashcfg.readEntry( "Theme", "Default" ) != TQString("Unified") )
-        showFancyLogin = false;
-
     if( state != Idle )
         return;
     state = LaunchingWM;
@@ -142,14 +131,8 @@ void KSMServer::restoreSession( TQString sessionName )
         // visually more appealing startup.
         for (uint i = 0; i < wmCommands.count(); i++)
             startApplication( wmCommands[i] );
-        if ((showFancyLogin) && (!startupNotifierIPDlg)) {
-            startupNotifierIPDlg = KSMStartupIPDlg::showStartupIP();
-        }
         TQTimer::singleShot( 4000, this, TQ_SLOT( autoStart0() ) );
     } else {
-        if ((showFancyLogin) && (!startupNotifierIPDlg)) {
-            startupNotifierIPDlg = KSMStartupIPDlg::showStartupIP();
-        }
         autoStart0();
     }
 }
@@ -161,12 +144,6 @@ void KSMServer::restoreSession( TQString sessionName )
  */
 void KSMServer::startDefaultSession()
 {
-    showFancyLogin = TDEConfigGroup(TDEGlobal::config(), "Login").readBoolEntry("showFancyLogin", true);
-    TDEConfig ksplashcfg( "ksplashrc", true );
-    ksplashcfg.setGroup( "KSplash" );
-    if ( ksplashcfg.readEntry( "Theme", "Default" ) != TQString("None") )
-        showFancyLogin = false;
-
     if( state != Idle )
         return;
 
@@ -189,9 +166,6 @@ void KSMServer::startDefaultSession()
     else {
         startApplication( wm );
     }
-    if ((showFancyLogin) && (!startupNotifierIPDlg)) {
-        startupNotifierIPDlg = KSMStartupIPDlg::showStartupIP();
-    }
     TQTimer::singleShot( 4000, this, TQ_SLOT( autoStart0() ) );
 }
 
@@ -382,13 +356,6 @@ void KSMServer::finishStartup()
 
     state = Idle;
 
-    // [FIXME] When this fires applications are still being loaded, especially the task tray apps
-    // See if there is a way to detect when all session managed applications have been fully started and wait to fire this until that point!
-    if (startupNotifierIPDlg) {
-        static_cast<KSMStartupIPDlg*>(startupNotifierIPDlg)->closeSMDialog();
-        startupNotifierIPDlg=0;
-    }
-
     m_startupCompleted = true;
     setupXIOErrorHandler(); // From now on handle X errors as normal shutdown.
 }
@@ -459,12 +426,6 @@ void KSMServer::publishProgress( int progress, bool max  )
 
 void KSMServer::upAndRunning( const TQString& msg )
 {
-    if (startupNotifierIPDlg) {
-        static_cast<KSMStartupIPDlg*>(startupNotifierIPDlg)->setStartupPhase(msg);
-        if (msg == TQString("session ready")) {
-            trinity_startup_main_sequence_done = TRUE;
-        }
-    }
     DCOPRef( "ksplash" ).send( "upAndRunning", msg );
     XEvent e;
     e.xclient.type = ClientMessage;
diff --git a/ksmserver/startupdlg.cpp b/ksmserver/startupdlg.cpp
deleted file mode 100644
index e236ddfee..000000000
--- a/ksmserver/startupdlg.cpp
+++ /dev/null
@@ -1,86 +0,0 @@
-/*****************************************************************
-ksmserver - the KDE session management server
-
-Copyright (C) 2010-2011 Timothy Pearson <[email protected]>
-Copyright (C) 2000 Matthias Ettrich <[email protected]>
-******************************************************************/
-
-#include "startupdlg.h"
-#include <tqapplication.h>
-#include <tqlayout.h>
-#include <tqgroupbox.h>
-#include <tqvbuttongroup.h>
-#include <tqlabel.h>
-#include <tqvbox.h>
-#include <tqtimer.h>
-#include <tqstyle.h>
-#include <tqcombobox.h>
-#include <tqcursor.h>
-#include <tqmessagebox.h>
-#include <tqbuttongroup.h>
-#include <tqiconset.h>
-#include <tqpixmap.h>
-#include <tqpopupmenu.h>
-#include <tqtooltip.h>
-#include <tqimage.h>
-#include <tqpainter.h>
-#include <tqfontmetrics.h>
-#include <tqregexp.h>
-#include <tqeventloop.h>
-
-#include <tdelocale.h>
-#include <tdeconfig.h>
-#include <tdeapplication.h>
-#include <kdebug.h>
-#include <kpushbutton.h>
-#include <kstdguiitem.h>
-#include <kguiitem.h>
-#include <kiconloader.h>
-#include <tdeglobalsettings.h>
-#include <twin.h>
-#include <kuser.h>
-#include <kpixmap.h>
-#include <kimageeffect.h>
-#include <kdialog.h>
-#include <kseparator.h>
-#include <tdeconfig.h>
-
-#include <dcopclient.h>
-#include <dcopref.h>
-
-#include <sys/types.h>
-#include <sys/utsname.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include <math.h>
-#include <dmctl.h>
-#include <tdeaction.h>
-#include <netwm.h>
-
-#include <X11/Xlib.h>
-
-#include "startupdlg.moc"
-
-TQWidget* KSMStartupIPDlg::showStartupIP()
-{
-    kapp->enableStyles();
-    KSMStartupIPDlg* l = new KSMStartupIPDlg( 0 );
-
-    kapp->disableStyles();
-
-    return l;
-}
-
-KSMStartupIPDlg::KSMStartupIPDlg(TQWidget* parent)
-  : KSMModalDialog( parent )
-
-{
-	setStatusMessage(i18n("Loading your settings").append("..."));
-
-	show();
-	setActiveWindow();
-}
-
-KSMStartupIPDlg::~KSMStartupIPDlg()
-{
-}
diff --git a/ksmserver/startupdlg.h b/ksmserver/startupdlg.h
deleted file mode 100644
index bc9327a09..000000000
--- a/ksmserver/startupdlg.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/*****************************************************************
-ksmserver - the KDE session management server
-
-Copyright (C) 2000 Matthias Ettrich <[email protected]>
-******************************************************************/
-
-#ifndef STARTUPDLG_H
-#define STARTUPDLG_H
-
-#include <tqpixmap.h>
-#include <tqimage.h>
-#include <tqdatetime.h>
-#include <kdialog.h>
-#include <kpushbutton.h>
-#include <tqpushbutton.h>
-#include <tqframe.h>
-#include <kguiitem.h>
-#include <tqtoolbutton.h>
-#include <ksharedpixmap.h>
-
-class TQPushButton;
-class TQVButtonGroup;
-class TQPopupMenu;
-class TQTimer;
-class TQPainter;
-class TQString;
-class TDEAction;
-
-#include "timed.h"
-#include <tdeapplication.h>
-#include <kpixmapio.h>
-
-
-// The startup-in-progress dialog
-class KSMStartupIPDlg : public KSMModalDialog
-{
-	TQ_OBJECT
-
-public:
-	static TQWidget* showStartupIP();
-
-protected:
-	~KSMStartupIPDlg();
-
-private:
-	KSMStartupIPDlg( TQWidget* parent );
-};
-
-#endif