diff options
author | Robert Xu <rxu@linux-zdwj.site> | 2012-02-01 00:31:59 -0500 |
---|---|---|
committer | Robert Xu <rxu@linux-zdwj.site> | 2012-02-01 00:31:59 -0500 |
commit | f599f39717d771b8b7a2aff006cda6c31e8b12da (patch) | |
tree | f601e3c0303a193cda6f8c6f956619dda9673c70 /opensuse/core/tdelibs/kdeprint-restart-cupsd.diff | |
parent | ead369ac94473139a2320a1c90cda64dd887b94a (diff) | |
parent | 27c9e783c6283f8916ebee3a23c6d1ba909a5126 (diff) | |
download | tde-packaging-f599f39717d771b8b7a2aff006cda6c31e8b12da.tar.gz tde-packaging-f599f39717d771b8b7a2aff006cda6c31e8b12da.zip |
Merge branch 'suse'
Diffstat (limited to 'opensuse/core/tdelibs/kdeprint-restart-cupsd.diff')
-rw-r--r-- | opensuse/core/tdelibs/kdeprint-restart-cupsd.diff | 32 |
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); + } |