[PC-BSD Commits] r2039 - pcbsd/trunk/SystemUpdater

[svn at pcbsd.org]

Author: tim
Date: 2008-06-07 09:27:00 -0700 (Sat, 07 Jun 2008)
New Revision: 2039

Modified:
   pcbsd/trunk/SystemUpdater/main.cpp
Log:
Disable session management in SystemUpdater. KDE becomes confused trying to restore the session for a root application in a usermode session.

Modified: pcbsd/trunk/SystemUpdater/main.cpp
===================================================================
--- pcbsd/trunk/SystemUpdater/main.cpp	2008-06-07 16:20:09 UTC (rev 2038)
+++ pcbsd/trunk/SystemUpdater/main.cpp	2008-06-07 16:27:00 UTC (rev 2039)
@@ -11,28 +11,23 @@
 #include <UpdaterTray.h>
 
 
-int  main(int argc, char *argv[]) {
-   
-KCmdLineArgs::init(argc, argv, "PC-BSD System Updater", "PC-BSD System Updater", "Updates the PC-BSD Desktop", "1.0");
+int  main(int argc, char *argv[])
+{
+   KCmdLineArgs::init(argc, argv, "PC-BSD System Updater", "PC-BSD System Updater", "Updates the PC-BSD Desktop", "1.0");
 
+   KApplication::addCmdLineOptions();
 
-
-KUniqueApplication::addCmdLineOptions();
-   if(!KUniqueApplication::start())
-      errx(0, "already running.");
-
    KApplication  a;
+   a.disableSessionManagement();
 
-
    UpdaterTray  tray;
    a.setMainWidget(&tray);
    a.connect(&a, SIGNAL(lastWindowClosed()), &a, SLOT(quit()));
 
-    QTranslator translator( 0 );
-    translator.load( QString("SystemUpdater_") + QTextCodec::locale(), "/PCBSD/LANGS/" );
-    a.installTranslator( &translator );
+   QTranslator translator( 0 );
+   translator.load( QString("SystemUpdater_") + QTextCodec::locale(), "/PCBSD/LANGS/" );
+   a.installTranslator( &translator );
 
-
    // Init our program
    tray.programInit();
    tray.show();