2 files changed, 16 insertions, 44 deletions

diff --git a/ChangeLog b/ChangeLog
index de27eb5..c8da96a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,14 +1,15 @@
         2004-??-??The Opie Team <opie@handhelds.org>
 
+        * Fixed ZSafe not starting up (Bug #1324) (mickeyl)
         * Fixed Drawpad initialization (Bug #1314) (mickeyl)
         * Added four themes courtesy Robert Griebl (http://www.softforge.de/zstyle)
         * Added Conversion tool for pim-data (eilers)
         * Modifcation of the PIM API for providing generic use of OPimRecords. (eilers)
 
         2004-25-04The Opie Team <opie@handhelds.org>
 
         * Released as Version 1.1.3 (devel)
         * Introduced first implementation of SQL-Support using SQLite (eilers)
         * Added a new Gutenberg Project reader app - opie-gutenbrowser (ljp)
         * Added a real system graffiti character set (brad)
         * Added Generic Keyconfig Widget (zecke)
diff --git a/noncore/apps/zsafe/zsafe.cpp b/noncore/apps/zsafe/zsafe.cpp
index bf8f7f4..6ff05ac 100644
--- a/noncore/apps/zsafe/zsafe.cpp
+++ b/noncore/apps/zsafe/zsafe.cpp
@@ -478,77 +478,48 @@ ZSafe::ZSafe( QWidget* parent,  const char* name, bool modal, WFlags fl )
    else
    {
       DeskS = DeskH;
    }
    resize( DeskW, DeskH );
    setMinimumSize( QSize( DeskS, DeskS ) );
    setMaximumSize( QSize( DeskS, DeskS ) );
 #else
     resize( DeskW, DeskH-30 );
 #endif
 
 #endif
-    // setCaption( tr( "ZSafe" ) );
-
-    filename = conf->readEntry(APP_KEY+"document");
+   setCaption( tr( "ZSafe" ) );
+   QString zsafeAppDirPath = QDir::homeDirPath() + "/Documents/application/zsafe";
+   QString filename = conf->readEntry(APP_KEY+"document");
    if (filename.isEmpty() || filename.isNull())
    {
-
-    // check if the directory application exists, if not
-    // create it
-// #ifndef WIN32
-    // QString d1("Documents/application");
-// #else
-    QString d1(QDir::homeDirPath() + "/Documents/application");
-// #endif
-    QDir pd1(d1);
-    if (!pd1.exists())
-    {
-       QDir pd1("Documents");
-       if (!pd1.mkdir("application", FALSE))
+       if ( !QDir( zsafeAppDirPath ).exists() )
        {
-          QMessageBox::critical( 0, tr("ZSafe"),
-#ifdef JPATCH_HDE
-               tr("Can't create directory\n.../Documents/application\n\nZSafe will now exit."));
-#else
-               tr("Can't create directory\n%1\n\nZSafe will now exit.").arg(d1));
-#endif
-          exitZs (1);
+           //FIXME: Pending someone to look into why QDir.mkdir does not work as expected
+           QString cmdline = QString().sprintf( "mkdir -p %s", (const char*) zsafeAppDirPath );
+           ::system( cmdline );
        }
-    }
-     QString d2(QDir::homeDirPath() + "/Documents/application/zsafe");
-    QDir pd2(d2);
-    if (!pd2.exists())
-    {
-       QDir pd2(QDir::homeDirPath() + "Documents/application");
-       if (!pd2.mkdir("zsafe", FALSE))
+       if ( !QDir( zsafeAppDirPath ).exists() )
        {
-          QMessageBox::critical( 0, tr("ZSafe"),
-#ifdef JPATCH_HDE
-               tr("Can't create directory\n...//Documents/application/zsafe\n\nZSafe will now exit."));
-#else
-               tr("Can't create directory\n%1\n\nZSafe will now exit.").arg(d2));
-#endif
-          exitZs (1);
+               QMessageBox::critical( 0, "ZSafe", tr("Can't create application data directory.\nZSafe will now exit."));
+               exitZs (1);
        }
     }
 
-
     // set the default filename
-    filename=d2 + "/passwords.zsf";
+    filename = zsafeAppDirPath + "/passwords.zsf";
 
     // save the current filename to the config file
     conf->writeEntry(APP_KEY+"document", filename);
     saveConf();
-   }
 
    //if (filename == "INVALIDPWD")
       //filename = "";
 
     QString ti = filename.right (filename.length() - filename.findRev ('/') - 1);
 #ifdef WIN32
     this->setCaption("Qt ZSafe: " + ti);
 #else
     this->setCaption("ZSafe: " + ti);
 #endif
 
     selectedItem = NULL;
@@ -2247,25 +2218,25 @@ bool ZSafe::saveDocument(const char* _filename,
        strcpy(entry[i++], "password");
        entry[i] = (char*)malloc(strlen("comment")+1);
        strcpy(entry[i++], "comment");
 
        entry[i] = (char*)malloc(strlen("field5")+1);
        strcpy(entry[i++], "field5");
        entry[i] = (char*)malloc(strlen("field6")+1);
        strcpy(entry[i++], "field6");
 
        retval = saveEntry(entry);
            for (int z=0; z<i; z++) free(entry[z]);
            if (retval == PWERR_DATA) {
-              owarn << "1: Error writing file, contents not saved" << oendl; 
+              owarn << "1: Error writing file, contents not saved" << oendl;
               saveFinalize();
               return false;
            }
 // #ifndef WIN32
            conf->writeEntry(APP_KEY+"valzsafe", 1);
 // #endif
            saveConf();
         }
 
         QListViewItem *i;
         // step through all categories
         for (i = ListView->firstChild();
@@ -2291,34 +2262,34 @@ bool ZSafe::saveDocument(const char* _filename,
          strcpy(entry[j++], si->text(3).utf8());
          entry[j] = (char*)malloc(strlen(si->text(4).utf8())+1);
          strcpy(entry[j++], si->text(4).utf8());
          entry[j] = (char*)malloc(strlen(si->text(5).utf8())+1);
          strcpy(entry[j++], si->text(5).utf8());
 
           retval = saveEntry(entry);
               for (int z=0; z<j; z++)
               {
                   free(entry[z]);
               }
               if (retval == PWERR_DATA) {
-                        owarn << "1: Error writing file, contents not saved" << oendl; 
+                        owarn << "1: Error writing file, contents not saved" << oendl;
                         saveFinalize();
                         return false;
               }
 
            }
         }
 
     if (saveFinalize() == PWERR_DATA) {
-                owarn << "2: Error writing file, contents not saved" << oendl; 
+                owarn << "2: Error writing file, contents not saved" << oendl;
         return false;
     } else {
 #ifndef DESKTOP
                 Global::statusMessage (tr("Password file saved."));
 #endif
                 modified = false;
         return true;
     }
 }
 
 PasswordForm *newPwdDialog;
 bool newPwdDialogResult = false;
@@ -3178,25 +3149,25 @@ void ZSafe::editCategory()
               categories.remove (category);
 // #ifndef WIN32
               conf->removeEntry(category);
 // #endif
               saveConf();
            }
 
            category = dialog->CategoryField->currentText();
            icon = dialog->IconField->currentText()+".png";
 
            if (cat)
            {
-              owarn << "Category found" << oendl; 
+              owarn << "Category found" << oendl;
 
               // if (!icon.isEmpty() && !icon.isNull())
               if (icon != "predefined.png")
               {
                   // build the full path
                   fullIconPath = iconPath + icon;
                   pix = new QPixmap (fullIconPath);
                   if (pix)
                   {
                      // save the full pixmap name into the config file
 // #ifndef WIN32
                      conf->writeEntry(APP_KEY+category, icon);