[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: branches/KDE/4.4/kdebase/workspace/kwin/lib
From: Lucas Murray <lmurray () undefinedfire ! com>
Date: 2010-01-28 4:14:05
Message-ID: 1264652045.038370.23445.nullmailer () svn ! kde ! org
[Download RAW message or body]
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;
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic