[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdebase/workspace/libs/ksysguard
From:       Dario Freddi <drf () kde ! org>
Date:       2009-08-31 23:35:38
Message-ID: 1251761738.641573.2537.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1017940 by dafre:

Attempt to fix


 M  +2 -2      processcore/CMakeLists.txt  
 M  +3 -3      processcore/actions.actions  
 M  +1 -1      processcore/helper.cpp  
 M  +3 -5      processui/ksysguardprocesslist.cpp  
 M  +2 -0      processui/ksysguardprocesslist.h  


--- trunk/KDE/kdebase/workspace/libs/ksysguard/processcore/CMakeLists.txt \
#1017939:1017940 @@ -37,8 +37,8 @@
     processes_local_p.cpp
     processes_base_p.cpp)
 
-kde4_auth_add_helper(ksysguardprocesslist_helper org.kde.ksysguardprocesslisthelper \
                root ${ksysguardprocesslist_helper_srcs})
-kde4_auth_register_actions(org.kde.ksysguardprocesslisthelper actions.actions)
+kde4_auth_add_helper(ksysguardprocesslist_helper org.kde.ksysguard.processlisthelper \
root ${ksysguardprocesslist_helper_srcs}) \
+kde4_auth_register_actions(org.kde.ksysguard.processlisthelper actions.actions)  
 set_target_properties(ksysguardprocesslist_helper PROPERTIES COMPILE_FLAGS "-Wall \
-ggdb")  
--- trunk/KDE/kdebase/workspace/libs/ksysguard/processcore/actions.actions \
#1017939:1017940 @@ -1,5 +1,5 @@
-[org.kde.ksysguardprocesslisthelper.sendsignal]
-Name=Kill, stop etc a process
-Description=Sends a signal (e.g. SIGKILL, SIGSTOP, etc) to a given process
+[org.kde.ksysguard.processlisthelper.sendsignal]
+Name=Kill stop etc a process
+Description=Sends a signal to a given process
 Policy=auth_admin
 
--- trunk/KDE/kdebase/workspace/libs/ksysguard/processcore/helper.cpp \
#1017939:1017940 @@ -42,5 +42,5 @@
         return KAuth::ActionReply::HelperErrorReply;
 }
 
-KDE4_AUTH_HELPER_MAIN("org.kde.ksysguardprocesslisthelper", \
KSysGuardProcessListHelper); \
+KDE4_AUTH_HELPER_MAIN("org.kde.ksysguard.processlisthelper", \
KSysGuardProcessListHelper);  
--- trunk/KDE/kdebase/workspace/libs/ksysguard/processui/ksysguardprocesslist.cpp \
#1017939:1017940 @@ -73,8 +73,6 @@
 #include "modeltest.h"
 #endif
 
-Q_DECLARE_METATYPE( QList<long long> );
-
 class ProgressBarItemDelegate : public QStyledItemDelegate
 {
     public:
@@ -1210,10 +1208,10 @@
     if(unkilled_pids.isEmpty()) return true;
     if(!d->mModel.isLocalhost()) return false; //We can't elevate privileges to kill \
non-localhost processes  
-    KAuth::Action::setHelperID("org.kde.ksysguardprocesslisthelper");
-    KAuth::Action action("org.kde.ksysguardprocesslisthelper.sendsignal");
+    KAuth::Action::setHelperID("org.kde.ksysguard.processlisthelper");
+    KAuth::Action action("org.kde.ksysguard.processlisthelper.sendsignal");
     action.addArgument("signal", sig);
-    action.addArgument("pids", qVariantFromValue(unkilled_pids));
+    action.addArgument("pids", QVariant::fromValue(unkilled_pids));
     KAuth::ActionReply reply = action.execute();
 
     if (reply == KAuth::ActionReply::SuccessReply) {
--- trunk/KDE/kdebase/workspace/libs/ksysguard/processui/ksysguardprocesslist.h \
#1017939:1017940 @@ -217,4 +217,6 @@
         KSysGuardProcessListPrivate* const d;
 };
 
+Q_DECLARE_METATYPE( QList<long long> )
+
 #endif


[prev in list] [next in list] [prev in thread] [next in thread]