[Opensync-commits] r116 - in trunk/gui: evolution2_sync file-sync

[<svn...@op...>]

Author: drzeus
Date: 2005-04-06 22:43:44 +0200 (Wed, 06 Apr 2005)
New Revision: 116

Modified:
   trunk/gui/evolution2_sync/evolution2_sync.c
   trunk/gui/file-sync/file_sync.c
Log:
gcc4 fixes

Modified: trunk/gui/evolution2_sync/evolution2_sync.c
===================================================================
--- trunk/gui/evolution2_sync/evolution2_sync.c	2005-03-31 15:51:35 UTC (rev 115)
+++ trunk/gui/evolution2_sync/evolution2_sync.c	2005-04-06 20:43:44 UTC (rev 116)
@@ -135,12 +135,12 @@
 {
 	xmlDocPtr doc;
 	
-	doc = xmlNewDoc("1.0");
-	doc->children = xmlNewDocNode(doc, NULL, "config", NULL);
+	doc = xmlNewDoc((xmlChar*)"1.0");
+	doc->children = xmlNewDocNode(doc, NULL, (xmlChar*)"config", NULL);
 	
-	xmlNewChild(doc->children, NULL, "adress_path", options->addressbook_path);
-	xmlNewChild(doc->children, NULL, "calendar_path", options->calendar_path);
-	xmlNewChild(doc->children, NULL, "tasks_path", options->tasks_path);
+	xmlNewChild(doc->children, NULL, (xmlChar*)"adress_path", (xmlChar*)options->addressbook_path);
+	xmlNewChild(doc->children, NULL, (xmlChar*)"calendar_path", (xmlChar*)options->calendar_path);
+	xmlNewChild(doc->children, NULL, (xmlChar*)"tasks_path", (xmlChar*)options->tasks_path);
 	
 	xmlDocDumpMemory(doc, (xmlChar **)data, size);
 	*size++;
@@ -176,7 +176,7 @@
 		return FALSE;
 	}
 
-	if (xmlStrcmp(cur->name, "config")) {
+	if (xmlStrcmp(cur->name, (xmlChar*)"config")) {
 		printf("EVO2-SYNC data seems not to be a valid configdata.\n");
 		xmlFreeDoc(doc);
 		return FALSE;
@@ -185,7 +185,7 @@
 	cur = cur->xmlChildrenNode;
 
 	while (cur != NULL) {
-		char *str = xmlNodeGetContent(cur);
+		char *str = (char*)xmlNodeGetContent(cur);
 		if (str) {
 			if (!xmlStrcmp(cur->name, (const xmlChar *)"adress_path")) {
 				options->addressbook_path = g_strdup(str);

Modified: trunk/gui/file-sync/file_sync.c
===================================================================
--- trunk/gui/file-sync/file_sync.c	2005-03-31 15:51:35 UTC (rev 115)
+++ trunk/gui/file-sync/file_sync.c	2005-04-06 20:43:44 UTC (rev 116)
@@ -42,7 +42,7 @@
 		return FALSE;
 	}
 
-	if (xmlStrcmp(cur->name, "config")) {
+	if (xmlStrcmp(cur->name, (xmlChar*)"config")) {
 		xmlFreeDoc(doc);
 		osync_error_set(error, OSYNC_ERROR_GENERIC, "Config valid is not valid");
 		osync_trace(TRACE_EXIT_ERROR, "%s: %s", __func__, osync_error_print(error));
@@ -52,7 +52,7 @@
 	cur = cur->xmlChildrenNode;
 
 	while (cur != NULL) {
-		char *str = xmlNodeGetContent(cur);
+		char *str = (char*)xmlNodeGetContent(cur);
 		if (str) {
 			if (!xmlStrcmp(cur->name, (const xmlChar *)"path")) {
 				env->path = g_strdup(str);
@@ -119,11 +119,11 @@
 {
 	xmlDocPtr doc;
 	
-	doc = xmlNewDoc("1.0");
-	doc->children = xmlNewDocNode(doc, NULL, "config", NULL);
+	doc = xmlNewDoc((xmlChar*)"1.0");
+	doc->children = xmlNewDocNode(doc, NULL, (xmlChar*)"config", NULL);
 	
-	xmlNewChild(doc->children, NULL, "path", options->path);
-	xmlNewChild(doc->children, NULL, "recursive", options->recursive ? "TRUE" : "FALSE");
+	xmlNewChild(doc->children, NULL, (xmlChar*)"path", (xmlChar*)options->path);
+	xmlNewChild(doc->children, NULL, (xmlChar*)"recursive", (xmlChar*)(options->recursive ? "TRUE" : "FALSE"));
 	
 	xmlDocDumpMemory(doc, (xmlChar **)data, size);
 	*size++;