2 files changed, 5 insertions, 2 deletions

diff --git a/pwmanager/pwmanager/main.cpp b/pwmanager/pwmanager/main.cpp
index 70df15d..6e449c6 100644
--- a/pwmanager/pwmanager/main.cpp
+++ b/pwmanager/pwmanager/main.cpp
@@ -1,80 +1,81 @@
 /***************************************************************************
  *                                                                         *
  *   copyright (C) 2003, 2004 by Michael Buesch                            *
  *   email: mbuesch@freenet.de                                             *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License version 2        *
  *   as published by the Free Software Foundation.                         *
  *                                                                         *
  ***************************************************************************/
 
 /***************************************************************************
  * copyright (C) 2004 by Ulf Schenk
  * This file is originaly based on version 1.0.1 of pwmanager
  * and was modified to run on embedded devices that run microkde
  *
  * $Id$
  **************************************************************************/  
 
 #ifndef PWM_EMBEDDED
 #include <kcmdlineargs.h>
 #include <kaboutdata.h>
 #else
 #include <qdir.h>
 #include <kpimglobalprefs.h>
 #endif
 
 #include <klocale.h>
 #include <kstandarddirs.h>
 
 #include "pwmexception.h"
 #include "pwminit.h"
+void dumpMissing();
 
         #define LICENSE_FILE(::locate("data", "pwmanager/pwmanager_license_text"))
 
 int PwMApplication::newInstance()
 {
         static bool initial = true;
         if (initial) {
                 initial = false;
                 init = new PwMInit(this);
                 init->initializeApp();
         } else {
                 BUG_ON(!init);
                 printInfo("passing parameters to old instance.");
                 init->handleCmdLineArgs(false);
         }
         return EXIT_SUCCESS;
 }
 
 
 static const char *description = I18N_NOOP("PwManager\n"
                                            "The convenient way of managing passwords");
 
 #ifndef PWM_EMBEDDED
 static KCmdLineOptions options[] =
 {
                 { "minimized",          I18N_NOOP("Windows minimized"),         0 },
                 { "mintray",            I18N_NOOP("Windows minimized to tray"),0 },
                 { "open-deeplocked",    I18N_NOOP("Open all \"files\" deeplocked"),0 },
                 { "skip-self-test",     I18N_NOOP("Don't run a self-test on startup"),0 },
                 { "+[files...]",        I18N_NOOP("Files to open on startup"),  0 },
         { 0, 0, 0 }
 };
 #endif
 
 #ifdef PWM_DEBUG
 static void printDebugConfigureInfo()
 {
         cout << "================================" << endl;
         cout << PROG_NAME " version " PACKAGE_VER << endl;
 #ifdef CONFIG_KEYCARD
         cout << "CONFIG_KEYCARD:    enabled" << endl;
 #else
         cout << "CONFIG_KEYCARD:    disabled" << endl;
 #endif
 #ifdef CONFIG_KWALLETIF
         cout << "CONFIG_KWALLETIF:  enabled" << endl;
 #else
         cout << "CONFIG_KWALLETIF:  disabled" << endl;
@@ -166,55 +167,56 @@ int main(int argc, char *argv[])
   bool exitHelp = false;
   if ( argc > 1 ) {
       QString command = argv[1];
       if (  command == "-help" ){
           printf("PWM/PI command line commands:\n");
           printf("  no command: Start PWM/PI in usual way\n");
           printf("  -help: This output\n");
           printf(" PWM/PI is exiting now. Bye!\n");
           exitHelp = true;
       }
   }
   if ( ! exitHelp ) {
 
     PwMApplication a(argc, argv);
 
     KGlobal::setAppName( "pwmanager" );
 #ifndef DESKTOP_VERSION
     //qDebug("width %d ",QApplication::desktop()->width() );
     if ( QApplication::desktop()->width() > 320 )
       KGlobal::iconLoader()->setIconPath(QString(getenv("QPEDIR"))+"/pics/kdepim/pwmanager/icons22/");
     else
         KGlobal::iconLoader()->setIconPath(QString(getenv("QPEDIR"))+"/pics/kdepim/pwmanager/icons16/");
 #else
       QString fileName ;
       fileName  = qApp->applicationDirPath () + "/kdepim/pwmanager/icons22/";
       KGlobal::iconLoader()->setIconPath(QDir::convertSeparators(fileName));
       QApplication::addLibraryPath ( qApp->applicationDirPath () );
 
 #endif
       KStandardDirs::setAppDir( QDir::convertSeparators(locateLocal("data", "pwmanager")));
       KPimGlobalPrefs::instance()->setGlobalConfig();
 
       a.newInstance();
 
       //US       KAddressBookMain m ;
 
       //US      QObject::connect(&a, SIGNAL (appMessage ( const QCString &, const QByteArray & )), ExternalAppHandler::instance(), SLOT (appMessage ( const QCString &, const QByteArray & )));
       /*US
 #ifndef DESKTOP_VERSION
        a.showMainWidget( &m );
 #else
       a.setMainWidget( &m );
       m.resize (640, 480 );
       m.show();
 #endif
       */
       QObject::connect( &a, SIGNAL( lastWindowClosed()), &a, SLOT (quit()));
       a.exec();
+      dumpMissing();
       KPimGlobalPrefs::instance()->writeConfig();
   }
   qDebug("PWMPI: Bye! ");
 
 #endif
 
 }
