1 files changed, 12 insertions, 8 deletions

diff --git a/noncore/apps/zsafe/zsafe.cpp b/noncore/apps/zsafe/zsafe.cpp
index 43565ee..ee1da77 100644
--- a/noncore/apps/zsafe/zsafe.cpp
+++ b/noncore/apps/zsafe/zsafe.cpp
@@ -387,7 +387,8 @@ static const char* const general_data[] = {
  *  TRUE to construct a modal dialog.
  */
 ZSafe::ZSafe( QWidget* parent,  const char* name, bool modal, WFlags fl )
-    : QDialog( parent, name, modal, fl )
+    : QDialog( parent, name, modal, fl ),  
+      Edit(0l), Delete(0l), Find(0l), New(0l), ListView(0l)
 {
     IsCut = false;
     IsCopy = false;
@@ -397,7 +398,12 @@ ZSafe::ZSafe( QWidget* parent,  const char* name, bool modal, WFlags fl )
     cfgFile=QDir::homeDirPath();
     cfgFile += "/.zsafe.cfg";
     // set the icon path
+#ifdef NO_OPIE
     QString qpedir ((const char *)getenv("QPEDIR"));
+#else
+    QString qpedir ((const char *)getenv("OPIEDIR"));
+#endif
+
 #ifdef DESKTOP
     iconPath = QDir::homeDirPath() + "/pics/";
 #else
@@ -509,15 +515,11 @@ ZSafe::ZSafe( QWidget* parent,  const char* name, bool modal, WFlags fl )
           exitZs (1);
        }
     }
-// #ifndef WIN32
-    // QString d2("Documents/application/zsafe");
-// #else
         QString d2(QDir::homeDirPath() + "/Documents/application/zsafe");
-// #endif
     QDir pd2(d2);
     if (!pd2.exists())
     {
-       QDir pd2("Documents/application");
+       QDir pd2(QDir::homeDirPath() + "Documents/application");
        if (!pd2.mkdir("zsafe", FALSE))
        {
           QMessageBox::critical( 0, tr("ZSafe"),
@@ -3647,12 +3649,14 @@ void ZSafe::resizeEvent ( QResizeEvent * )
    DeskW = this->width();
    DeskH = this->height();
 #endif
-   qWarning( QString("Width : %1").arg(DeskW), 2000 );
-   qWarning( QString("Height: %1").arg(DeskH), 2000 );
 
+   if (New)
    New->setGeometry   ( QRect( DeskW-84, 2, 20, 20 ) ); 
+   if (Edit)
    Edit->setGeometry  ( QRect( DeskW-64, 2, 20, 20 ) ); 
+   if (Delete)
    Delete->setGeometry( QRect( DeskW-44, 2, 20, 20 ) ); 
+   if (Find)
    Find->setGeometry  ( QRect( DeskW-24, 2, 20, 20 ) ); 
 }