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

List:       kde-commits
Subject:    kdenonbeta/applets/kstatusapplet [POSSIBLY UNSAFE]
From:       David Faure <faure () kde ! org>
Date:       2004-04-30 22:42:55
Message-ID: 20040430224255.58CE89A74 () office ! kde ! org
[Download RAW message or body]

CVS commit by faure: 

Support for arguments in StatusApp and ActivateApp
Support for env vars in *App and StatusFile fields


  M +5 -4      kstatusapplet.cpp   1.9 [POSSIBLY UNSAFE: setUseShell]


--- kdenonbeta/applets/kstatusapplet/kstatusapplet.cpp  #1.8:1.9
@@ -131,5 +131,5 @@ void KStatusApplet::readGroup( const QSt
         KConfig* c = config();
         c->setGroup( group );
-        QString activateApp = c->readEntry("ActivateApp", QString::null );
+        QString activateApp = c->readPathEntry("ActivateApp", QString::null );
         QPixmap pix;
         QString iconname = c->readEntry("Pixmap", QString::null );
@@ -157,6 +157,6 @@ void KStatusApplet::readConfiguration()
         KConfig* c = config();
         c->setGroup("Status");
-        m_statusApp = c->readEntry("StatusApp");
-        QString path = c->readEntry("StatusFile");
+        m_statusApp = c->readPathEntry("StatusApp");
+        QString path = c->readPathEntry("StatusFile");
         if ( watchingApp() ) // i.e. !m_statusApp.isEmpty()
                 m_interval = c->readNumEntry( "Interval", 5000 );
@@ -167,4 +167,5 @@ void KStatusApplet::readConfiguration()
         {
                 m_pProcess->clearArguments();
+                m_pProcess->setUseShell( true );
                 *m_pProcess << m_statusApp;
 
@@ -184,5 +185,4 @@ void KStatusApplet::readConfiguration()
         else // watching a file, not an app
         {
-                QString path = c->readEntry("StatusFile");
                 if ( c->hasGroup( "Timeout" ) )
                         readGroup( "Timeout", CODE_TIMEOUT );
@@ -275,4 +275,5 @@ void KStatusApplet::startActivateApp()
         if( activateApp.isNull() )
                 return;
+        proc->setUseShell( true );
         *proc << activateApp;
         if( !proc->start() ) {


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