Some changes to the QPEDecoration c'tor internals:

Since the current deco plugin is unloaded, when a new Deco is created
via new (even if this new deco is never used or deleted immediatly afer-
wards), we have to remember the plugin name, in case someone calls the
default c'tor (without supplying a plugin name)

1 files changed, 6 insertions, 3 deletions

diff --git a/library/qpeapplication.cpp b/library/qpeapplication.cpp
index a54fb20..c8e6e74 100644
--- a/library/qpeapplication.cpp
+++ b/library/qpeapplication.cpp
@@ -901,3 +901,3 @@ void QPEApplication::setDefaultRotation( int r )
 // exported to libpreload.so
-bool opie_block_style = false;
+int opie_block_style = 0;
 
@@ -912,3 +912,3 @@ void QPEApplication::applyStyle()
         // don't block ourselves ...
-        opie_block_style = false;
+        opie_block_style = 0;
         
@@ -977,2 +977,4 @@ void QPEApplication::applyStyle()
         
+        //qDebug ( "Setting Deco: %s -- old %s (%d)", dec.latin1(), d-> decorationName.latin1(), nostyle);
+        
         if ( dec != d->decorationName ) {
@@ -995,3 +997,4 @@ void QPEApplication::applyStyle()
         // revert to global blocking policy ...
-        opie_block_style = config. readBoolEntry ( "ForceStyle", false );
+        opie_block_style = config. readBoolEntry ( "ForceStyle", false ) ? 0xff : 0x00;
+        opie_block_style -= nostyle;
 }