alecs/plasma-framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/KDE/4.10'

Browse Source
This commit is contained in:
David Faure 2012-10-30 17:00:29 +01:00
commit d38be6f572
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
private/applethandle.cpp
View File

@ -237,7 +237,7 @@ void AppletHandle::paint(QPainter *painter, const QStyleOptionGraphicsItem *opti
QLinearGradient g(QPoint(0, 0), QPoint(m_decorationRect.width(), 0));
//fading out panel
if (m_applet->backgroundHints() != Plasma::Applet::NoBackground &&
if (m_applet && m_applet->backgroundHints() != Plasma::Applet::NoBackground &&
m_rect.height() > qreal(minimumHeight()) * 1.25) {
if (m_buttonsOnRight) {
qreal opaquePoint =

3
runnermanager.cpp
View File

@ -293,6 +293,9 @@ public:
kDebug() << "================= loading runner:" << service->name() << "=================";
QObject::connect(runner, SIGNAL(matchingSuspended(bool)), q, SLOT(runnerMatchingSuspended(bool)));
QMetaObject::invokeMethod(runner, "init");
if (prepped) {
emit runner->prepare();
}
}
return runner;