diff options
author | Robert Xu <robxu9@gmail.com> | 2011-11-10 18:04:39 -0500 |
---|---|---|
committer | Robert Xu <robxu9@gmail.com> | 2011-11-10 18:04:39 -0500 |
commit | 21fcfa3348213aa87f0e3aef62ca4720c6d31cb7 (patch) | |
tree | 2cfb64c59322628e613ed0895e3c3694d3abe6bd /opensuse/tdelibs/kdeprint-restart-cupsd.diff | |
parent | 8667643bff14a60d8571c599efd3e48bed3e3b12 (diff) | |
download | tde-packaging-21fcfa3348213aa87f0e3aef62ca4720c6d31cb7.tar.gz tde-packaging-21fcfa3348213aa87f0e3aef62ca4720c6d31cb7.zip |
initial commit to suse branch: eclipse integration
Diffstat (limited to 'opensuse/tdelibs/kdeprint-restart-cupsd.diff')
-rw-r--r-- | opensuse/tdelibs/kdeprint-restart-cupsd.diff | 32 |
1 files changed, 0 insertions, 32 deletions
diff --git a/opensuse/tdelibs/kdeprint-restart-cupsd.diff b/opensuse/tdelibs/kdeprint-restart-cupsd.diff deleted file mode 100644 index d464098eb..000000000 --- a/opensuse/tdelibs/kdeprint-restart-cupsd.diff +++ /dev/null @@ -1,32 +0,0 @@ -Index: kdeprint/cups/cupsdconf2/cupsddialog.cpp -=================================================================== ---- kdeprint/cups/cupsdconf2/cupsddialog.cpp.orig -+++ kdeprint/cups/cupsdconf2/cupsddialog.cpp -@@ -45,6 +45,7 @@ - #include <kguiitem.h> - #include <kprocess.h> - -+#include <stdlib.h> - #include <signal.h> - #include <cups/cups.h> - -@@ -205,15 +206,13 @@ bool CupsdDialog::restartServer(QString& - } - else - { -+ KProcess proc; - bool success = false; - if (getuid() == 0 ) -- success = (::kill(serverPid, SIGHUP) == 0); -+ proc << "rccups" << "force-reload"; - else -- { -- KProcess proc; -- proc << "kdesu" << "-c" << "kill -SIGHUP " + QString::number( serverPid ); -- success = proc.start( KProcess::Block ) && proc.normalExit(); -- } -+ proc << "kdesu" << "-c" << "rccups" << "force-reload"; -+ success = proc.start( KProcess::Block ) && proc.normalExit(); - if( !success ) - msg = i18n("Unable to restart CUPS server (pid = %1)").arg(serverPid); - } |