6 files changed, 24 insertions, 14 deletions

diff --git a/apps/Applications/euroconv.desktop b/apps/Applications/euroconv.desktop
new file mode 100644
index 0000000..012d26e
--- a/dev/null
+++ b/apps/Applications/euroconv.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Comment=An Euro converter
+Comment[fr]=Un convertisseur Euro
+Exec=euroconv
+Icon=euroconv/euroconv
+Type=Application
+Name=Euroconv
+Name[fr]=Euroconv
+Name[de]=Euroconv
+
diff --git a/library/qpeapplication.h b/library/qpeapplication.h
index 7f74510..5c18836 100644
--- a/library/qpeapplication.h
+++ b/library/qpeapplication.h
@@ -152,37 +152,37 @@ inline void QPEApplication::showDialog( QDialog* d, bool nomax )
 }
 
 inline int QPEApplication::execDialog( QDialog* d, bool nomax )
 {
     showDialog(d,nomax);
     return d->exec();
 }
 
 enum Transformation { Rot0, Rot90, Rot180, Rot270 }; /* from qgfxtransformed_qws.cpp */
 
 inline void QPEApplication::setCurrentRotation( int r )
 {
     Transformation e;
 
     switch (r) {
         case 0:
             e = Rot0;
             break;
         case 90:
             e = Rot90;
             break;
         case 180:
             e = Rot180;
             break;
         case 270:
             e = Rot270;
             break;
         default:
             return;
     }
 
     qDebug("calling qApp->desktop()->qwsDisplay()->setTransformation( %d )\n", e);
-    qApp->desktop()->qwsDisplay()->setTransformation( e );
+    //qApp->desktop()->qwsDisplay()->setTransformation( e );
 }
 
 
 #endif
diff --git a/noncore/unsupported/mail2/bend/config.in b/noncore/unsupported/mail2/bend/config.in
index 097a965..d784bec 100644
--- a/noncore/unsupported/mail2/bend/config.in
+++ b/noncore/unsupported/mail2/bend/config.in
@@ -1,4 +1,4 @@
-  config BEND
-    boolean "bend"
-    default "y" if OPIEMAIL2
-    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE && OPIEMAIL2
+config BEND
+   boolean "bend"
+   default "y" if MAIL
+   depends ( LIBQPE || LIBQPE-X11 ) && LIBMAIL && LIBOPIE && MAIL
diff --git a/noncore/unsupported/mail2/config.in b/noncore/unsupported/mail2/config.in
index af0fa3c..02006a4 100644
--- a/noncore/unsupported/mail2/config.in
+++ b/noncore/unsupported/mail2/config.in
@@ -1,13 +1,12 @@
-  config OPIEMAIL2
-    boolean "opiemail"
-    default "y"
-    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE && BEND && LIBMAIL
-
   config MAIL
-    boolean
+    boolean "mail"
     default "y" if OPIEMAIL
-    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE && BEND && LIBMAIL
+    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
 
+ config OPIEMAIL2
+    boolean "opiemail"
+    default "y"
+    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE && BEND && LIBMAIL && MAIL
 
   source noncore/mail/bend/config.in
   source noncore/mail/libmail/config.in
diff --git a/noncore/unsupported/mail2/libmail/config.in b/noncore/unsupported/mail2/libmail/config.in
index dd7b2dc..9262679 100644
--- a/noncore/unsupported/mail2/libmail/config.in
+++ b/noncore/unsupported/mail2/libmail/config.in
@@ -1,4 +1,4 @@
   config LIBMAIL
     boolean "libmail"
-    default "y" if OPIEMAIL2
-    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE && OPIEMAIL2
+    default "y" if MAIL
+    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE && MAIL
diff --git a/packages b/packages
index b05f90a..d9b0b48 100644
--- a/packages
+++ b/packages
@@ -1,40 +1,41 @@
         CONFIG_APPSKEY  noncore/settings/appskeyappskey.pro
         CONFIG_BINARY   noncore/tools/calc2/binarybinary.pro
         CONFIG_CALC2    noncore/tools/calc2calc2.pro
         CONFIG_CALIBRATE        core/apps/calibratecalibrate.pro
         CONFIG_CHESS    noncore/games/chesschess.pro
         CONFIG_CONVERTER        noncore/unsupported/opiemail/converterconverter.pro
         CONFIG_DIALUP   noncore/unsupported/netsetup/dialupdialup.pro
         CONFIG_DICTIONARY       noncore/apps/dictionarydictionary.pro
+        CONFIG_EUROCONV         noncore/tools/euroconv/ euroconv.pro
         CONFIG_GSMTOOL  noncore/comm/gsmtoolgsmtool.pro
         CONFIG_KEYVIEW  development/keyviewkeyview.pro
         CONFIG_LAN      noncore/unsupported/netsetup/lanlan.pro
         CONFIG_LIB      noncore/unsupported/opiemail/liblib.pro
         CONFIG_LIBFFMPEG        core/multimedia/opieplayer/libffmpeglibffmpeg.pro
         CONFIG_LIBFLASH         core/multimedia/opieplayer/libflashlibflash.pro
         CONFIG_LIBOPIE_PIM      libopie/pimpim.pro
         CONFIG_LIBSQL   libsqllibsql.pro
         CONFIG_MOBILEMSG        noncore/comm/mobilemsgmobilemsg.pro
         CONFIG_NETMONAPPLET     noncore/unsupported/netmonappletnetmonapplet.pro
         CONFIG_NETSETUP         noncore/unsupported/netsetupnetsetup.pro
         CONFIG_OFILESELECTOR    libopie/ofileselectorofileselector.pro
         CONFIG_OPIE-WRITE       noncore/apps/opie-writeopie-write.pro
         CONFIG_OPIEMAIL         noncore/unsupported/opiemailopiemail.pro
         CONFIG_POP3     noncore/unsupported/opiemail/ifaces/pop3pop3.pro
         CONFIG_QUICKEXEC        quickexecquickexec.pro
         CONFIG_RESTARTAPPLET    core/applets/restartappletrestartapplet.pro
         CONFIG_RESTARTAPPLET2   core/applets/restartapplet2restartapplet2.pro
         CONFIG_SDMON    noncore/unsupported/sdmonsdmon.pro
         CONFIG_SIMPLE   noncore/tools/calc2/simplesimple.pro
         CONFIG_SMTP     noncore/unsupported/opiemail/ifaces/smtpsmtp.pro
         CONFIG_SPREADSHEET      noncore/unsupported/spreadsheetspreadsheet.pro
         CONFIG_SYSTEMTIME       noncore/unsupported/systemtimesystemtime.pro
         CONFIG_TEST     libsql/testtest.pro
         CONFIG_TEST     noncore/apps/opie-console/testtest.pro
         CONFIG_UBROWSER         noncore/net/ubrowserubrowser.pro
         CONFIG_WELLENREITER     noncore/net/wellenreiterwellenreiter.pro
         CONFIG_WLANSETUP        noncore/unsupported/wlansetupwlansetup.pro
         CONFIG_ADDRESSBOOK      core/pim/addressbookaddressbook.pro
         CONFIG_ADVANCEDFM       noncore/apps/advancedfmadvancedfm.pro
         CONFIG_APPEARANCE2      noncore/settings/appearance2appearance2.pro
         CONFIG_OPIETOOTH-APPLET         noncore/net/opietooth/appletapplet.pro