[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    branches/KDE/4.6/kdelibs/plasma
From:       Aaron J. Seigo <aseigo () kde ! org>
Date:       2010-12-26 10:43:50
Message-ID: 20101226104350.5B3ACAC80E () svn ! kde ! org
[Download RAW message or body]

SVN commit 1209284 by aseigo:

only check the config for immutability if we actually have it; immutability() gets \
called from setHasConfigurationInterface which gets called from AppletPrivate::init() \
which meant it was trying to access the configuration group too early, resulting in \
it being misplaced; for most applets this wouldn't matter, but for applets-in-applets \
(it's always the sinners) it causes problems BUG:261264


 M  +1 -1      applet.cpp  


--- branches/KDE/4.6/kdelibs/plasma/applet.cpp #1209283:1209284
@@ -882,7 +882,7 @@
     // if this object is itself system immutable, then just return that; it's the \
                most
     // restrictive setting possible and will override anything that might be \
happening above it  // in the Corona->Containment->Applet hierarchy
-    if (d->transient || d->mainConfigGroup()->isImmutable()) {
+    if (d->transient || (d->mainConfig && d->mainConfig->isImmutable())) {
         return SystemImmutable;
     }
 


[prev in list] [next in list] [prev in thread] [next in thread]