Changeset 1619

Timestamp:

01/20/07 11:56:41 (23 months ago)

Author:

mjahn

Message:

- apply fix based one XMPM changes against opensync kdepim-plugin 0630-make_hash_for_add.patch
- fix identation based on linux style

Files:

• plugins/kdepim/src/knotes.cpp (modified) (14 diffs)

plugins/kdepim/src/knotes.cpp

@@ -1 @@
-/*********************************************************************** 
+/***********************************************************************
 KNotes support for OpenSync kdepim-sync plugin
 Copyright (C) 2004 Conectiva S. A.
-
+ 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License version 2 as
 published by the Free Software Foundation;
-
+ 
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
 OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
@@ -15 +15 @@
 ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF 
 OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
+ 
 ALL LIABILITY, INCLUDING LIABILITY FOR INFRINGEMENT OF ANY PATENTS, 
 COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS, RELATING TO USE OF THIS 
@@ -35 +35 @@
 
 KNotesDataSource::KNotesDataSource(OSyncMember *m, OSyncHashTable *h)
-    :member(m), hashtable(h)
+                :member(m), hashtable(h)
 {
         connected = false;
@@ -43 +43 @@
 {
         osync_trace(TRACE_ENTRY, "%s(%p)", __func__, ctx);
-        
+
         //connect to dcop
         kn_dcop = KApplication::kApplication()->dcopClient();
@@ -51 +51 @@
                 return FALSE;
         }
-        
+
         /*if (!kn_dcop->attach()) {
                 osync_context_report_error(ctx, OSYNC_ERROR_INITIALIZATION, "Unable to attach dcop for knotes");
@@ -57 +57 @@
                 return FALSE;
         }*/
-        
+
         QString appId = kn_dcop->registerAs("opensync");
-        
+
         //check if kontact is running, and return an error if it
         //is running
@@ -72 +72 @@
         if (!apps.contains("knotes")) {
                 //start knotes if not running
-        knotesWasRunning = false;
-        system("knotes");
+                knotesWasRunning = false;
+                system("knotes");
                 system("dcop knotes KNotesIface hideAllNotes");
         } else
-        knotesWasRunning = true;
+                knotesWasRunning = true;
 
         kn_iface = new KNotesIface_stub("knotes", "KNotesIface");
