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
@@ -389,3 +389,4 @@ static const char* const general_data[] = {
 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)
 {
@@ -399,3 +400,8 @@ ZSafe::ZSafe( QWidget* parent,  const char* name, bool modal, WFlags fl )
     // set the icon path
+#ifdef NO_OPIE
     QString qpedir ((const char *)getenv("QPEDIR"));
+#else
+    QString qpedir ((const char *)getenv("OPIEDIR"));
+#endif
+
 #ifdef DESKTOP
@@ -511,7 +517,3 @@ ZSafe::ZSafe( QWidget* parent,  const char* name, bool modal, WFlags fl )
     }
-// #ifndef WIN32
-    // QString d2("Documents/application/zsafe");
-// #else
         QString d2(QDir::homeDirPath() + "/Documents/application/zsafe");
-// #endif
     QDir pd2(d2);
@@ -519,3 +521,3 @@ ZSafe::ZSafe( QWidget* parent,  const char* name, bool modal, WFlags fl )
     {
-       QDir pd2("Documents/application");
+       QDir pd2(QDir::homeDirPath() + "Documents/application");
        if (!pd2.mkdir("zsafe", FALSE))
@@ -3649,8 +3651,10 @@ void ZSafe::resizeEvent ( QResizeEvent * )
 #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 ) );