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

Conflicts:
	kdecore/services/kmimeglobsfileparser.cpp [whole file is gone]
	kdecore/sycoca/kprotocolinfo.cpp [rewritten in kio; hand-merged]
	kdeui/widgets/kmainwindow.cpp [geometry handling, code is gone]
	kfile/kfileplacesitem.cpp
	kio/kio/kfileitem.cpp [tons of kurl/qmimetype differences for the big if(!d) patch]
	kio/tests/kfileitemtest.cpp [kurl]
	plasma/private/applethandle.cpp [namespace]
	plasma/runnermanager.cpp
	staging/kservice/src/services/kservicetypetrader.h [i18n]

private/applethandle.cpp

@@ -236,7 +236,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::NoBackground &&
+        if (m_applet && m_applet->backgroundHints() != Plasma::NoBackground &&
             m_rect.height() > qreal(minimumHeight()) * 1.25) {
             if (m_buttonsOnRight) {
                 qreal opaquePoint =

runnermanager.cpp

@@ -301,6 +301,9 @@ public:
 #endif
             QObject::connect(runner, SIGNAL(matchingSuspended(bool)), q, SLOT(runnerMatchingSuspended(bool)));
             runner->init();
+            if (prepped) {
+                emit runner->prepare();
+            }
         }
 
         return runner;