Changeset 3509

Timestamp:

08/06/08 08:49:04 (4 months ago)

Author:

dgollub

Message:

Resource API renaming related build fixes.

Location:

plugins/syncml/src

Files:

• syncml-obex-client (modified) (2 diffs)
• syncml_callbacks.c (modified) (3 diffs)
• syncml_common.c (modified) (3 diffs)
• syncml_common.h (modified) (1 diff)
• syncml_ds_client.c (modified) (1 diff)

plugins/syncml/src/syncml-obex-client

@@ -144 +144 @@
 
     <!-- To be filed by UI or hand:
-  <Ressources>
-    <Ressource>
+  <Resources>
+    <Resource>
      <Enabled>1</Enabled>
      <Formats>
@@ -154 +154 @@
      <Name>Contacts</Name>
      <ObjType>contact</ObjType>
-    </Ressource>
-  </Ressources>
+    </Resource>
+  </Resources>
 
     -->

plugins/syncml/src/syncml_callbacks.c

@@ -364 +364 @@
 
         /* store device info */
+        /*
         if (database->env->devinf_path)
         {
@@ -371 +372 @@
                         set_capabilities(database->env, &error);
         }
+        */
 
         /* set callbacks if the DsSession was not ready before */
@@ -626 +628 @@
 {
         osync_trace(TRACE_ENTRY, "%s(%p, %i, %s, %p, %i, %s, %p, %p)", __func__, dsession, type, uid, data, size, contenttype, userdata, error);
-        SmlDatabase *database = (SmlDatabase *)userdata;
-        OSyncError *oerror = NULL;
+        /* SmlDatabase *database = (SmlDatabase *)userdata; */
 
         /* This should be the second OMA DS session of an OMA DS

plugins/syncml/src/syncml_common.c

@@ -238 +238 @@
 }
 
-SmlDatabase *syncml_config_parse_database(SmlPluginEnv *env, OSyncPluginRessource *res, OSyncError **error)
+SmlDatabase *syncml_config_parse_database(SmlPluginEnv *env, OSyncPluginResource *res, OSyncError **error)
 {
         osync_trace(TRACE_ENTRY, "%s(%p, %p, %p)", __func__, env, res, error);
@@ -252 +252 @@
         database->syncContexts = NULL;
 
-        database->url = osync_plugin_ressource_get_name(res);
+        database->url = osync_plugin_resource_get_name(res);
         if (!database->url) {
                 osync_error_set(error, OSYNC_ERROR_GENERIC, "Database name not set");
@@ -258 +258 @@
         }
 
-        database->objtype = osync_plugin_ressource_get_objtype(res);
+        database->objtype = osync_plugin_resource_get_objtype(res);
         if (!database->objtype) {
                 osync_error_set(error, OSYNC_ERROR_GENERIC, "\"objtype\" of a database not set");

plugins/syncml/src/syncml_common.h

@@ -205 +205 @@
 SmlDatabase *syncml_config_parse_database(
                         SmlPluginEnv *env,
-                        OSyncPluginRessource *res,
+                        OSyncPluginResource *res,
                         OSyncError **error);
 

plugins/syncml/src/syncml_ds_client.c

@@ -21 +21 @@
                 functions.batch_commit = ds_client_batch_commit;
 
-                OSyncPluginRessource *res = osync_plugin_config_find_active_ressource(config, objtype);
+                OSyncPluginResource *res = osync_plugin_config_find_active_resource(config, objtype);
                 if (!(database = syncml_config_parse_database(env, res, error)))
                         goto error;