patch for syncml plugin on revision 3302

View: New views
2 Messages — Rating Filter:   Alert me  

patch for syncml plugin on revision 3302

by fchiechi :: Rate this Message:

Reply to Author | View Threaded | Show Only this Message

Hi,

I successfully synchronized my nokia n80 contacts after compiling revision
3302 on ubuntu hardy

I only had to change osync_db_exists to osync_db_table_exists in
syncml/src/syncml_devinf.c

here is the patch

It is the first time I submit a patch here, please tell me if this is the
correct way to submit

regards

Francesco

--- syncml-orig/src/syncml_devinf.c     2008-04-29 23:35:26.000000000 +0200
+++ syncml/src/syncml_devinf.c  2008-04-29 23:32:12.000000000 +0200
@@ -511,25 +511,25 @@

     /* check if all necessary tables exist */
     osync_trace(TRACE_INTERNAL, "%s - Does all tables exist?", __func__);
-    if (osync_db_exists(db, "versions", oerror) < 1)
+    if (osync_db_table_exists(db, "versions", oerror) < 1)
        schema_update = TRUE;
-    if (osync_db_exists(db, "devices", oerror) < 1)
+    if (osync_db_table_exists(db, "devices", oerror) < 1)
        schema_update = TRUE;
-    if (osync_db_exists(db, "datastores", oerror) < 1)
+    if (osync_db_table_exists(db, "datastores", oerror) < 1)
        schema_update = TRUE;
-    if (osync_db_exists(db, "datastore_rx", oerror) < 1)
+    if (osync_db_table_exists(db, "datastore_rx", oerror) < 1)
        schema_update = TRUE;
-    if (osync_db_exists(db, "datastore_tx", oerror) < 1)
+    if (osync_db_table_exists(db, "datastore_tx", oerror) < 1)
        schema_update = TRUE;
-    if (osync_db_exists(db, "content_type_capabilities", oerror) < 1)
+    if (osync_db_table_exists(db, "content_type_capabilities", oerror) < 1)
        schema_update = TRUE;
-    if (osync_db_exists(db, "properties", oerror) < 1)
+    if (osync_db_table_exists(db, "properties", oerror) < 1)
        schema_update = TRUE;
-    if (osync_db_exists(db, "property_values", oerror) < 1)
+    if (osync_db_table_exists(db, "property_values", oerror) < 1)
        schema_update = TRUE;
-    if (osync_db_exists(db, "property_params", oerror) < 1)
+    if (osync_db_table_exists(db, "property_params", oerror) < 1)
        schema_update = TRUE;
-    if (osync_db_exists(db, "property_param_values", oerror) < 1)
+    if (osync_db_table_exists(db, "property_param_values", oerror) < 1)
        schema_update = TRUE;

     /* check the version of the database schema */
@@ -576,34 +576,34 @@
         osync_trace(TRACE_INTERNAL, "%s - Updating to schema %d ...",
__func__, db_schema_version);

         /* drop all existing tables */
-        if (osync_db_exists(db, "versions", oerror) > 0 &&
+        if (osync_db_table_exists(db, "versions", oerror) > 0 &&
             !osync_db_query(db, "DROP TABLE versions", oerror))
             goto error;
-        if (osync_db_exists(db, "devices", oerror) > 0 &&
+        if (osync_db_table_exists(db, "devices", oerror) > 0 &&
             !osync_db_query(db, "DROP TABLE devices", oerror))
             goto error;
-        if (osync_db_exists(db, "datastores", oerror) > 0 &&
+        if (osync_db_table_exists(db, "datastores", oerror) > 0 &&
             !osync_db_query(db, "DROP TABLE datastores", oerror))
             goto error;
-        if (osync_db_exists(db, "datastore_rx", oerror) > 0 &&
+        if (osync_db_table_exists(db, "datastore_rx", oerror) > 0 &&
             !osync_db_query(db, "DROP TABLE datastore_rx", oerror))
             goto error;
-        if (osync_db_exists(db, "datastore_tx", oerror) > 0 &&
+        if (osync_db_table_exists(db, "datastore_tx", oerror) > 0 &&
             !osync_db_query(db, "DROP TABLE datastore_tx", oerror))
             goto error;
-        if (osync_db_exists(db, "content_type_capabilities", oerror) > 0 &&
+        if (osync_db_table_exists(db, "content_type_capabilities", oerror) >
0 &&
             !osync_db_query(db, "DROP TABLE content_type_capabilities",
oerror))
             goto error;
-        if (osync_db_exists(db, "properties", oerror) > 0 &&
+        if (osync_db_table_exists(db, "properties", oerror) > 0 &&
             !osync_db_query(db, "DROP TABLE properties", oerror))
             goto error;
-        if (osync_db_exists(db, "property_values", oerror) > 0 &&
+        if (osync_db_table_exists(db, "property_values", oerror) > 0 &&
             !osync_db_query(db, "DROP TABLE property_values", oerror))
             goto error;
-        if (osync_db_exists(db, "property_params", oerror) > 0 &&
+        if (osync_db_table_exists(db, "property_params", oerror) > 0 &&
             !osync_db_query(db, "DROP TABLE property_params", oerror))
             goto error;
-        if (osync_db_exists(db, "property_param_values", oerror) > 0 &&
+        if (osync_db_table_exists(db, "property_param_values", oerror) > 0 &&
             !osync_db_query(db, "DROP TABLE property_param_values", oerror))
             goto error;
         osync_trace(TRACE_INTERNAL, "%s - All tables dropped.", __func__);

-------------------------------------------------------------------------
This SF.net email is sponsored by the 2008 JavaOne(SM) Conference
Don't miss this year's exciting event. There's still time to save $100.
Use priority code J8TL2D2.
http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone
_______________________________________________
Opensync-devel mailing list
Opensync-devel@...
https://lists.sourceforge.net/lists/listinfo/opensync-devel

Re: patch for syncml plugin on revision 3302

by Daniel Gollub :: Rate this Message:

Reply to Author | View Threaded | Show Only this Message

On Wednesday 30 April 2008 08:39:22 Francesco Chiechi wrote:
> I successfully synchronized my nokia n80 contacts after compiling revision
> 3302 on ubuntu hardy
>
> I only had to change osync_db_exists to osync_db_table_exists in
> syncml/src/syncml_devinf.c
>
> here is the patch

Thanks! Going to commit this ASAP.

> It is the first time I submit a patch here, please tell me if this is the
> correct way to submit

Yeah, just send all kinds of patches to opensync-devel. Don't hesitate to
attach the patch, at least i feel also comfortable with attachted patch.

PS: Your intext patch got word-wrapped, this used to happen also to me when
inserting files in KMail. Make sure you disabled Wordwrap when inserting
patches as text:
Options -> Wordwrap

I wonder if this is worth to look into KMail code ;) Anyway, attachted patches
are fine as well..

Thanks,
Daniel



-------------------------------------------------------------------------
This SF.net email is sponsored by the 2008 JavaOne(SM) Conference
Don't miss this year's exciting event. There's still time to save $100.
Use priority code J8TL2D2.
http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone
_______________________________________________
Opensync-devel mailing list
Opensync-devel@...
https://lists.sourceforge.net/lists/listinfo/opensync-devel