Changeset 2464

Timestamp:

08/17/07 17:47:05 (1 year ago)

Author:

paule

Message:

Fix false modifications triggered because of hash being calculated at the wrong time; protect access to categories using mutex

Files:

• plugins/opie-sync/src/opie_sync.c (modified) (2 diffs)

plugins/opie-sync/src/opie_sync.c

@@ -293 +293 @@
-        while(item_node)
-        {
+                char *uid = opie_xml_get_tagged_uid(item_node);
+                unsigned char *hash = hash_xml_node(env->doc, item_node);
+                
-                /* Convert category IDs to names that other systems can use */
+                g_mutex_lock(env->plugin_env->plugin_mutex);
-                char *categories_bkup = opie_xml_get_categories(item_node);
-                if(env->plugin_env->categories_doc && categories_bkup)
-                        opie_xml_category_ids_to_names(env->plugin_env->categories_doc, item_node);
-
-char *uid = opie_xml_get_tagged_uid(item_node);
+g_mutex_unlock(env->plugin_env->plugin_mutex);
+
-                char *data = xml_node_to_text(env->doc, item_node);
-                unsigned char *hash = hash_xml_node(env->doc, item_node);
-
-                /* Restore old categories value as we don't want to save this back to our XML file */
@@ -434 +437 @@
-                                opie_uid = opie_xml_set_ext_uid(change_node, env->doc, env->listelement, env->itemelement, ext_uid);
-                        
-
+
+
-                        if(env->plugin_env->categories_doc)
-                                opie_xml_category_names_to_ids(env->plugin_env->categories_doc, change_node);
+                        g_mutex_unlock(env->plugin_env->plugin_mutex);
-                        
-                        /* Get hash */