Changeset 2126

Show
Ignore:
Timestamp:
06/10/07 04:38:58 (1 year ago)
Author:
paule
Message:

Use the correct method to get the sink environment in the sink functions

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • plugins/opie-sync/src/opie_sync.c

    r2115 r2126  
    214214{ 
    215215        osync_trace(TRACE_ENTRY, "%s(%p, %p, %p)", __func__, userdata, info, ctx); 
    216         //Each time you get passed a context (which is used to track 
    217         //calls to your plugin) you can get the data your returned in 
    218         //initialize via this call: 
    219         OpieSinkEnv *env = (OpieSinkEnv *)userdata; 
     216        OSyncObjTypeSink *sink = osync_plugin_info_get_sink(info); 
     217        OpieSinkEnv *env = osync_objtype_sink_get_userdata(sink); 
    220218 
    221219        OSyncError *error = NULL; 
    …… 
    259257        } 
    260258 
    261         OSyncObjTypeSink *sink = osync_plugin_info_get_sink(info); 
    262  
    263259        /* Get hashtable */ 
    264260        const char *configdir = osync_plugin_info_get_configdir(info); 
    …… 
    283279        osync_trace(TRACE_ENTRY, "%s(%p, %p, %p)", __func__, userdata, info, ctx); 
    284280        OSyncObjTypeSink *sink = osync_plugin_info_get_sink(info); 
    285         OpieSinkEnv *env = (OpieSinkEnv *)userdata; 
     281        OpieSinkEnv *env = osync_objtype_sink_get_userdata(sink); 
    286282 
    287283        OSyncError *error = NULL; 
    …… 
    430426{ 
    431427        osync_trace(TRACE_ENTRY, "%s(%p, %p, %p)", __func__, userdata, info, ctx); 
    432         OpieSinkEnv *env = (OpieSinkEnv *)userdata; 
     428        OSyncObjTypeSink *sink = osync_plugin_info_get_sink(info); 
     429        OpieSinkEnv *env = osync_objtype_sink_get_userdata(sink); 
    433430 
    434431        OSyncError *error = NULL; 
    …… 
    521518{ 
    522519        osync_trace(TRACE_ENTRY, "%s(%p, %p, %p)", __func__, userdata, info, ctx); 
    523         OpieSinkEnv *env = (OpieSinkEnv *)userdata; 
     520        OSyncObjTypeSink *sink = osync_plugin_info_get_sink(info); 
     521        OpieSinkEnv *env = osync_objtype_sink_get_userdata(sink); 
    524522        OSyncError *error = NULL; 
    525523         
    …… 
    544542static void disconnect(void *userdata, OSyncPluginInfo *info, OSyncContext *ctx) 
    545543{ 
    546         OpieSinkEnv *env = (OpieSinkEnv *)userdata; 
     544        OSyncObjTypeSink *sink = osync_plugin_info_get_sink(info); 
     545        OpieSinkEnv *env = osync_objtype_sink_get_userdata(sink); 
    547546         
    548547        /* Close the hashtable */