Fix compiler warnings in the calendar directory (#439122).

svn path=/trunk/; revision=33625

3 files changed, 17 insertions, 17 deletions

diff --git a/calendar/conduits/calendar/calendar-conduit.c b/calendar/conduits/calendar/calendar-conduit.c
index 6763757f94..6308af786e 100644
--- a/calendar/conduits/calendar/calendar-conduit.c
+++ b/calendar/conduits/calendar/calendar-conduit.c
@@ -862,7 +862,7 @@ local_record_to_pilot_record (ECalLocalRecord *local,
 	
 	pi_buffer_free(buffer); 
 #else
-	p.record = record;
+	p.record = (unsigned char *)record;
 	p.length = pack_Appointment (local->appt, p.record, 0xffff);
 #endif
 	return p;	
@@ -927,7 +927,7 @@ local_record_from_comp (ECalLocalRecord *local, ECalComponent *comp, ECalConduit
 #ifdef PILOT_LINK_0_12
 			unpack_Appointment (&appt, record, datebook_v1);
 #else
-			unpack_Appointment (&appt, record, 0xffff);
+			unpack_Appointment (&appt, (unsigned char *)record, 0xffff);
 #endif
 			local->appt->alarm = appt.alarm;
 			local->appt->advance = appt.advance;
@@ -1547,7 +1547,7 @@ pre_sync (GnomePilotConduit *conduit,
 	}
 
 	/* Remove the events that were split up */
-	g_list_concat (ctxt->changed, added);
+	ctxt->changed = g_list_concat (ctxt->changed, added);
 	for (l = removed; l != NULL; l = l->next) {
 		ECalChange *ccc = l->data;
 		const char *uid;
@@ -1714,7 +1714,7 @@ for_each (GnomePilotConduitSyncAbs *conduit,
 
 			*local = g_new0 (ECalLocalRecord, 1);
 			local_record_from_comp (*local, comps->data, ctxt);
-			g_list_prepend (ctxt->locals, *local);
+			ctxt->locals = g_list_prepend (ctxt->locals, *local);
 
 			iterator = comps;
 		} else {
@@ -1729,7 +1729,7 @@ for_each (GnomePilotConduitSyncAbs *conduit,
 
 			*local = g_new0 (ECalLocalRecord, 1);
 			local_record_from_comp (*local, iterator->data, ctxt);
-			g_list_prepend (ctxt->locals, *local);
+			ctxt->locals = g_list_prepend (ctxt->locals, *local);
 		} else {
 			LOG (g_message ( "for_each ending" ));
 
@@ -1768,7 +1768,7 @@ for_each_modified (GnomePilotConduitSyncAbs *conduit,
 		
 			*local = g_new0 (ECalLocalRecord, 1);
 			local_record_from_comp (*local, ccc->comp, ctxt);
-			g_list_prepend (ctxt->locals, *local);
+			ctxt->locals = g_list_prepend (ctxt->locals, *local);
 		} else {
 			LOG (g_message ( "no events" ));
 
@@ -1782,7 +1782,7 @@ for_each_modified (GnomePilotConduitSyncAbs *conduit,
 			
 			*local = g_new0 (ECalLocalRecord, 1);
 			local_record_from_comp (*local, ccc->comp, ctxt);
-			g_list_prepend (ctxt->locals, *local);
+			ctxt->locals = g_list_prepend (ctxt->locals, *local);
 		} else {
 			LOG (g_message ( "for_each_modified ending" ));
 
diff --git a/calendar/conduits/memo/memo-conduit.c b/calendar/conduits/memo/memo-conduit.c
index 49f5170f7f..538e4919a6 100644
--- a/calendar/conduits/memo/memo-conduit.c
+++ b/calendar/conduits/memo/memo-conduit.c
@@ -497,7 +497,7 @@ local_record_to_pilot_record (EMemoLocalRecord *local,
 
 	pi_buffer_free(buffer);
 #else
-	p.record = record;
+	p.record = (unsigned char *)record;
 	p.length = pack_Memo (local->memo, p.record, 0xffff);
 #endif
 	return p;	
@@ -1153,7 +1153,7 @@ for_each (GnomePilotConduitSyncAbs *conduit,
 			LOG(fprintf(stderr, "for_each: calling local_record_from_comp\n"));
 			local_record_from_comp (*local, comps->data, ctxt);
 			LOG(fprintf(stderr, "for_each: calling g_list_prepend\n"));
-			g_list_prepend (ctxt->locals, *local);
+			ctxt->locals = g_list_prepend (ctxt->locals, *local);
 			LOG(fprintf(stderr, "for_each: setting iterator = comps\n"));
 			iterator = comps;
 		} else {
@@ -1171,7 +1171,7 @@ for_each (GnomePilotConduitSyncAbs *conduit,
 			LOG(fprintf(stderr, "for_each: calling local_record_from_comp\n"));
 			local_record_from_comp (*local, iterator->data, ctxt);
 			LOG(fprintf(stderr, "for_each: calling g_list_prepend\n"));
-			g_list_prepend (ctxt->locals, *local);
+			ctxt->locals = g_list_prepend (ctxt->locals, *local);
 		} else {
 			LOG (g_message ( "for_each ending" ));
 
@@ -1212,7 +1212,7 @@ for_each_modified (GnomePilotConduitSyncAbs *conduit,
 			LOG(fprintf(stderr, "for_each_modified: calling local_record_from_comp\n"));
 			local_record_from_comp (*local, ccc->comp, ctxt);
 			LOG(fprintf(stderr, "for_each_modified: calling g_list_prepend\n"));
-			g_list_prepend (ctxt->locals, *local);
+			ctxt->locals = g_list_prepend (ctxt->locals, *local);
 		} else {
 			LOG (g_message ( "no events" ));
 
@@ -1230,7 +1230,7 @@ for_each_modified (GnomePilotConduitSyncAbs *conduit,
 			LOG(fprintf(stderr, "for_each_modified: calling local_record_from_comp\n"));
 			local_record_from_comp (*local, ccc->comp, ctxt);
 			LOG(fprintf(stderr, "for_each_modified: calling g_list_prepend\n"));
-			g_list_prepend (ctxt->locals, *local);
+			ctxt->locals = g_list_prepend (ctxt->locals, *local);
 		} else {
 			LOG (g_message ( "for_each_modified ending" ));
 
diff --git a/calendar/conduits/todo/todo-conduit.c b/calendar/conduits/todo/todo-conduit.c
index e63871a02d..e0630a75b2 100644
--- a/calendar/conduits/todo/todo-conduit.c
+++ b/calendar/conduits/todo/todo-conduit.c
@@ -639,7 +639,7 @@ local_record_to_pilot_record (EToDoLocalRecord *local,
 
 	pi_buffer_free(buffer); 
 #else
-	p.record = record;
+	p.record = (unsigned char *)record;
 	p.length = pack_ToDo (local->todo, p.record, 0xffff);
 #endif
 	return p;	
@@ -1315,7 +1315,7 @@ for_each (GnomePilotConduitSyncAbs *conduit,
 
 			*local = g_new0 (EToDoLocalRecord, 1);
 			local_record_from_comp (*local, comps->data, ctxt);
-			g_list_prepend (ctxt->locals, *local);
+			ctxt->locals = g_list_prepend (ctxt->locals, *local);
 			
 			iterator = comps;
 		} else {
@@ -1330,7 +1330,7 @@ for_each (GnomePilotConduitSyncAbs *conduit,
 
 			*local = g_new0 (EToDoLocalRecord, 1);
 			local_record_from_comp (*local, iterator->data, ctxt);
-			g_list_prepend (ctxt->locals, *local);
+			ctxt->locals = g_list_prepend (ctxt->locals, *local);
 		} else {
 			LOG (g_message ( "for_each ending" ));
 
@@ -1369,7 +1369,7 @@ for_each_modified (GnomePilotConduitSyncAbs *conduit,
 		
 			*local = g_new0 (EToDoLocalRecord, 1);
 			local_record_from_comp (*local, ccc->comp, ctxt);
-			g_list_prepend (ctxt->locals, *local);
+			ctxt->locals = g_list_prepend (ctxt->locals, *local);
 		} else {
 			LOG (g_message ( "no events" ));
 
@@ -1383,7 +1383,7 @@ for_each_modified (GnomePilotConduitSyncAbs *conduit,
 			
 			*local = g_new0 (EToDoLocalRecord, 1);
 			local_record_from_comp (*local, ccc->comp, ctxt);			
-			g_list_prepend (ctxt->locals, *local);
+			ctxt->locals = g_list_prepend (ctxt->locals, *local);
 		} else {
 			LOG (g_message ( "for_each_modified ending" ));