Hello community, here is the log from the commit of package kdebase4-workspace checked in at Mon Oct 27 17:28:30 CET 2008. -------- --- KDE/kdebase4-workspace/kdebase4-wallpapers.changes 2008-10-22 18:05:44.000000000 +0200 +++ /mounts/work_src_done/STABLE/kdebase4-workspace/kdebase4-wallpapers.changes 2008-10-27 17:27:52.198108000 +0100 @@ -1,0 +2,19 @@ +Mon Oct 27 16:42:00 CET 2008 - wstephenson@suse.de + +- More fixes to Solid/Control from upstream + +------------------------------------------------------------------- +Mon Oct 27 11:15:53 CET 2008 - stbinner@suse.de + +- backport of refactored system tray code + +------------------------------------------------------------------- +Sun Oct 26 12:17:58 CET 2008 - stbinner@suse.de + +- systemsettings: start root-only kcms non-embedded (bnc#396186) +- backport tooltip manager (regression compared to 4.0) +- make plain desktop the default desktop containment +- backport panel auto-hide fixes (eg bnc#432691) +- fix incorrect shutdown on logout (bnc#396248) + +------------------------------------------------------------------- kdebase4-workspace.changes: same change calling whatdependson for head-i586 New: ---- systemsettings-root-kcm.diff taskbarthumbnail.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdebase4-wallpapers.spec ++++++ --- /var/tmp/diff_new_pack.HM9736/_old 2008-10-27 17:28:05.000000000 +0100 +++ /var/tmp/diff_new_pack.HM9736/_new 2008-10-27 17:28:05.000000000 +0100 @@ -29,7 +29,7 @@ Summary: KDE 4 Wallpapers Url: http://www.kde.org/ Version: 4.1.2 -Release: 5 +Release: 6 Source0: kdebase-workspace-%version.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch @@ -66,6 +66,16 @@ /usr/share/wallpapers %changelog +* Mon Oct 27 2008 wstephenson@suse.de +- More fixes to Solid/Control from upstream +* Mon Oct 27 2008 stbinner@suse.de +- backport of refactored system tray code +* Sun Oct 26 2008 stbinner@suse.de +- systemsettings: start root-only kcms non-embedded (bnc#396186) +- backport tooltip manager (regression compared to 4.0) +- make plain desktop the default desktop containment +- backport panel auto-hide fixes (eg bnc#432691) +- fix incorrect shutdown on logout (bnc#396248) * Wed Oct 22 2008 stbinner@suse.de - debug_package_requires depend also on %%release * Mon Oct 20 2008 stbinner@suse.de @@ -124,7 +134,7 @@ * Thu Aug 28 2008 dmueller@suse.de - update to 4.1.1 * see http://kde.org/announcements/changelogs/changelog4_1to4_1_1.php -* Thu Aug 21 2008 dmueller@suse.de +* Wed Aug 20 2008 dmueller@suse.de - update branch diff - rediff patch of last change entry to apply properly * Wed Aug 20 2008 llunak@suse.cz @@ -313,7 +323,7 @@ - add "install all public kwin headers" patch * Tue Jan 29 2008 stbinner@suse.de - fix app menu starting and system tray icons regressions -* Mon Jan 28 2008 stbinner@suse.de +* Sun Jan 27 2008 stbinner@suse.de - add application menu shortening feature and fix alphabetical sort * Wed Jan 23 2008 stbinner@suse.de - update KDE_4_0_BRANCH.diff (incl. taskbar attention flash) @@ -349,7 +359,7 @@ - update to 3.96.2 * Wed Nov 21 2007 dmueller@suse.de - reenable OpenGL support -* Wed Nov 21 2007 dmueller@suse.de +* Tue Nov 20 2007 dmueller@suse.de - update to 3.96.0 * Thu Nov 01 2007 dmueller@suse.de - updaste to 3.95.1 @@ -372,7 +382,7 @@ * Thu Aug 09 2007 stbinner@suse.de - update to 3.92.0.svn697325 - fix file conflicts -* Sun Jul 29 2007 stbinner@suse.de +* Sat Jul 28 2007 stbinner@suse.de - update to KDE 4.0 Beta 1 * Thu Jul 19 2007 stbinner@suse.de - don't show System Settings on non-KDE/KDE3 desktop ++++++ kdebase4-workspace.spec ++++++ --- /var/tmp/diff_new_pack.HM9736/_old 2008-10-27 17:28:05.000000000 +0100 +++ /var/tmp/diff_new_pack.HM9736/_new 2008-10-27 17:28:05.000000000 +0100 @@ -37,7 +37,7 @@ Summary: The KDE Workspace Components Url: http://www.kde.org/ Version: 4.1.2 -Release: 5 +Release: 6 Source0: kdebase-workspace-%version.tar.bz2 Source1: rediff-plasma.sh Source2: titlebar_decor.png @@ -80,6 +80,8 @@ # | sed 's#^--- #--- kcontrol/randr/#' | sed 's#^+++ #+++ kcontrol/randr/#' Patch92: randr12.diff Patch93: solid.diff +Patch94: systemsettings-root-kcm.diff +Patch95: taskbarthumbnail.diff %kde4_runtime_requires %if %suse_version > 1030 Requires: %name-branding = 11.1 @@ -142,6 +144,8 @@ %if %suse_version > 1030 %patch93 %endif +%patch94 +%patch95 cp %{SOURCE3} kwin/effects/data/cubecap.png %build @@ -757,6 +761,16 @@ /usr/share/kde4/servicetypes/plasma-wallpaper.desktop %changelog +* Mon Oct 27 2008 wstephenson@suse.de +- More fixes to Solid/Control from upstream +* Mon Oct 27 2008 stbinner@suse.de +- backport of refactored system tray code +* Sun Oct 26 2008 stbinner@suse.de +- systemsettings: start root-only kcms non-embedded (bnc#396186) +- backport tooltip manager (regression compared to 4.0) +- make plain desktop the default desktop containment +- backport panel auto-hide fixes (eg bnc#432691) +- fix incorrect shutdown on logout (bnc#396248) * Wed Oct 22 2008 stbinner@suse.de - debug_package_requires depend also on %%release * Mon Oct 20 2008 stbinner@suse.de @@ -815,7 +829,7 @@ * Thu Aug 28 2008 dmueller@suse.de - update to 4.1.1 * see http://kde.org/announcements/changelogs/changelog4_1to4_1_1.php -* Thu Aug 21 2008 dmueller@suse.de +* Wed Aug 20 2008 dmueller@suse.de - update branch diff - rediff patch of last change entry to apply properly * Wed Aug 20 2008 llunak@suse.cz @@ -1004,7 +1018,7 @@ - add "install all public kwin headers" patch * Tue Jan 29 2008 stbinner@suse.de - fix app menu starting and system tray icons regressions -* Mon Jan 28 2008 stbinner@suse.de +* Sun Jan 27 2008 stbinner@suse.de - add application menu shortening feature and fix alphabetical sort * Wed Jan 23 2008 stbinner@suse.de - update KDE_4_0_BRANCH.diff (incl. taskbar attention flash) @@ -1040,7 +1054,7 @@ - update to 3.96.2 * Wed Nov 21 2007 dmueller@suse.de - reenable OpenGL support -* Wed Nov 21 2007 dmueller@suse.de +* Tue Nov 20 2007 dmueller@suse.de - update to 3.96.0 * Thu Nov 01 2007 dmueller@suse.de - updaste to 3.95.1 @@ -1063,7 +1077,7 @@ * Thu Aug 09 2007 stbinner@suse.de - update to 3.92.0.svn697325 - fix file conflicts -* Sun Jul 29 2007 stbinner@suse.de +* Sat Jul 28 2007 stbinner@suse.de - update to KDE 4.0 Beta 1 * Thu Jul 19 2007 stbinner@suse.de - don't show System Settings on non-KDE/KDE3 desktop ++++++ ksmserver-leave-countdown.diff ++++++ --- /var/tmp/diff_new_pack.HM9736/_old 2008-10-27 17:28:07.000000000 +0100 +++ /var/tmp/diff_new_pack.HM9736/_new 2008-10-27 17:28:07.000000000 +0100 @@ -24,11 +24,36 @@ }; /** +Index: libs/kworkspace/kdisplaymanager.cpp +=================================================================== +--- libs/kworkspace/kdisplaymanager.cpp (revision 875843) ++++ libs/kworkspace/kdisplaymanager.cpp (working copy) +@@ -201,7 +201,7 @@ + KWorkSpace::ShutdownMode shutdownMode, /* NOT Default */ + const QString &bootOption ) + { +- if (shutdownType == KWorkSpace::ShutdownTypeNone) ++ if (shutdownType == KWorkSpace::ShutdownTypeNone || shutdownType == KWorkSpace::ShutdownTypeLogout) + return; + + bool cap_ask; +Index: ksmserver/shutdowndlg.h +=================================================================== +--- ksmserver/shutdowndlg.h (revision 875843) ++++ ksmserver/shutdowndlg.h (working copy) +@@ -131,6 +131,7 @@ + KSMPushButton *m_btnLogout; + KSMPushButton *m_btnHalt; + KSMPushButton *m_btnReboot; ++ KSMPushButton *btnBack; + int m_automaticallyDoSeconds; + + private Q_SLOTS: Index: ksmserver/shutdowndlg.cpp =================================================================== ---- ksmserver/shutdowndlg.cpp (revision 832330) +--- ksmserver/shutdowndlg.cpp (revision 875843) +++ ksmserver/shutdowndlg.cpp (working copy) -@@ -333,7 +333,7 @@ +@@ -339,7 +339,7 @@ m_btnLogout(0), m_btnHalt(0), m_btnReboot(0), @@ -37,8 +62,33 @@ // this is a WType_Popup on purpose. Do not change that! Not // having a popup here has severe side effects. { -@@ -379,7 +379,8 @@ +@@ -361,14 +361,19 @@ + m_svg->setImagePath("dialogs/shutdowndialog"); + connect( m_svg, SIGNAL(repaintNeeded()), this, SLOT(update()) ); + setModal( true ); +- resize(400, 220); ++ resize(400, 120); + KDialog::centerOnScreen(this); + + QVBoxLayout *mainLayout = new QVBoxLayout(); + + mainLayout->setContentsMargins(12, 9, 12, 7); ++ + QVBoxLayout *buttonLayout = new QVBoxLayout(); + QHBoxLayout *buttonMainLayout = new QHBoxLayout(); ++ ++ m_automaticallyDoLabel = new QLabel(this); ++ mainLayout->addWidget(m_automaticallyDoLabel, 0, Qt::AlignRight); ++ + if (m_svg->hasElement("picture")) { + buttonMainLayout->addSpacing(m_svg->elementRect("picture").toRect().right() + 12); + } +@@ -383,9 +388,12 @@ + QPalette palette; + palette.setColor(QPalette::WindowText, fntColor); ++ buttonLayout->addSpacing(10); ++ m_btnLogout = new KSMPushButton( i18n("&Logout"), this ); m_btnLogout->setPixmap(KIconLoader::global()->loadIcon("system-log-out", KIconLoader::NoGroup, 32)); - m_btnLogout->setFocus(); @@ -47,23 +97,89 @@ connect(m_btnLogout, SIGNAL(clicked()), SLOT(slotLogout())); buttonLayout->addWidget(m_btnLogout, Qt::AlignRight | Qt::AlignTop); -@@ -443,6 +444,19 @@ +@@ -449,21 +457,39 @@ } } +- KSMPushButton* btnBack = new KSMPushButton(i18n("&Cancel"), this, true); + if ( sdtype == KWorkSpace::ShutdownTypeLogout ) { + m_btnReboot->setHidden(true); + m_btnHalt->setHidden(true); ++ buttonLayout->addSpacing(70); + } + else if ( sdtype == KWorkSpace::ShutdownTypeHalt ) { + m_btnReboot->setHidden(true); + m_btnLogout->setHidden(true); ++ buttonLayout->addSpacing(70); + } + else if ( sdtype == KWorkSpace::ShutdownTypeReboot ) { + m_btnHalt->setHidden(true); + m_btnLogout->setHidden(true); ++ buttonLayout->addSpacing(70); + } + - KSMPushButton* btnBack = new KSMPushButton(i18n("&Cancel"), this, true); ++ btnBack = new KSMPushButton(i18n("&Cancel"), this, true); btnBack->setPixmap(KIconLoader::global()->loadIcon( "dialog-cancel", KIconLoader::NoGroup, 16)); +- m_automaticallyDoLabel = new QLabel(this); ++ //m_automaticallyDoLabel = new QLabel(this); + m_automaticallyDoLabel->setPalette(palette); + fnt.setPixelSize(11); + m_automaticallyDoLabel->setFont(fnt); +- m_automaticallyDoLabel->setWordWrap(true); ++ //m_automaticallyDoLabel->setWordWrap(true); + automaticallyDoTimeout(); + + QTimer *automaticallyDoTimer = new QTimer(this); + connect(automaticallyDoTimer, SIGNAL(timeout()), this, SLOT(automaticallyDoTimeout())); + automaticallyDoTimer->start(1000); + +- bottomLayout->addWidget(m_automaticallyDoLabel, 1, Qt::AlignBottom); ++ //bottomLayout->addWidget(m_automaticallyDoLabel, 1, Qt::AlignBottom); ++ bottomLayout->addStretch(); ++ //buttonLayout->addWidget(m_automaticallyDoLabel); + bottomLayout->addWidget(btnBack); + connect(btnBack, SIGNAL(clicked()), SLOT(reject())); + +@@ -482,14 +508,14 @@ + focusedButton->click(); + // following code is required to provide a clean way to translate strings + } else if (focusedButton == m_btnLogout) { +- m_automaticallyDoLabel->setText(i18np("Log out in 1 second.", +- "Log out in %1 seconds.", m_automaticallyDoSeconds)); ++ m_automaticallyDoLabel->setText(i18np("Logging out in 1 second.", ++ "Logging out in %1 seconds.", m_automaticallyDoSeconds)); + } else if (focusedButton == m_btnHalt) { +- m_automaticallyDoLabel->setText(i18np("Turn off computer in 1 second.", +- "Turn off computer in %1 seconds.", m_automaticallyDoSeconds)); ++ m_automaticallyDoLabel->setText(i18np("Turning off computer in 1 second.", ++ "Turning off computer in %1 seconds.", m_automaticallyDoSeconds)); + } else if (focusedButton == m_btnReboot) { +- m_automaticallyDoLabel->setText(i18np("Reboot computer in 1 second.", +- "Reboot computer in %1 seconds.", m_automaticallyDoSeconds)); ++ m_automaticallyDoLabel->setText(i18np("Restarting computer in 1 second.", ++ "Restarting computer in %1 seconds.", m_automaticallyDoSeconds)); + } else { + m_automaticallyDoLabel->setText(QString()); + } +@@ -511,9 +537,19 @@ + p.fillRect(QRect(0, 0, width(), height()), Qt::transparent); + m_svg->paint(&p, QRect(0, 0, width(), height()), "background"); + ++ //FIXME should crop rather than resize this + if (m_svg->hasElement("picture")) { + QRect r = m_svg->elementRect("picture").toRect(); +- r.moveTop(m_btnLogout->geometry().top()); ++ KSMPushButton* button; ++ if (m_btnLogout->isVisible()) { ++ button = m_btnLogout; ++ } else if (m_btnHalt->isVisible()) { ++ button = m_btnHalt; ++ } else { ++ button = m_btnReboot; ++ } ++ r.moveTop(button->geometry().top() - 10); ++ r.setBottom(btnBack->geometry().top()); + m_svg->paint(&p, r, "picture"); + } + } ++++++ plasma.diff ++++++ ++++ 5526 lines (skipped) ++++ between KDE/kdebase4-workspace/plasma.diff ++++ and /mounts/work_src_done/STABLE/kdebase4-workspace/plasma.diff ++++++ plasma-libs.diff ++++++ ++++ 2092 lines (skipped) ++++ between KDE/kdebase4-workspace/plasma-libs.diff ++++ and /mounts/work_src_done/STABLE/kdebase4-workspace/plasma-libs.diff ++++++ solid.diff ++++++ --- /var/tmp/diff_new_pack.HM9736/_old 2008-10-27 17:28:08.000000000 +0100 +++ /var/tmp/diff_new_pack.HM9736/_new 2008-10-27 17:28:08.000000000 +0100 @@ -486,6 +486,25 @@ protected: /** * @internal +diff -urN workspace.old//libs/solid/control/wirelessnetworkinterface.cpp workspace/libs/solid/control/wirelessnetworkinterface.cpp +--- workspace.old//libs/solid/control/wirelessnetworkinterface.cpp 2008-06-17 12:39:41.000000000 +0200 ++++ libs/solid/control/wirelessnetworkinterface.cpp 2008-10-27 15:56:59.000000000 +0100 +@@ -146,11 +146,10 @@ + if (mapIt != d->apMap.end()) + { + // Oops, I'm not sure it should happen... +- // But well in this case we'd better kill the old device we got, it's probably outdated +- AccessPointPair pair = mapIt.value(); +- +- delete pair.first; +- delete pair.second; ++ // But for an unknown reason it does ++ // We were deleting the existing items here, which caused problems later ++ // when the client calls find AccessPoint and gets a frontend object with a ++ // null private object - dangling pointer + } else { + mapIt = d->apMap.insert(uni, AccessPointPair(0, 0)); + } diff -urN workspace.old//solid/networkmanager-0.7/CMakeLists.txt workspace/solid/networkmanager-0.7/CMakeLists.txt --- workspace.old//solid/networkmanager-0.7/CMakeLists.txt 2008-05-29 10:46:38.000000000 +0200 +++ solid/networkmanager-0.7/CMakeLists.txt 2008-10-20 23:04:31.000000000 +0200 @@ -3113,6 +3132,25 @@ +}; + +#endif // NETWORKSERIALINTERFACE_P_H +diff -urN workspace.old//solid/networkmanager-0.7/solid_networkmanager07.desktop workspace/solid/networkmanager-0.7/solid_networkmanager07.desktop +--- workspace.old//solid/networkmanager-0.7/solid_networkmanager07.desktop 2008-10-21 08:50:36.000000000 +0200 ++++ solid/networkmanager-0.7/solid_networkmanager07.desktop 2008-09-30 08:09:47.000000000 +0200 +@@ -14,7 +14,6 @@ + Name[mk]=Менаџер на мрежи 0.7 + Name[ml]=ശൃംഖലാനടത്തിപ്പുകാരന് 0.7 + Name[mr]=संजाळव्यवस्थपाक 0.7 +-Name[nb]=Nettverksstyring 0.7 + Name[nds]=Nettwark-Pleger 0.7 + Name[nn]=Nettverkshandsaming 0.7 + Name[pa]=ਨੈੱਟਵਰਕਮੈਨੇਜਰ 0.7 +@@ -55,7 +54,6 @@ + Comment[lv]=Tīkla pārvaldība, lietojot NetworkManager dēmonu, 0.7 versiju + Comment[ml]=NetworkManager പതിപ്പു് 0.7 ഡെമണ് ഉപയോഗിക്കുന്ന നെറ്റ്വര്ക്ക് മാനേജ്മെന്റ് + Comment[mr]=संजाळव्यवस्थापक डीमन, आवृत्ती 0.7 चा वापर करणारे संजाळ व्यवस्थापन +-Comment[nb]=Nettverksstyring med nissen NetworkManager versjon 0.7 + Comment[nds]=Nettwarkpleeg mit den NetworkManager-Dämoon, Verschoon 0.7 + Comment[nl]=Netwerkbeheer via de NetworkManager-daemon, versie 0.7 + Comment[nn]=Nettverkshandtering med NetworkManager-tenesta, versjon 0.7 diff -urN workspace.old//solid/networkmanager-0.7/wirednetworkinterface.cpp workspace/solid/networkmanager-0.7/wirednetworkinterface.cpp --- workspace.old//solid/networkmanager-0.7/wirednetworkinterface.cpp 2008-06-08 18:00:35.000000000 +0200 +++ solid/networkmanager-0.7/wirednetworkinterface.cpp 2008-10-20 23:04:52.000000000 +0200 @@ -3140,6 +3178,34 @@ class NMWiredNetworkInterfacePrivate : public NMNetworkInterfacePrivate { +diff -urN workspace.old//solid/networkmanager-0.7/wirelessnetworkinterface.cpp workspace/solid/networkmanager-0.7/wirelessnetworkinterface.cpp +--- workspace.old//solid/networkmanager-0.7/wirelessnetworkinterface.cpp 2008-06-24 14:25:42.000000000 +0200 ++++ solid/networkmanager-0.7/wirelessnetworkinterface.cpp 2008-10-27 15:57:36.000000000 +0100 +@@ -55,6 +55,11 @@ + + connect( &d->wirelessIface, SIGNAL(PropertiesChanged(const QVariantMap &)), + this, SLOT(wirelessPropertiesChanged(const QVariantMap &))); ++ connect( &d->wirelessIface, SIGNAL(AccessPointAdded(const QDBusObjectPath &)), ++ this, SLOT(accessPointAdded(const QDBusObjectPath &))); ++ connect( &d->wirelessIface, SIGNAL(AccessPointRemoved(const QDBusObjectPath &)), ++ this, SLOT(accessPointRemoved(const QDBusObjectPath &))); ++ + + qDBusRegisterMetaType<QList<QDBusObjectPath> >(); + QDBusReply< QList <QDBusObjectPath> > apPathList = d->wirelessIface.GetAccessPoints(); +@@ -165,8 +170,10 @@ + { + kDebug(1441) << apPath.path(); + Q_D(NMWirelessNetworkInterface); +- d->accessPoints.append(apPath.path()); +- emit accessPointAppeared(apPath.path()); ++ if (!d->accessPoints.contains(apPath.path())) { ++ d->accessPoints.append(apPath.path()); ++ emit accessPointAppeared(apPath.path()); ++ } + } + + void NMWirelessNetworkInterface::accessPointRemoved(const QDBusObjectPath &apPath) diff -urN workspace.old//solid/networkmanager-0.7/wirelessnetworkinterface_p.h workspace/solid/networkmanager-0.7/wirelessnetworkinterface_p.h --- workspace.old//solid/networkmanager-0.7/wirelessnetworkinterface_p.h 2008-06-08 14:09:46.000000000 +0200 +++ solid/networkmanager-0.7/wirelessnetworkinterface_p.h 2008-10-20 23:02:06.000000000 +0200 ++++++ systemsettings-root-kcm.diff ++++++ Index: systemsettings/mainwindow.cpp =================================================================== --- systemsettings/mainwindow.cpp (revision 875843) +++ systemsettings/mainwindow.cpp (working copy) @@ -27,6 +27,7 @@ #include <QLayout> #include <QStackedWidget> +#include <QProcess> #include <KAction> #include <KActionCollection> @@ -42,6 +43,7 @@ #include <KStandardAction> #include <KTabWidget> #include <kcategorizedsortfilterproxymodel.h> +#include <KStandardDirs> #include <kcategorizedview.h> #include <kcategorydrawer.h> #include <kiconloader.h> @@ -176,13 +178,6 @@ connect( tv, SIGNAL(activated(const QModelIndex&)), SLOT(selectionChanged(const QModelIndex&)) ); - if (KGlobalSettings::singleClick()) { - connect( tv, SIGNAL(clicked(const QModelIndex&)), - SLOT(selectionChanged(const QModelIndex&))); - } else { - connect( tv, SIGNAL(doubleClicked(const QModelIndex&)), - SLOT(selectionChanged(const QModelIndex&))); - } connect( search, SIGNAL(textChanged(const QString&)), kcsfpm, SLOT(setFilterRegExp(const QString&))); connect( kcsfpm, SIGNAL(layoutChanged()), @@ -299,9 +294,13 @@ return; MenuItem * mItem = selected.data( Qt::UserRole ).value<MenuItem*>(); + bool needsRootPrivs = false; if ( mItem ) { kDebug() << "Selected item: " << mItem->service->name(); kDebug() << "Comment: " << mItem->service->comment(); + + needsRootPrivs = mItem->service->property( "X-KDE-RootOnly", QVariant::Bool ).toBool(); + kDebug() << "Needs root privs:" << needsRootPrivs; } else { kDebug() << ":'( Got dud pointer from " << selected.data( Qt::DisplayRole ).toString(); Q_ASSERT(mItem); // Would core dump below. Do it now @@ -313,6 +312,35 @@ if ( groupWidget ) return; + if ( needsRootPrivs ) + { + QString kdesu = KStandardDirs::findExe( "kdesu" ); + //kDebug() << "kdesu path:" << kdesu; + + QString cmd = mItem->service->exec().trimmed(); + + /* Prepare the process to run the kcmshell */ + if ( cmd.left(5) == "kdesu" ) + { + cmd = cmd.remove(0,5).trimmed(); + + /* Remove all kdesu switches */ + while ( cmd.length() > 1 && cmd[ 0 ] == '-' ) + cmd = cmd.remove( 0, cmd.indexOf( ' ' ) ).trimmed(); + } + + if ( cmd.left(9) == "kcmshell4" ) + cmd = cmd.remove(0,9).trimmed(); + + QStringList args; + args << "-i" << QString( mItem->service->icon() ) << "-c" << QString( "%1 %2 --lang %3" ).arg( KStandardDirs::locate("exe", "kcmshell4") ).arg( cmd ).arg( KGlobal::locale()->language() ); + + kDebug() << "Starting root module: " << args; + QProcess::execute( kdesu, args ); + + return; + } + groupWidget = moduleItemToWidgetDict[mItem->service]; if( !groupWidget ) { ++++++ taskbarthumbnail.diff ++++++ Index: kwin/effects/CMakeLists.txt =================================================================== --- kwin/effects/CMakeLists.txt (revision 875843) +++ kwin/effects/CMakeLists.txt (working copy) @@ -50,7 +50,7 @@ shadow.cpp showfps.cpp showpaint.cpp - #taskbarthumbnail.cpp # Enable when plasma has tooltips again + taskbarthumbnail.cpp thumbnailaside.cpp zoom.cpp ) @@ -72,7 +72,7 @@ shadow.desktop showfps.desktop showpaint.desktop - #taskbarthumbnail.desktop # Enable when plasma has tooltips again + taskbarthumbnail.desktop thumbnailaside.desktop zoom.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kwin ) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org