4 files changed, 122 insertions, 9 deletions
diff --git a/packages/libqpe/libqpe-opie.inc b/packages/libqpe/libqpe-opie.inc
index 342c7d643b..77ba0f62ec 100644
--- a/packages/libqpe/libqpe-opie.inc
+++ b/packages/libqpe/libqpe-opie.inc
@@ -16,10 +16,10 @@ EXTRA_QMAKEVARS_PRE += "CONFIG+=LIBQPE_WITHROHFEEDBACK"
 EXTRA_QMAKEVARS_POST += "DESTDIR= DEFINES+=LIBQPE_NO_INLINE_IMAGES"
 
 CXXFLAGS_append = " -DOPIE_NO_ERASE_RECT_HACKFIX -DOPIE_NEW_MALLOC"
-CXXFLAGS_append_c7x0 =  " -DOPIE_NO_WINDOWED "
-CXXFLAGS_append_tosa =  " -DOPIE_NO_WINDOWED "
-CXXFLAGS_append_spitz = " -DOPIE_NO_WINDOWED "
-CXXFLAGS_append_akita = " -DOPIE_NO_WINDOWED "
+#CXXFLAGS_append_c7x0 =  " -DOPIE_NO_WINDOWED "
+#CXXFLAGS_append_tosa =  " -DOPIE_NO_WINDOWED "
+#CXXFLAGS_append_spitz = " -DOPIE_NO_WINDOWED "
+#CXXFLAGS_append_akita = " -DOPIE_NO_WINDOWED "
 
 do_compile_prepend_mnci () {
 	ln -s custom-ramses.h custom.h
@@ -76,4 +76,4 @@ do_install() {
 FILES_${PN} = "${palmtopdir}/lib/libqpe.so.*"
 FILES_${PN}-dev = "${includedir} ${palmtopdir}/lib/*"
 FILES_${PN}-dbg = "${palmtopdir}/lib/.debug/"
-PACKAGE_ARCH_${PN} = "${MACHINE_ARCH}"
+#PACKAGE_ARCH_${PN} = "${MACHINE_ARCH}"
diff --git a/packages/libqpe/libqpe-opie/save-windows-pos-dynamic.patch b/packages/libqpe/libqpe-opie/save-windows-pos-dynamic.patch
new file mode 100644
index 0000000000..54dd5947de
--- /dev/null
+++ b/packages/libqpe/libqpe-opie/save-windows-pos-dynamic.patch
@@ -0,0 +1,113 @@
+? 1.diff
+? library/1.diff
+Index: library/qpeapplication.cpp
+===================================================================
+RCS file: /cvs/opie/library/qpeapplication.cpp,v
+retrieving revision 1.115
+diff -u -r1.115 qpeapplication.cpp
+--- library/qpeapplication.cpp	27 Sep 2005 21:04:59 -0000	1.115
++++ library/qpeapplication.cpp	11 Jan 2007 06:12:50 -0000
+@@ -101,6 +101,7 @@
+ 
+ 
+ static bool useBigPixmaps = 0;
++static bool saveWindowsPos = 0;
+ 
+ class HackWidget : public QWidget
+ {
+@@ -129,6 +130,7 @@
+         fontSize = cfg.readNumEntry( "FontSize", 10 );
+         smallIconSize = cfg.readNumEntry( "SmallIconSize", 14 );
+         bigIconSize = cfg.readNumEntry( "BigIconSize", 32 );
++        saveWindowsPos = cfg.readBoolEntry( "AllowWindowed", false );
+ #ifdef OPIE_WITHROHFEEDBACK
+         RoH = 0;
+ #endif
+@@ -250,7 +252,8 @@
+ 
+     static bool read_widget_rect(const QString &app, bool &maximized, QPoint &p, QSize &s)
+     {
+-#ifndef OPIE_NO_WINDOWED
++    if (!saveWindowsPos)
++	return FALSE;
+     maximized = TRUE;
+     // 350 is the trigger in qwsdefaultdecoration for providing a resize button
+     if ( qApp->desktop()->width() <= 350 )
+@@ -272,8 +275,6 @@
+ 
+         return TRUE;
+     }
+-#endif
+-    return FALSE;
+     }
+ 
+ 
+@@ -322,7 +323,8 @@
+     {
+     if( !w )
+     return;
+-#ifndef OPIE_NO_WINDOWED
++    if (!saveWindowsPos)
++    return;
+     // 350 is the trigger in qwsdefaultdecoration for providing a resize button
+     if ( qApp->desktop()->width() <= 350 )
+         return;
+@@ -343,7 +345,6 @@
+     QString s;
+     s.sprintf("%d,%d,%d,%d,%d", r.left() + offsetX, r.top() + offsetY, r.width(), r.height(), w->isMaximized() );
+     cfg.writeEntry( app, s );
+-#endif
+     }
+ 
+     static bool setWidgetCaptionFromAppName( QWidget* /*mw*/, const QString& /*appName*/, const QString& /*appsPath*/ )
+@@ -2207,6 +2208,11 @@
+         quit();
+ }
+ 
++bool QPEApplication::isSaveWindowsPos()
++{
++    return saveWindowsPos;
++}
++
+ #if (__GNUC__ > 2 ) && !defined(_OS_MACX_)
+ extern "C" void __cxa_pure_virtual();
+ 
+Index: library/qpeapplication.h
+===================================================================
+RCS file: /cvs/opie/library/qpeapplication.h,v
+retrieving revision 1.35
+diff -u -r1.35 qpeapplication.h
+--- library/qpeapplication.h	4 Oct 2005 19:38:19 -0000	1.35
++++ library/qpeapplication.h	11 Jan 2007 06:12:50 -0000
+@@ -137,6 +137,8 @@
+ 
+     int exec();
+ 
++    static bool isSaveWindowsPos();
++
+ signals:
+     void clientMoused();
+     void timeChanged();
+Index: library/widget_showing.cpp
+===================================================================
+RCS file: /cvs/opie/library/widget_showing.cpp,v
+retrieving revision 1.4
+diff -u -r1.4 widget_showing.cpp
+--- library/widget_showing.cpp	19 Apr 2005 13:27:29 -0000	1.4
++++ library/widget_showing.cpp	11 Jan 2007 06:12:50 -0000
+@@ -52,13 +52,8 @@
+         return;
+     }
+ 
+-#ifdef OPIE_NO_WINDOWED
+-    Q_UNUSED( nomax )
+-    if ( TRUE ) {
+-#else
+-    if ( !nomax
+-         && ( qApp->desktop()->width() <= 320 ) ){
+-#endif
++    if ( !isSaveWindowsPos() || (!nomax
++         && ( qApp->desktop()->width() <= 30 )) ){
+         wg->showMaximized();
+     } else {
+ #ifdef Q_WS_QWS
diff --git a/packages/libqpe/libqpe-opie_1.2.2.bb b/packages/libqpe/libqpe-opie_1.2.2.bb
index 21ffea194e..009a075091 100644
--- a/packages/libqpe/libqpe-opie_1.2.2.bb
+++ b/packages/libqpe/libqpe-opie_1.2.2.bb
@@ -1,7 +1,8 @@
 require ${PN}.inc
 
-PR = "r1"
+PR = "r3"
 TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '_')}"
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/library \
+	file://save-windows-pos-dynamic.patch;patch=1 \
 	file://fix-titleheight.patch;patch=1"
diff --git a/packages/libqpe/libqpe-opie_cvs.bb b/packages/libqpe/libqpe-opie_cvs.bb
index 3dafddcf0a..8545f9506e 100644
--- a/packages/libqpe/libqpe-opie_cvs.bb
+++ b/packages/libqpe/libqpe-opie_cvs.bb
@@ -1,8 +1,7 @@
 require ${PN}.inc
 
-# Remove the dash below when 1.2.1 changes
-PV = "1.2.2+cvs-${SRCDATE}"
-PR = "r1"
+PV = "${OPIE_CVS_PV}"
+PR = "r6"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/library \
            file://fix-titleheight.patch;patch=1"