[Opensync-commits] r5850 - plugins/opie-sync/src

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

Author: paule
Date: Fri Sep 25 21:26:37 2009
New Revision: 5850
URL: http://www.opensync.org/changeset/5850

Log:
opie-sync: fixes for XMLFormat schema changes for alarms

Modified:
   plugins/opie-sync/src/opie_format.c

Modified: plugins/opie-sync/src/opie_format.c
==============================================================================
--- plugins/opie-sync/src/opie_format.c	Fri Sep 25 13:04:00 2009	(r5849)
+++ plugins/opie-sync/src/opie_format.c	Fri Sep 25 21:26:37 2009	(r5850)
@@ -1002,8 +1002,6 @@
 		/* Alarm */
 		char *alarmminsstr = xmlGetProp(icur, "alarm");
 		if(alarmminsstr) {
-			out_xmlfield = osync_xmlfield_new(out_xmlformat, "Alarm", error);
-			
 			int alarmsound = 0;
 			char *alarmsoundstr = xmlGetProp(icur, "sound");
 			if(alarmsoundstr) {
@@ -1011,10 +1009,14 @@
 					alarmsound = 1;
 				xmlFree(alarmsoundstr);
 			}
-			if(alarmsound == 1)
+			if(alarmsound == 1) {
+				out_xmlfield = osync_xmlfield_new(out_xmlformat, "AlarmAudio", error);
 				osync_xmlfield_set_key_value(out_xmlfield, "AlarmAction", "AUDIO", error);
-			else
+			}
+			else {
+				out_xmlfield = osync_xmlfield_new(out_xmlformat, "AlarmDisplay", error);
 				osync_xmlfield_set_key_value(out_xmlfield, "AlarmAction", "DISPLAY", error);
+			}
 			
 			int alarmseconds = -(atoi(alarmminsstr) * 60);
 			char *alarmdu = osync_time_sec2alarmdu(alarmseconds);
@@ -1691,8 +1693,6 @@
 		gchar** alarmentries = g_strsplit(alarmstr, ";", 0);
 		int i,j;
 		for(j=0; alarmentries[j] != NULL; j++) {
-			OSyncXMLField *out_xmlfield = osync_xmlfield_new(out_xmlformat, "Alarm", error);
-			
 			// Opie alarm entry format: ddmmyyyyhhmmss:0:<0=silent,1=loud>:[;nextalarmentry]
 			char *alarmdatestr = NULL;
 			int alarmsound = 0;
@@ -1709,12 +1709,17 @@
 					alarmsound = atoi(alarmargs[i]);
 			}
 			g_strfreev(alarmargs);
-			
-			if(alarmsound == 1)
+
+			OSyncXMLField *out_xmlfield;
+			if(alarmsound == 1) {
+				out_xmlfield = osync_xmlfield_new(out_xmlformat, "AlarmAudio", error);
 				osync_xmlfield_set_key_value(out_xmlfield, "AlarmAction", "AUDIO", error);
-			else
+			}
+			else {
+				out_xmlfield = osync_xmlfield_new(out_xmlformat, "AlarmDisplay", error);
 				osync_xmlfield_set_key_value(out_xmlfield, "AlarmAction", "DISPLAY", error);
-			
+			}
+
 			if(alarmdatestr) {
 				struct tm *alarmtm = osync_time_vtime2tm(alarmdatestr, error);
 				time_t alarmtime = mktime(alarmtm);
@@ -1745,7 +1750,7 @@
 	OSyncXMLField *in_xmlfield = osync_xmlformat_get_first_field(in_xmlformat);
 	while(in_xmlfield) {
 		const char *fieldname = osync_xmlfield_get_name(in_xmlfield);
-		if(!strcmp("Alarm", fieldname)) {
+		if(!strcmp("AlarmAudio", fieldname) || !strcmp("AlarmDisplay", fieldname)) {
 			char *alarmdatestr = NULL;
 			const char *trigger = osync_xmlfield_get_key_value(in_xmlfield, "AlarmTrigger");
 			if(trigger) {
@@ -1799,7 +1804,7 @@
 	OSyncXMLField *in_xmlfield = osync_xmlformat_get_first_field(in_xmlformat);
 	while(in_xmlfield) {
 		const char *fieldname = osync_xmlfield_get_name(in_xmlfield);
-		if(!strcmp("Alarm", fieldname)) {
+		if(!strcmp("AlarmAudio", fieldname) || !strcmp("AlarmDisplay", fieldname)) {
 			const char *trigger = osync_xmlfield_get_key_value(in_xmlfield, "AlarmTrigger");
 			if(trigger)
 				alarmseconds = osync_time_alarmdu2sec(trigger);