[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdepim/akregator/src
From:       Frank Osterfeld <frank.osterfeld () kdemail ! net>
Date:       2009-12-05 20:13:56
Message-ID: 1260044036.528444.13658.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1059110 by osterfeld:

merge from 4.3 branch
------------------------------------------------------------------------
r1009390 | osterfeld | 2009-08-09 23:33:29 +0200 (Sun, 09 Aug 2009) | 1 line

call PimApplication::start so the kontact plugin is selected if kontact is running.
------------------------------------------------------------------------


 M  +6 -0      main.cpp  


--- trunk/KDE/kdepim/akregator/src/main.cpp #1059109:1059110
@@ -27,6 +27,7 @@
 #include "akregator_options.h"
 
 #include <kcmdlineargs.h>
+#include <KDebug>
 #include <klocale.h>
 #include <kontactinterface/pimuniqueapplication.h>
 #include <QtDBus/QtDBus>
@@ -95,6 +96,11 @@
     KCmdLineArgs::addCmdLineOptions( Akregator::akregator_options() );
     KUniqueApplication::addCmdLineOptions();
 
+    if ( !Akregator::Application::start() ) {
+        kWarning() << "akregator is already running, exiting.";
+        exit( 0 );
+    }
+
     Akregator::Application app;
 
     // start knotifyclient if not already started. makes it work for people who \
doesn't use full kde, according to kmail devels


[prev in list] [next in list] [prev in thread] [next in thread]