summaryrefslogtreecommitdiffstats
path: root/opensuse/core/tdelibs/kdeprint-restart-cupsd.diff
diff options
context:
space:
mode:
authorRobert Xu <[email protected]>2011-11-10 18:04:39 -0500
committerRobert Xu <[email protected]>2011-11-10 18:04:39 -0500
commit21fcfa3348213aa87f0e3aef62ca4720c6d31cb7 (patch)
tree2cfb64c59322628e613ed0895e3c3694d3abe6bd /opensuse/core/tdelibs/kdeprint-restart-cupsd.diff
parent8667643bff14a60d8571c599efd3e48bed3e3b12 (diff)
downloadtde-packaging-21fcfa3348213aa87f0e3aef62ca4720c6d31cb7.tar.gz
tde-packaging-21fcfa3348213aa87f0e3aef62ca4720c6d31cb7.zip
initial commit to suse branch: eclipse integration
Diffstat (limited to 'opensuse/core/tdelibs/kdeprint-restart-cupsd.diff')
-rw-r--r--opensuse/core/tdelibs/kdeprint-restart-cupsd.diff32
1 files changed, 32 insertions, 0 deletions
diff --git a/opensuse/core/tdelibs/kdeprint-restart-cupsd.diff b/opensuse/core/tdelibs/kdeprint-restart-cupsd.diff
new file mode 100644
index 000000000..d464098eb
--- /dev/null
+++ b/opensuse/core/tdelibs/kdeprint-restart-cupsd.diff
@@ -0,0 +1,32 @@
+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);
+ }