Changeset 341

Show
Ignore:
Timestamp:
03/08/05 21:41:53 (3 years ago)
Author:
ehabkost
Message:

I am stupid. Reverting stuff commited to tags, that was supposed to be commited on trunk

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • tags/opensync-0.13/opensync/opensync_group.h

    r340 r341  
    99 
    1010OSyncLockState osync_group_lock(OSyncGroup *group); 
    11 void osync_group_unlock(OSyncGroup *group, osync_bool remove_file); 
     11void osync_group_unlock(OSyncGroup *group, osync_bool remove); 
    1212 
    1313void osync_group_set_name(OSyncGroup *group, const char *name); 

  • tags/opensync-0.13/opensync/opensync_plugin.h

    r340 r341  
    1515void osync_plugin_accept_objformat(OSyncPluginInfo *info, const char *objtypestr, const char *formatstr, const char *extension); 
    1616void osync_plugin_set_commit_objformat(OSyncPluginInfo *info, const char *objtypestr, const char *formatstr, osync_bool (* commit_change) (OSyncContext *, OSyncChange *)); 
    17 void osync_plugin_set_access_objformat(OSyncPluginInfo *info, const char *objtypestr, const char *formatstr, osync_bool (* access_fn) (OSyncContext *, OSyncChange *)); 
     17void osync_plugin_set_access_objformat(OSyncPluginInfo *info, const char *objtypestr, const char *formatstr, osync_bool (* access) (OSyncContext *, OSyncChange *)); 

  • tags/opensync-0.13/osengine/osengine_engine.c

    r340 r341  
    10281028} 
    10291029 
    1030 OSyncMapping *osync_engine_mapping_from_id(OSyncEngine *engine, long long id) 
    1031 { 
    1032         return osengine_mappingtable_mapping_from_id(engine->maptable, id); 
    1033 } 
    1034  
    10351030/*@}*/ 

  • tags/opensync-0.13/osengine/osengine_engine.h

    r340 r341  
    2424void osync_engine_set_memberstatus_callback(OSyncEngine *engine, void (* function) (MSyncMemberUpdate *, void *), void *user_data); 
    2525osync_bool osync_engine_sync_and_block(OSyncEngine *engine, OSyncError **error); 
    26 OSyncMapping *osync_engine_mapping_from_id(OSyncEngine *engine, long long id); 

  • tags/opensync-0.13/osengine/osengine_mapping.c

    r340 r341  
    9494                OSyncMapping *mapping = m->data; 
    9595                if (osengine_mapping_find_entry(mapping, change, NULL)) 
    96                         return mapping; 
    97         } 
    98         return NULL; 
    99 } 
    100  
    101 OSyncMapping *osengine_mappingtable_mapping_from_id(OSyncMappingTable *table, long long id) 
    102 { 
    103         GList *m; 
    104         for (m = table->mappings; m; m = m->next) { 
    105                 OSyncMapping *mapping = m->data; 
    106                 if (mapping->id == id) 
    10796                        return mapping; 
    10897        } 
    …… 
    303292} 
    304293 
    305 long long osengine_mapping_get_id(OSyncMapping *mapping) 
    306 { 
    307         return mapping->id; 
    308 } 
    309  
    310294void osengine_mapping_reset(OSyncMapping *mapping) 
    311295{ 

  • tags/opensync-0.13/osengine/osengine_mapping.h

    r340 r341  
    33int osengine_mapping_num_changes(OSyncMapping *mapping); 
    44OSyncChange *osengine_mapping_nth_change(OSyncMapping *mapping, int nth); 
    5 long long osengine_mapping_get_id(OSyncMapping *mapping); 

  • tags/opensync-0.13/osengine/osengine_mapping_internals.h

    r340 r341  
    7676void osengine_mappingentry_reset(OSyncMappingEntry *entry); 
    7777void osengine_mappingentry_free(OSyncMappingEntry *entry); 
    78 OSyncMapping *osengine_mappingtable_mapping_from_id(OSyncMappingTable *table, long long id);