summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2012-06-11 13:46:08 -0500
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2012-06-11 13:46:08 -0500
commit1085164f7f5be427f50d592426b1ab8061df58b5 (patch)
tree9d0152bf367a8c3c3f5300eeff8a7c57471ce8c6
parent451648d55498ac29d9164519cc4cda2e65503a16 (diff)
downloadtdebase-1085164f7f5be427f50d592426b1ab8061df58b5.tar.gz
tdebase-1085164f7f5be427f50d592426b1ab8061df58b5.zip
Prevent tdeinit_phase1 from registering with DCOP
This resolves Bug 956
-rw-r--r--tdeinit/phase1.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/tdeinit/phase1.cpp b/tdeinit/phase1.cpp
index f4317e554..e667503c2 100644
--- a/tdeinit/phase1.cpp
+++ b/tdeinit/phase1.cpp
@@ -50,9 +50,10 @@ int main(int argc, char **argv)
about.addAuthor( "Timothy Pearson", 0, "kb9vqf@pearsoncomputing.net" );
KCmdLineArgs::init(argc, argv, &about);
KCmdLineArgs::addCmdLineOptions( options );
-
+
+ KApplication::disableAutoDcopRegistration();
KApplication app;
-
+
KConfig config("twinrc", true);
config.setGroup( "ThirdPartyWM" );
TQString wmToLaunch = config.readEntry("WMExecutable", "");