SOURCES: kde4-kdebase-workspace-rootprivs.patch - updated

[shadzik]

Author: shadzik                      Date: Fri Feb 20 23:04:32 2009 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- updated

---- Files affected:
SOURCES:
   kde4-kdebase-workspace-rootprivs.patch (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: SOURCES/kde4-kdebase-workspace-rootprivs.patch
diff -u SOURCES/kde4-kdebase-workspace-rootprivs.patch:1.1 SOURCES/kde4-kdebase-workspace-rootprivs.patch:1.2
--- SOURCES/kde4-kdebase-workspace-rootprivs.patch:1.1	Thu Jun 26 12:40:38 2008
+++ SOURCES/kde4-kdebase-workspace-rootprivs.patch	Sat Feb 21 00:04:26 2009
@@ -1,6 +1,7 @@
-diff -ur kdebase-workspace-4.0.72/systemsettings/mainwindow.cpp kdebase-workspace-4.0.72-rootprivs/systemsettings/mainwindow.cpp
---- kdebase-workspace-4.0.72/systemsettings/mainwindow.cpp	2008-04-30 15:58:34.000000000 +0200
-+++ kdebase-workspace-4.0.72-rootprivs/systemsettings/mainwindow.cpp	2008-05-07 01:05:14.000000000 +0200
+Index: mainwindow.cpp
+===================================================================
+--- mainwindow.cpp	(revision 835492)
++++ mainwindow.cpp	(working copy)
 @@ -27,6 +27,7 @@
  
  #include <QLayout>
@@ -17,7 +18,21 @@
  #include <kcategorizedview.h>
  #include <kcategorydrawer.h>
  #include <kiconloader.h>
-@@ -297,9 +299,13 @@
+@@ -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*>();
@@ -31,7 +46,7 @@
      } else {
          kDebug() << ":'( Got dud pointer from " << selected.data( Qt::DisplayRole ).toString();
          Q_ASSERT(mItem); // Would core dump below. Do it now
-@@ -311,6 +317,35 @@
+@@ -313,6 +312,35 @@
      if ( groupWidget )
          return;
  
@@ -56,10 +71,10 @@
 +            cmd = cmd.remove(0,9).trimmed();
 +
 +        QStringList args;
-+        args << "-c" << QString( "%1 %2 --lang %3" ).arg( KStandardDirs::locate("exe", "kcmshell4") ).arg( cmd ).arg( KGlobal::locale()->language() );
++        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 );
++        QProcess::startDetached( kdesu, args );
 +
 +        return;
 +    }
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/kde4-kdebase-workspace-rootprivs.patch?r1=1.1&r2=1.2&f=u