@@ -88 +88 @@
 {
         osync_trace(TRACE_ENTRY, "%s(%p)", __func__, ctx);
-        
+
         // FIXME: ugly, but necessary
         if (!knotesWasRunning) {
                 system("dcop knotes MainApplication-Interface quit");
         }
-        
+
         //detach dcop
         /*if (!kn_dcop->detach()) {
@@ -105 +105 @@
         //delete kn_dcop;
         //kn_dcop = NULL;
-        
+
         connected = false;
         osync_trace(TRACE_EXIT, "%s", __func__);
@@ -223 +223 @@
 {
         osync_trace(TRACE_ENTRY, "%s(%p, %p)", __func__, ctx, chg);
-    OSyncChangeType type = osync_change_get_changetype(chg);
-
-    QString uid = osync_change_get_uid(chg);
-
-    if (type != CHANGE_DELETED) {
-
-        // Get osxml data
-        xmlDoc *doc = (xmlDoc*)osync_change_get_data(chg);
-        
-        xmlNode *root = xmlDocGetRootElement(doc);
+        OSyncChangeType type = osync_change_get_changetype(chg);
+
+        QString uid = osync_change_get_uid(chg);
+
+        if (type != CHANGE_DELETED) {
+
+                // Get osxml data
+                xmlDoc *doc = (xmlDoc*)osync_change_get_data(chg);
+
+                xmlNode *root = xmlDocGetRootElement(doc);
                 if (!root) {
-            osync_context_report_error(ctx, OSYNC_ERROR_GENERIC, "Unable to get xml root element");
-            osync_trace(TRACE_EXIT_ERROR, "%s: Invalid data", __func__);
+                        osync_context_report_error(ctx, OSYNC_ERROR_GENERIC, "Unable to get xml root element");
+                        osync_trace(TRACE_EXIT_ERROR, "%s: Invalid data", __func__);
                         return false;
-        }
-                
+                }
+
                 if (xmlStrcmp((root)->name, (const xmlChar *) "Note")) {
-            osync_context_report_error(ctx, OSYNC_ERROR_GENERIC, "Wrong root element");
-            osync_trace(TRACE_EXIT_ERROR, "%s: Invalid data2", __func__);
+                        osync_context_report_error(ctx, OSYNC_ERROR_GENERIC, "Wrong root element");
+                        osync_trace(TRACE_EXIT_ERROR, "%s: Invalid data2", __func__);
                         return false;
-        }
-
-        xmlChar *xmlStr;
-        char * tmpStr;
-
-        tmpStr = osync_change_get_printable(chg);
-        xmlStr = (xmlChar*) osxml_find_node(root, "Summary");
-        osync_trace(TRACE_INTERNAL, "Getting note %s and %s\n", tmpStr, xmlStr);
-
-        QString summary = (char*)xmlStr;
-        xmlFree(xmlStr);
-        g_free(tmpStr);
-
-        xmlStr = (xmlChar*) osxml_find_node(root, "Body");
-        QString body = (char*)xmlStr;
-        xmlFree(xmlStr);
-
-        QString hash;
-        switch (type) {
-            case CHANGE_ADDED:
-                osync_trace(TRACE_INTERNAL, "addding new \"%s\" and \"%s\"\n", (const char*)summary.local8Bit(), (const char*)body.local8Bit());
-                uid = kn_iface->newNote(summary, body);
+                }
+
+                xmlChar *xmlStr;
+                char * tmpStr;
+
+                tmpStr = osync_change_get_printable(chg);
+                xmlStr = (xmlChar*) osxml_find_node(root, "Summary");
+                osync_trace(TRACE_INTERNAL, "Getting note %s and %s\n", tmpStr, xmlStr);
+
+                QString summary = (char*)xmlStr;
+                xmlFree(xmlStr);
+                g_free(tmpStr);
+
+                xmlStr = (xmlChar*) osxml_find_node(root, "Body");
+                QString body = (char*)xmlStr;
+                xmlFree(xmlStr);
+
+                QString hash;
+                switch (type) {
+                        case CHANGE_ADDED:
+                                osync_trace(TRACE_INTERNAL, "addding new \"%s\" and \"%s\"\n", (const char*)summary.local8Bit(), (const char*)body.local8Bit());
+                                uid = kn_iface->newNote(summary, body);
                                 if (kn_iface->status() != DCOPStub::CallSucceeded) {
                                         osync_context_report_error(ctx, OSYNC_ERROR_GENERIC, "Unable to add new note");
-                        osync_trace(TRACE_EXIT_ERROR, "%s: Unable to add new note", __func__);
+                                        osync_trace(TRACE_EXIT_ERROR, "%s: Unable to add new note", __func__);
                                         return false;
                                 }
-                                
+
                                 kn_iface->hideNote(uid);
                                 if (kn_iface->status() != DCOPStub::CallSucceeded)
                                         osync_trace(TRACE_INTERNAL, "ERROR: Unable to hide note");
-                                
-                osync_change_set_uid(chg, uid);
-                osync_change_set_hash(chg, hash);
+
+                                hash = summary + body;
+                                osync_change_set_uid(chg, uid);
+                                osync_change_set_hash(chg, hash);
                                 break;
-            case CHANGE_MODIFIED:
+                        case CHANGE_MODIFIED:
                                 kn_iface->setName(uid, summary);
                                 if (kn_iface->status() != DCOPStub::CallSucceeded) {
@@ -285 +286 @@
                                         return false;
                                 }
-                                
+
                                 kn_iface->setText(uid, body);
                                 if (kn_iface->status() != DCOPStub::CallSucceeded) {
@@ -292 +293 @@
                                         return false;
                                 }
-                hash = summary + body;
-                osync_change_set_hash(chg, hash);
+                                hash = summary + body;
+                                osync_change_set_hash(chg, hash);
                                 break;
-            default:
-                osync_context_report_error(ctx, OSYNC_ERROR_NOT_SUPPORTED, "Invalid change type");
-                osync_trace(TRACE_EXIT_ERROR, "%s: Invalid change type", __func__);
+                        default:
+                                osync_context_report_error(ctx, OSYNC_ERROR_NOT_SUPPORTED, "Invalid change type");
+                                osync_trace(TRACE_EXIT_ERROR, "%s: Invalid change type", __func__);
                                 return false;
-        }
-    } else {
+                }
+        } else {
                 system("dcop knotes KNotesIface hideAllNotes");
                 QString asdasd = "dcop knotes KNotesIface killNote " + uid + " true";
                 system((const char*)asdasd.local8Bit());
-        osync_debug("knotes", 4, "Deleting note %s", (const char*)uid.local8Bit());
+                osync_debug("knotes", 4, "Deleting note %s", (const char*)uid.local8Bit());
                 /*kn_iface->killNote(uid, true);
                 if (kn_iface->status() != DCOPStub::CallSucceeded) {
@@ -311 +312 @@
                         return false;
                 }*/
-    }
-
-        osync_trace(TRACE_EXIT, "%s", __func__);
-    return true;
+        }
+
+        osync_trace(TRACE_EXIT, "%s", __func__);
+        return true;
 }
 
 bool KNotesDataSource::commit_change(OSyncContext *ctx, OSyncChange *chg)
-{
-        osync_trace(TRACE_ENTRY, "%s(%p, %p)", __func__, ctx, chg);
-    if (!__access(ctx, chg)) {
-        osync_trace(TRACE_EXIT_ERROR, "%s: Unable to delete note", __func__);
-                return false;
-    }
-    osync_hashtable_update_hash(hashtable, chg);
-        osync_context_report_success(ctx);
-        osync_trace(TRACE_EXIT, "%s", __func__);
-    return true;
-}
-
-bool KNotesDataSource::access(OSyncContext *ctx, OSyncChange *chg)
 {
         osync_trace(TRACE_ENTRY, "%s(%p, %p)", __func__, ctx, chg);
@@ -336 +324 @@
                 osync_trace(TRACE_EXIT_ERROR, "%s: Unable to delete note", __func__);
                 return false;
-    }
+        }
+        osync_hashtable_update_hash(hashtable, chg);
         osync_context_report_success(ctx);
         osync_trace(TRACE_EXIT, "%s", __func__);
         return true;
 }
+
+bool KNotesDataSource::access(OSyncContext *ctx, OSyncChange *chg)
+{
+        osync_trace(TRACE_ENTRY, "%s(%p, %p)", __func__, ctx, chg);
+        if (!__access(ctx, chg)) {
+                osync_trace(TRACE_EXIT_ERROR, "%s: Unable to delete note", __func__);
+                return false;
+        }
+        osync_context_report_success(ctx);
+        osync_trace(TRACE_EXIT, "%s", __func__);
+        return true;
+}