diff --git a/pwmanager/pwmanager/pwminit.cpp b/pwmanager/pwmanager/pwminit.cpp
index 68f3637..0cf248c 100644
--- a/pwmanager/pwmanager/pwminit.cpp
+++ b/pwmanager/pwmanager/pwminit.cpp
@@ -142,98 +142,99 @@ void PwMInit::initializeApp()
         Configuration::init();
 #endif
         initDCOP();
         initKWalletEmu();
         initKeycard();
         initTray();
         handleCmdLineArgs();
         bool openDeeplocked = false;
         if (conf()->confGlobAutostartDeepLocked() ||
             savedCmd.open_deeplocked)
                 openDeeplocked = true;
     if ( false ){
     // LR is not working
         //if (conf()->confWndAutoMinimizeOnStart() ||
     //   savedCmd.minToTray) {
                 PwMDoc *newDoc = createDoc();
         qDebug("  createDoc()");
                 if (!newDoc->openDocUi(newDoc,
                                        conf()->confGlobAutoStart(),
                                        openDeeplocked)) {
                         delete newDoc;
         }
 
                         //US ENH for embedded devices: in the case of failure, open a document the default way  
                         createMainWnd(conf()->confGlobAutoStart(),
                               openDeeplocked,
                               true,
                               0,
                               savedCmd.minimized);
                         
 
 
 
                     //}
         } else {
                 createMainWnd(conf()->confGlobAutoStart(),
                               openDeeplocked,
                               true,
                               0,
                               savedCmd.minimized);
         }
         runStatus = running;
 }
 
 void PwMInit::shutdownApp(int exitStatus)
 {
 
 
-        PwM * iii;
-        while (  iii = _mainWndList.first() ) {
+        PwM * iii;;
+        while ( _mainWndList.count() ) {
+        iii = _mainWndList.first();
         disconnect(iii, SIGNAL(closed(PwM *)),
                    this, SLOT(mainWndClosed(PwM *)));
         mainWndClosed((iii));
     }
 
         printDebug(string("PwMInit::shutdownApp(")
                    + tostr(exitStatus) + ") called.");
         PWM_ASSERT((runStatus == running) || (runStatus == init));
         runStatus = shutdown;
         QApplication::exit(exitStatus);
         /* The destructor of PwMInit is called when control
          * leaves main()
          */
 }
 
 void PwMInit::initPosixSignalHandler()
 {
         signal(SIGINT, sig_handler);
         signal(SIGTERM, sig_handler);
 }
 
 void PwMInit::initDCOP()
 {
 #ifndef PWM_EMBEDDED
         _dcopClient = app->dcopClient();
         _dcopClient->setNotifications(true);
 #endif
 
 }
 
 void PwMInit::initKWalletEmu(bool forceDisable, bool forceReload)
 {
 #ifdef CONFIG_KWALLETIF
         if (!conf()->confGlobKwalletEmu() ||
             forceDisable) {
                 delete_ifnot_null(_kwalletEmu);
                 return;
         }
         try {
                 if (_kwalletEmu && forceReload)
                         delete_and_null(_kwalletEmu);
                 if (!_kwalletEmu)
                         _kwalletEmu = new KWalletEmu(this);
         } catch (PwMException e) {
                 string errMsg("initializing KWallet emulation failed.  ID: ");
                 errMsg += tostr(static_cast<int>(e.getId()));
                 errMsg += "  err-message: ";
                 errMsg += e.getMessage();