From kde-commits  Thu Jan 28 04:14:05 2010
From: Lucas Murray <lmurray () undefinedfire ! com>
Date: Thu, 28 Jan 2010 04:14:05 +0000
To: kde-commits
Subject: branches/KDE/4.4/kdebase/workspace/kwin/lib
Message-Id: <1264652045.038370.23445.nullmailer () svn ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=126465205112438

SVN commit 1081286 by lmurray:

Backport r1081285:
If the loaded decoration library isn't a valid decoration load the
default decoration instead of dying.
CCBUG: 224440


 M  +8 -0      kdecoration_plugins_p.cpp  


--- branches/KDE/4.4/kdebase/workspace/kwin/lib/kdecoration_plugins_p.cpp #1081285:1081286
@@ -137,6 +137,7 @@
     library = new KLibrary(path);
 
     // If that fails, fall back to the default plugin
+trydefaultlib:
     if (!library)
         {
 	kDebug(1212) << " could not load library, try default plugin again";
@@ -162,6 +163,13 @@
 
     if(!create_ptr)
         {
+        if( nameStr != defaultPlugin )
+            {
+            kDebug(1212) << i18n( "The library %1 is not a KWin plugin.", path );
+            library->unload();
+            library = NULL;
+            goto trydefaultlib;
+            }
         error( i18n( "The library %1 is not a KWin plugin.", path ));
         library->unload();
         return false;