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

List:       kde-commits
Subject:    KDE/kdepim
From:       Sergio Luis Martins <iamsergio () gmail ! com>
Date:       2010-12-04 14:27:53
Message-ID: 20101204142753.AFB0AAC8A4 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1203554 by smartins:

Ensure korganizer is running before making the dbus call.
Use the constraint "'mobile' in Keywords" so KDBusServiceStarted doesn't start korganizer-desktop.

 M  +3 -1      mailcommon/mailutil.cpp  
 M  +1 -0      mobile/calendar/korganizer-mobile.desktop  


--- trunk/KDE/kdepim/mailcommon/mailutil.cpp #1203553:1203554
@@ -133,7 +133,8 @@
 {
   QString error;
   QString dbusService;
-  int result = KDBusServiceStarter::self()->findServiceFor( "DBUS/Organizer", QString(),
+  const int result = KDBusServiceStarter::self()->findServiceFor( "DBUS/Organizer",
+                                                                  "'mobile' in Keywords",
                                                             &error, &dbusService );
   if ( result == 0 ) {
     // OK, so korganizer (or kontact) is running. Now ensure the object we want is loaded.
@@ -292,6 +293,7 @@
   }
 #else
   kDebug() << "mobile";
+  MailCommon::Util::ensureKorganizerRunning( false );
   OrgKdeKorganizerCalendarInterface *iface =
     new OrgKdeKorganizerCalendarInterface( "org.kde.korganizer", "/Calendar",
                                            QDBusConnection::sessionBus() );
--- trunk/KDE/kdepim/mobile/calendar/korganizer-mobile.desktop #1203553:1203554
@@ -33,3 +33,4 @@
 X-KDE-StartupNotify=true
 X-DBUS-StartupType=Unique
 X-DBUS-ServiceName=org.kde.korganizer
+Keywords=mobile
[prev in list] [next in list] [prev in thread] [next in thread]