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

List:       kde-commits
Subject:    branches/work/akonadi-ports
From:       Sebastian Sauer <mail () dipe ! org>
Date:       2009-10-22 14:06:14
Message-ID: 1256220374.799840.19902.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1039011 by sebsauer:

allow PimUniqueApplication's to define KUniqueApplication::StartFlags like e.g. \
KUniqueApplication::NonUniqueInstance to disable unique start what is rather useful \
atm to fix KOrganizer to react if the AkonadiCalendar got changed by another \
KOrganizer instance

 M  +3 -1      kdepim/korganizer/main.cpp  
 M  +2 -2      kdepimlibs/kontactinterface/pimuniqueapplication.cpp  
 M  +1 -1      kdepimlibs/kontactinterface/pimuniqueapplication.h  


--- branches/work/akonadi-ports/kdepim/korganizer/main.cpp #1039010:1039011
@@ -43,7 +43,9 @@
   KCmdLineArgs::addCmdLineOptions( korganizer_options() );
   KUniqueApplication::addCmdLineOptions();
 
-  if ( !KOrganizerApp::start() ) {
+  KUniqueApplication::StartFlags flags;
+  //flags |= KUniqueApplication::NonUniqueInstance;
+  if ( !KOrganizerApp::start(flags) ) {
     return 0;
   }
 
--- branches/work/akonadi-ports/kdepimlibs/kontactinterface/pimuniqueapplication.cpp \
#1039010:1039011 @@ -70,7 +70,7 @@
   return connection;
 }
 
-bool PimUniqueApplication::start()
+bool PimUniqueApplication::start( KUniqueApplication::StartFlags flags )
 {
   const QString appName = KCmdLineArgs::aboutData()->appName();
   // Try talking to /appName_PimApplication in org.kde.appName,
@@ -113,5 +113,5 @@
 
   //kDebug() << "kontact not running -- start standalone application";
   // kontact not running -- start standalone application.
-  return KUniqueApplication::start();
+  return KUniqueApplication::start(flags);
 }
--- branches/work/akonadi-ports/kdepimlibs/kontactinterface/pimuniqueapplication.h \
#1039010:1039011 @@ -42,7 +42,7 @@
     /**
      * @see KUniqueApplication::start
      */
-    static bool start();
+    static bool start( KUniqueApplication::StartFlags flags = \
KUniqueApplication::StartFlags() );  
   private:
     //@cond PRIVATE


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