File systemsettings-root-kcm.diff of Package kdebase4-wallpapers

Overview Repositories Revisions Requests Users Attributes Meta

File systemsettings-root-kcm.diff of Package kdebase4-wallpapers

Index: systemsettings/core/ModuleView.cpp
===================================================================
--- systemsettings/core/ModuleView.cpp	(revision 1004599)
+++ systemsettings/core/ModuleView.cpp	(working copy)
@@ -39,6 +39,7 @@
 #include <KCModuleProxy>
 #include <KStandardGuiItem>
 #include <KDialogButtonBox>
+#include <KStandardDirs>
 
 #include "MenuItem.h"
 
@@ -124,6 +125,40 @@
       return;
     }
 
+    if ( menuItem->needsRootPrivs() )
+    {
+        QString kdesu = KStandardDirs::findExe( "kdesu" );
+        //kDebug() << "kdesu path:" << kdesu;
+
+        QString cmd = menuItem->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;
+	if ( cmd.startsWith('/' ) )
+	   // call eg "/sbin/yast2"
+	   args << "-i" << QString( menuItem->service()->icon() ) << "-c" << cmd;
+	else
+           args << "-i" << QString( menuItem->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::startDetached( kdesu, args );
+
+        return;
+    }
+
+
     QList<KCModuleInfo*> modules;
     if ( menuItem->children().empty() ) {
         modules << &menuItem->item();
Index: systemsettings/core/MenuItem.cpp
===================================================================
--- systemsettings/core/MenuItem.cpp	(revision 1004599)
+++ systemsettings/core/MenuItem.cpp	(working copy)
@@ -42,6 +42,7 @@
     int weight;
     KService::Ptr service;
     KCModuleInfo item;
+    bool needsRootPrivs;
 };
 
 MenuItem::MenuItem( bool isMenu, MenuItem * itsParent )
@@ -49,6 +50,7 @@
 {
     d->parent = itsParent;
     d->menu = isMenu;
+    d->needsRootPrivs = false;
 
     if ( d->parent ) {
         d->parent->children().append( this );
@@ -117,11 +119,17 @@
     return d->menu;
 }
 
+bool MenuItem::needsRootPrivs() const
+{
+    return d->needsRootPrivs;
+}
+
 void MenuItem::setService( const KService::Ptr& service )
 {
     d->service = service;
     d->name = service->property("X-KDE-System-Settings-Category").toString();
     d->item = KCModuleInfo( service->entryPath() );
+    d->needsRootPrivs = service->property("X-KDE-RootOnly", QVariant::Bool ).toBool();
     const QVariant itemWeight = d->service->property( "X-KDE-Weight", QVariant::Int );
     if( itemWeight.isValid() ) {
         d->weight = itemWeight.toInt();
Index: systemsettings/core/MenuItem.h
===================================================================
--- systemsettings/core/MenuItem.h	(revision 1004599)
+++ systemsettings/core/MenuItem.h	(working copy)
@@ -148,6 +148,8 @@
      */
     void setService( const KService::Ptr& service );
 
+    bool needsRootPrivs() const;
+    
 private:
     class Private;
     Private *const d;

Places

File systemsettings-root-kcm.diff of Package kdebase4-wallpapers

Places