Changeset 41

Timestamp:

12/09/04 21:25:45 (4 years ago)

Author:

azrael

Message:

Reset the slow-syncs once the sync finishes.

Location:

trunk/src

Files:

• opensync_convert.h (modified) (1 diff)
• opensync_group.c (modified) (1 diff)
• opensync_hashtable.c (modified) (2 diffs)
• opensync_member.c (modified) (1 diff)

trunk/src/opensync_convert.h

@@ -29 +29 @@
 OSyncObjType *osync_conv_nth_objtype(OSyncFormatEnv *env, int nth);
 int osync_conv_num_objformats(OSyncObjType *type);
+void osync_conv_env_free(OSyncFormatEnv *env);

trunk/src/opensync_group.c

@@ -231 +231 @@
         OSyncFormatEnv *conv_env = group->conv_env;
 
-        //if (osync_conv_objtype_is_any(objtypestr)) {
-                /*GList *element;
+        if (osync_conv_objtype_is_any(objtypestr)) {
+                GList *element;
                 for (element = conv_env->objtypes; element; element = element->next) {
                         OSyncObjType *objtype = element->data;
                         objtype->needs_slow_sync = slow_sync;
-                }*/
-        //} else {
+                }
+        } else {
                 OSyncObjType *objtype = osync_conv_find_objtype(conv_env, objtypestr);
                 g_assert(objtype);
                 objtype->needs_slow_sync = slow_sync;
-        //}
+        }
 }
 

trunk/src/opensync_hashtable.c

@@ -89 +89 @@
         osync_assert(change, "Change was NULL. Bug in a plugin");
         osync_assert(change->uid, "No uid was set on change. Bug in a plugin");
-        printf("updating uid %s to hash %s\n", change->uid, change->hash);
+
         switch (osync_change_get_changetype(change)) {
                 case CHANGE_MODIFIED:
                 case CHANGE_ADDED:
-                        printf("putting\n");
                         osync_db_put(table->dbhandle, change->uid, strlen(change->uid) + 1, change->hash, strlen(change->hash) + 1);
                         break;
@@ -100 +99 @@
                         break;
                 default:
-                        printf("Error!\n");
+                        g_assert_not_reached();
         }
 }

trunk/src/opensync_member.c

@@ -194 +194 @@
         context->callback_function = function;
         context->calldata = user_data;
+        osync_member_set_slow_sync(member, "data", FALSE);
         if (functions.sync_done) {
                 functions.sync_done(context);