Changeset 146

Timestamp:

04/23/06 16:48:43 (3 years ago)

Author:

abauer

Message:

Removed the addUTC option

Files:

• branches/6620-branch (modified) (1 prop)
• branches/6620-branch/libsyncml/parser/sml_xml_assm.c (modified) (1 diff)
• branches/6620-branch/tools/syncml-http-server.c (modified) (4 diffs)
• branches/6620-branch/tools/syncml-obex-client.c (modified) (4 diffs)

branches/6620-branch/libsyncml/parser/sml_xml_assm.c

@@ -1930 +1930 @@
-        }
-        
-
-
-
-
+
+
-                if (!_smlXmlAssemblerAddString(assm, SML_ELEMENT_UTC, "", error))
-                        goto error_free_writer;
-        }
-        
-
-
+ (>= 1.1)
+ && version != SML_DEVINF_VERSION_10
-                if (!_smlXmlAssemblerAddString(assm, SML_ELEMENT_SUPPORTLARGEOBJS, "", error))
-                        goto error_free_writer;
-        }
-        
-
-
+ (>= 1.1)
+ && version != SML_DEVINF_VERSION_10
-                if (!_smlXmlAssemblerAddString(assm, SML_ELEMENT_SUPPORTNUMBEROFCHANGES, "", error))
-                        goto error_free_writer;

branches/6620-branch/tools/syncml-http-server.c

@@ -63 +63 @@
-        fprintf (stderr, "[--allowLateStatus]\t\t\tAllows that a phone can send commands before statuses (Needed for some phones)\n\n");
-        fprintf (stderr, "[--maxObjSize <limit>]\t\t\tThe maximum size of a object that we can receive (Needed for some phones)\n\n");
-        fprintf (stderr, "[--addUTC]\t\t\tAdd the UTC tag to the device information (Needed for some phones)\n\n");
-        fprintf (stderr, "[--noPendingReplies]\t\t\tRequire that no pending replies are allowed (Needed for some phones)\n");
-        fprintf (stderr, "Example: %s --port 9999 --sync vcal /events --sync vcard /addressbook --multi --san\n", name);
@@ -339 +338 @@
-        
-        SmlError *error = NULL;
-        SmlBool addUTC = TRUE;
-        
-        if (!g_thread_supported ()) g_thread_init (NULL);
@@ -373 +371 @@
-                } else if (!strcmp (arg, "--allowLateStatus")) {
-                        lateStatus = TRUE;
-                } else if (!strcmp (arg, "--addUTC")) {
-                        addUTC = TRUE;
-                } else if (!strcmp (arg, "--noPendingReplies")) {
-                        noPending = TRUE;
@@ -413 +409 @@
-        if (!devinf)
-                goto error_free_manager;
-        
-        smlDevInfSetSupportsUTC(devinf, addUTC);
-                        
-        agent = smlDevInfAgentNew(devinf, &error);

branches/6620-branch/tools/syncml-obex-client.c

@@ -72 +72 @@
-        fprintf (stderr, "[--recvLimit <limit>]\t\t\tLimit the size of the receiving buffer to this size (Needed for some phones)\n\n");
-        fprintf (stderr, "[--maxObjSize <limit>]\t\t\tThe maximum size of a object that we can receive (Needed for some phones)\n\n");
-        fprintf (stderr, "[--addUTC]\t\t\tAdd the UTC tag to the device information (Needed for some phones)\n\n");
-        fprintf (stderr, "[--allowLateStatus]\t\t\tAllows that a phone can send commands before statuses (Needed for some phones)\n\n");
-        fprintf (stderr, "[--noPendingReplies]\t\t\tRequire that no pending replies are allowed (Needed for some phones)\n");
@@ -400 +399 @@
-        
-        SmlMimeType type = SML_MIMETYPE_XML;
-        SmlBool addUTC = FALSE;
-        
-        SmlError *error = NULL;
@@ -473 +471 @@
-                } else if (!strcmp (arg, "--noPendingReplies")) {
-                        noPending = TRUE;
-                } else if (!strcmp (arg, "--addUTC")) {
-                        addUTC = TRUE;
-                } else if (!strcmp (arg, "--version")) {
-                        i++;
@@ -526 +522 @@
-        if (!devinf)
-                goto error_free_manager;
-        
-        smlDevInfSetSupportsUTC(devinf, addUTC);
-        
-        agent = smlDevInfAgentNew(devinf, &error);