Changeset 2409

Timestamp:

08/05/07 21:56:48 (1 year ago)

Author:

dgollub

Message:

struct member objtype in irmc_database is uneeeded.
dropped test connection code....

Files:

• plugins/irmc-sync/src/irmc_sync.c (modified) (1 diff)
• plugins/irmc-sync/src/irmc_sync.h (modified) (1 diff)

plugins/irmc-sync/src/irmc_sync.c

@@ -340 +340 @@
-}
-
-// TODO: drop me
-#if 0
-/**
- * Tests whether a connection to a device with the given configuration can
- * be established.
- */
-int *test_connection( void *foo, const char *configuration, void *bar )
-{
-  osync_trace(TRACE_ENTRY, "%s(%p, %s, %p)", __func__, foo, configuration, bar);                        
-  char data[10240];
-  int size = 10240;
-  OSyncError *error = NULL;
-  irmc_config config;
-  int *result = (int*)malloc(sizeof(int));
-
-  // parse the configuration
-  if (!parse_settings(&config, configuration, strlen(configuration), &error)) {
-    osync_error_unref(&error);
-    *result = 0;
-    osync_trace(TRACE_EXIT, "%s: %p", __func__, result);
-    return result;
-  }
-
-  config.obexhandle = irmc_obex_client(&config);
-
-  // connect to the device
-  if (!irmc_obex_connect(config.obexhandle, config.donttellsync ? NULL : "IRMC-SYNC", &error)) {
-    osync_error_unref(&error);
-    if (!irmc_obex_disconnect(config.obexhandle, &error))
-      osync_error_unref(&error);
-
-    *result = 0;
-    osync_trace(TRACE_EXIT, "%s: %p", __func__, result);
-    return result;
-  }
-
-  memset( data, 0, sizeof( data ) );
-  size = sizeof( data );
-
-  // retrieve the 'telecom/devinfo.txt' file, which is available on all IrMC capable devices
-  if (!irmc_obex_get(config.obexhandle, "telecom/devinfo.txt", data, &size, &error)) {
-    osync_error_unref(&error);
-    if (!irmc_obex_disconnect(config.obexhandle, &error))
-      osync_error_unref(&error);
-    irmc_obex_cleanup(config.obexhandle);
-
-    *result = 0;
-    osync_trace(TRACE_EXIT, "%s: %p", __func__, result);
-    return result;
-  }
-  data[ size ] = '\0';
-
-  // succeeded to connect and fetch data
-  if (!irmc_obex_disconnect(config.obexhandle, &error))
-    osync_error_unref(&error);
-  irmc_obex_cleanup(config.obexhandle);
-
-  *result = 1;
-  osync_trace(TRACE_EXIT, "%s: %p", __func__, result);
-  return result;
-}
-#endif
-
-/**
- * Creates the calendar specific changeinfo for slow- and fastsync

plugins/irmc-sync/src/irmc_sync.h

@@ -72 +72 @@
-typedef struct irmc_database {
-  OSyncObjFormat *objformat;     // The configured objformat for this database
-  char *objtype;                 // The objtype of the database
-} irmc_database;
-