summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDarrell Anderson <humanreadable@yahoo.com>2012-04-28 20:23:20 -0500
committerSlávek Banko <slavek.banko@axis.cz>2012-06-03 03:27:17 +0200
commitf3745dec27772ba1df2af204165454db90695036 (patch)
tree660f7dc422399f6fc29e8b458055aea3b506c616
parent9231a53e8de68a7603aee7ab5d8b5aa827382c8a (diff)
downloadtdebase-f3745dec27772ba1df2af204165454db90695036.tar.gz
tdebase-f3745dec27772ba1df2af204165454db90695036.zip
Reverse patch from GIT hash 2b178a5320 11-10-26 (SVN revision 1260900).
This patch causes conflicts with running kate concurrently as user and root via kdesu, as reported in bug report 927. (cherry picked from commit 3d7141e517b1419859188f253bc91e4162c18de4)
-rw-r--r--kdesu/kdesu/kdesu.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/kdesu/kdesu/kdesu.cpp b/kdesu/kdesu/kdesu.cpp
index 634442d09..daa522ee1 100644
--- a/kdesu/kdesu/kdesu.cpp
+++ b/kdesu/kdesu/kdesu.cpp
@@ -62,7 +62,7 @@ static KCmdLineOptions options[] = {
{ "t", I18N_NOOP("Enable terminal output (no password keeping)"), 0 },
{ "p <prio>", I18N_NOOP("Set priority value: 0 <= prio <= 100, 0 is lowest"), "50" },
{ "r", I18N_NOOP("Use realtime scheduling"), 0 },
- { "newdcop", I18N_NOOP("Create a new dcopserver instance (this can break your current TDE session)"), 0 },
+ { "nonewdcop", I18N_NOOP("Let command use existing dcopserver"), 0 },
{ "noignorebutton", I18N_NOOP("Do not display ignore button"), 0 },
{ "i <icon name>", I18N_NOOP("Specify icon to use in the password dialog"), 0},
{ "d", I18N_NOOP("Do not show the command to be run in the dialog"), 0},