Changeset 2429

Show
Ignore:
Timestamp:
08/07/07 19:01:42 (1 year ago)
Author:
cstender
Message:

activated bluetooth support again, fixed segfauled in irmcSyncDone

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • plugins/irmc-sync/src/SConscript

    r2418 r2429  
    88 
    99 
    10 irmc_sync = env.SharedLibrary('irmc-sync', ['irmc_sync.c', 'irmc_obex.c', 'irmc_irda.c'], LIBS = ['opensync', 'openobex', 'bluetooth']) 
     10irmc_sync = env.SharedLibrary('irmc-sync', ['irmc_sync.c', 'irmc_obex.c', 'irmc_irda.c', 'irmc_bluetooth.c'], LIBS = ['opensync', 'openobex', 'bluetooth']) 
    1111 
    1212 

  • plugins/irmc-sync/src/irmc_obex.c

    r2422 r2429  
    6363void obex_event(obex_t *handle, obex_object_t *object, gint mode, gint event, gint obex_cmd, gint obex_rsp) 
    6464{ 
     65  osync_trace(TRACE_ENTRY, "%s(%p,%p,%i,%i,%i, %i)", __func__, handle, object, mode, event, obex_cmd, obex_rsp); 
    6566  obexdata_t *userdata; 
    6667  osync_trace(TRACE_INTERNAL, "obex event: %i", event); 
    …… 
    102103    break; 
    103104  } 
     105  osync_trace(TRACE_EXIT, "%s", __func__); 
    104106} 
    105107 

  • plugins/irmc-sync/src/irmc_sync.c

    r2424 r2429  
    983983  const char *objtype = osync_objtype_sink_get_name(sink); 
    984984 
    985   if (database->changecounter >= 0 && strcmp(database->dbid, "FFFFFF")) { 
     985  //if (database->changecounter >= 0 && strcmp(database->dbid, "FFFFFF")) { 
     986  if (database->changecounter >= 0) { 
    986987    char *anchor = g_strdup_printf("%d:%s", database->changecounter, database->dbid); 
    987988    osync_anchor_update( env->anchor_path, objtype, anchor );