Changeset 1616

Timestamp:

01/19/07 20:56:29 (23 months ago)

Author:

mjahn

Message:

apply fix based one XMPM changes against OpenSync?? kdepim plugin 0440-error_app_running.patch

Location:

plugins/kdepim/src

Files:

• kaddrbook.cpp (modified) (2 diffs)
• kcal.cpp (modified) (2 diffs)
• knotes.cpp (modified) (1 diff)

plugins/kdepim/src/kaddrbook.cpp

@@ -27 +27 @@
 
 #include "kaddrbook.h"
+#include <kapplication.h>
+#include <dcopclient.h>
 #include <qdeepcopy.h>
 
@@ -59 +61 @@
         osync_trace(TRACE_ENTRY, "%s(%p)", __func__, ctx);
         
+        DCOPClient *dcopc = KApplication::kApplication()->dcopClient();
+        if (!dcopc) {
+                osync_context_report_error(ctx, OSYNC_ERROR_INITIALIZATION, "Unable to initialize dcop client");
+                osync_trace(TRACE_EXIT_ERROR, "%s: Unable to initialize dcop client", __func__);
+                return false;
+        }
+
+        QString appId = dcopc->registerAs("opensync-kaddrbook");
+
+        //check if kaddressbook is running, and return an error if it
+        //is running
+        if (dcopc->isApplicationRegistered("kaddressbook")) {
+                osync_context_report_error(ctx, OSYNC_ERROR_APP_RUNNING, "KAddressBook is running. Please finish it");
+                osync_trace(TRACE_EXIT_ERROR, "%s: KAddressBook is running", __func__);
+                return false;
+        }
+
         //get a handle to the standard KDE addressbook
         addressbookptr = KABC::StdAddressBook::self();

plugins/kdepim/src/kcal.cpp

@@ -26 +26 @@
 #include "kcal.h"
 
+#include <kapplication.h>
+#include <dcopclient.h>
+
 KCalDataSource::KCalDataSource(OSyncMember *member, OSyncHashTable *hashtable)
     : hashtable(hashtable), member(member)
@@ -34 +37 @@
 bool KCalDataSource::connect(OSyncContext *ctx)
 {
+
+        DCOPClient *dcopc = KApplication::kApplication()->dcopClient();
+        if (!dcopc) {
+                osync_context_report_error(ctx, OSYNC_ERROR_INITIALIZATION, "Unable to initialize dcop client");
+                osync_trace(TRACE_EXIT_ERROR, "%s: Unable to initialize dcop client", __func__);
+                return false;
+        }
+
+        QString appId = dcopc->registerAs("opensync-kcal");
+
+        //check if korganizer running, and return an error if it
+        //is running
+        if (dcopc->isApplicationRegistered("korganizer")) {
+                osync_context_report_error(ctx, OSYNC_ERROR_APP_RUNNING, "KOrganizer is running. Please finish it");
+                osync_trace(TRACE_EXIT_ERROR, "%s: KOrganizer is running", __func__);
+                return false;
+        }
+
     calendar = new KCal::CalendarResources(QString::fromLatin1( "UTC" ));
     if (!calendar) {

plugins/kdepim/src/knotes.cpp

@@ -60 +60 @@
         QString appId = kn_dcop->registerAs("opensync");
         
+        //check if kontact is running, and return an error if it
+        //is running
+        if (kn_dcop->isApplicationRegistered("kontact")) {
+                osync_context_report_error(ctx, OSYNC_ERROR_APP_RUNNING, "Kontact is running. Please finish it");
+                osync_trace(TRACE_EXIT_ERROR, "%s: Kontact is running", __func__);
+                return false;
+        }
+
         //check knotes running
         QCStringList apps = kn_dcop->registeredApplications();