[Opensync-commits] r1196 - trunk/tests

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

Author: bellmich
Date: Mon Jul 13 15:06:24 2009
New Revision: 1196
URL: http://libsyncml.opensync.org/changeset/1196

Log:
fixed wrong error handling in sync tests

Modified:
   trunk/tests/check_sync.c

Modified: trunk/tests/check_sync.c
==============================================================================
--- trunk/tests/check_sync.c	Mon Jul 13 15:04:42 2009	(r1195)
+++ trunk/tests/check_sync.c	Mon Jul 13 15:06:24 2009	(r1196)
@@ -114,7 +114,7 @@
 			g_atomic_int_inc(&num_disconnects);
 			break;
 		case SML_MANAGER_TRANSPORT_ERROR:
-			smlTrace(TRACE_INTERNAL, "%s - error: %s", __func__, error->message);
+			smlTrace(TRACE_INTERNAL, "%s - error: %s", __func__, GET_ERROR_MESSAGE(error));
 			eventError = g_error_copy(error);
 			transport_errors++;
 			break;
@@ -132,7 +132,7 @@
 			break;
 		case SML_MANAGER_SESSION_ERROR:
 		case SML_MANAGER_SESSION_WARNING:
-			smlTrace(TRACE_INTERNAL, "%s - error: %s", __func__, error->message);
+			smlTrace(TRACE_INTERNAL, "%s - error: %s", __func__, GET_ERROR_MESSAGE(error));
 			if (eventError)
 				SML_ERROR_FREE(eventError);
 			eventError = g_error_copy(error);
@@ -340,9 +340,9 @@
 	smlManagerSetLocalMaxMsgSize(servertracker->manager, TEST_DEFAULT_MAX_MSG_SIZE);
 	smlManagerSetLocalMaxObjSize(servertracker->manager, TEST_DEFAULT_MAX_OBJ_SIZE);
 	
-	sml_fail_unless(error == NULL, "%s", error->message);
-	sml_fail_unless(smlTransportInitialize(client, &error), "%s", error->message);
-	sml_fail_unless(smlTransportInitialize(server, &error), "%s", error->message);
+	sml_fail_unless(error == NULL, "%s", GET_ERROR_MESSAGE(error));
+	sml_fail_unless(smlTransportInitialize(client, &error), "%s", GET_ERROR_MESSAGE(error));
+	sml_fail_unless(smlTransportInitialize(server, &error), "%s", GET_ERROR_MESSAGE(error));
 
 	sml_fail_unless(smlManagerStart(clientmanager, &error), NULL);
 	sml_fail_unless(error == NULL, NULL);
@@ -415,7 +415,7 @@
 		smlManagerDispatch(servermanager);
 		smlManagerDispatch(clientmanager);
 		usleep(100);
-		sml_fail_unless(eventError == NULL, "%s", eventError->message);
+		sml_fail_unless(eventError == NULL, "%s",  GET_ERROR_MESSAGE(eventError));
 	}
 	
 	smlDsSessionGetAlert(servertracker->dssessions[0], _recv_alert, GINT_TO_POINTER(1));
@@ -433,7 +433,7 @@
 		smlManagerDispatch(servermanager);
 		smlManagerDispatch(clientmanager);
 		usleep(100);
-		sml_fail_unless(eventError == NULL, "%s", eventError->message);
+		sml_fail_unless(eventError == NULL, "%s",  GET_ERROR_MESSAGE(eventError));
 	}
 	
 	sml_fail_unless(init_alerts_received == 3, NULL);
@@ -488,7 +488,7 @@
 	smlAuthFree(auth2);
 	
 	sml_fail_unless(smlTransportFinalize(server, &error), NULL);
-	sml_fail_unless(smlTransportFinalize(client, &error), "%s", error->message);
+	sml_fail_unless(smlTransportFinalize(client, &error), "%s", GET_ERROR_MESSAGE(error));
 	
 	smlTransportFree(server);
 	smlTransportFree(client);
@@ -526,9 +526,9 @@
 	smlManagerSetLocalMaxMsgSize(servertracker->manager, TEST_DEFAULT_MAX_MSG_SIZE);
 	smlManagerSetLocalMaxObjSize(servertracker->manager, TEST_DEFAULT_MAX_OBJ_SIZE);
 	
-	sml_fail_unless(error == NULL, "%s", error->message);
-	sml_fail_unless(smlTransportInitialize(client, &error), "%s", error->message);
-	sml_fail_unless(smlTransportInitialize(server, &error), "%s", error->message);
+	sml_fail_unless(error == NULL, "%s", GET_ERROR_MESSAGE(error));
+	sml_fail_unless(smlTransportInitialize(client, &error), "%s", GET_ERROR_MESSAGE(error));
+	sml_fail_unless(smlTransportInitialize(server, &error), "%s", GET_ERROR_MESSAGE(error));
 
 	sml_fail_unless(smlManagerStart(clientmanager, &error), NULL);
 	sml_fail_unless(error == NULL, NULL);
@@ -600,7 +600,7 @@
 		smlManagerDispatch(servermanager);
 		smlManagerDispatch(clientmanager);
 		usleep(100);
-		sml_fail_unless(eventError == NULL, "%s", eventError->message);
+		sml_fail_unless(eventError == NULL, "%s",  GET_ERROR_MESSAGE(eventError));
 	}
 	
 	smlDsSessionGetAlert(servertracker->dssessions[0], _recv_alert, GINT_TO_POINTER(1));
@@ -630,7 +630,7 @@
 		smlManagerDispatch(servermanager);
 		smlManagerDispatch(clientmanager);
 		usleep(100);
-		sml_fail_unless(eventError == NULL, "%s", eventError->message);
+		sml_fail_unless(eventError == NULL, "%s",  GET_ERROR_MESSAGE(eventError));
 	}
 
 	const char *content_types[] = {SML_ELEMENT_TEXT_VCARD, SML_ELEMENT_TEXT_VCAL, SML_ELEMENT_TEXT_PLAIN};
@@ -673,7 +673,7 @@
 		smlManagerDispatch(servermanager);
 		smlManagerDispatch(clientmanager);
 		usleep(100);
-		sml_fail_unless(eventError == NULL, "%s", eventError->message);
+		sml_fail_unless(eventError == NULL, "%s",  GET_ERROR_MESSAGE(eventError));
 	}
 	
 	sml_fail_unless(servertracker->session != NULL, NULL);
@@ -687,7 +687,7 @@
 		smlManagerDispatch(servermanager);
 		smlManagerDispatch(clientmanager);
 		usleep(100);
-		sml_fail_unless(eventError == NULL, "%s", eventError->message);
+		sml_fail_unless(eventError == NULL, "%s",  GET_ERROR_MESSAGE(eventError));
 	}
 	
 	sml_fail_unless(init_alerts_received == 3, NULL);
@@ -742,7 +742,7 @@
 	smlManagerFree(servermanager);
 	
 	sml_fail_unless(smlTransportFinalize(server, &error), NULL);
-	sml_fail_unless(smlTransportFinalize(client, &error), "%s", error->message);
+	sml_fail_unless(smlTransportFinalize(client, &error), "%s", GET_ERROR_MESSAGE(error));
 	
 	smlTransportFree(server);
 	smlTransportFree(client);
@@ -782,9 +782,9 @@
 	smlManagerSetLocalMaxMsgSize(servertracker->manager, TEST_DEFAULT_MAX_MSG_SIZE);
 	smlManagerSetLocalMaxObjSize(servertracker->manager, TEST_DEFAULT_MAX_OBJ_SIZE);
 	
-	sml_fail_unless(error == NULL, "%s", error->message);
-	sml_fail_unless(smlTransportInitialize(client, &error), "%s", error->message);
-	sml_fail_unless(smlTransportInitialize(server, &error), "%s", error->message);
+	sml_fail_unless(error == NULL, "%s", GET_ERROR_MESSAGE(error));
+	sml_fail_unless(smlTransportInitialize(client, &error), "%s", GET_ERROR_MESSAGE(error));
+	sml_fail_unless(smlTransportInitialize(server, &error), "%s", GET_ERROR_MESSAGE(error));
 
 	sml_fail_unless(smlManagerStart(clientmanager, &error), NULL);
 	sml_fail_unless(error == NULL, NULL);
@@ -856,7 +856,7 @@
 		smlManagerDispatch(servermanager);
 		smlManagerDispatch(clientmanager);
 		usleep(100);
-		sml_fail_unless(eventError == NULL, "%s", eventError->message);
+		sml_fail_unless(eventError == NULL, "%s",  GET_ERROR_MESSAGE(eventError));
 	}
 	
 	smlDsSessionGetAlert(servertracker->dssessions[0], _recv_alert, GINT_TO_POINTER(1));
@@ -886,7 +886,7 @@
 		smlManagerDispatch(servermanager);
 		smlManagerDispatch(clientmanager);
 		usleep(100);
-		sml_fail_unless(eventError == NULL, "%s", eventError->message);
+		sml_fail_unless(eventError == NULL, "%s",  GET_ERROR_MESSAGE(eventError));
 	}
 	
 	const char *content_types[] = {SML_ELEMENT_TEXT_VCARD, SML_ELEMENT_TEXT_VCAL, SML_ELEMENT_TEXT_PLAIN};
@@ -929,7 +929,7 @@
 		smlManagerDispatch(servermanager);
 		smlManagerDispatch(clientmanager);
 		usleep(100);
-		sml_fail_unless(eventError == NULL, "%s", eventError->message);
+		sml_fail_unless(eventError == NULL, "%s",  GET_ERROR_MESSAGE(eventError));
 	}
 	
 	for (k = 0; k < 3; k++)
@@ -970,7 +970,7 @@
 		smlManagerDispatch(servermanager);
 		smlManagerDispatch(clientmanager);
 		usleep(100);
-		sml_fail_unless(eventError == NULL, "%s", eventError->message);
+		sml_fail_unless(eventError == NULL, "%s",  GET_ERROR_MESSAGE(eventError));
 	}
 
 	unsigned int i = 0;	
@@ -998,7 +998,7 @@
 		smlManagerDispatch(servermanager);
 		smlManagerDispatch(clientmanager);
 		usleep(100);
-		sml_fail_unless(eventError == NULL, "%s", eventError->message);
+		sml_fail_unless(eventError == NULL, "%s",  GET_ERROR_MESSAGE(eventError));
 	}
 	
 	sml_fail_unless(servertracker->session != NULL, NULL);
@@ -1012,7 +1012,7 @@
 		smlManagerDispatch(servermanager);
 		smlManagerDispatch(clientmanager);
 		usleep(100);
-		sml_fail_unless(eventError == NULL, "%s", eventError->message);
+		sml_fail_unless(eventError == NULL, "%s",  GET_ERROR_MESSAGE(eventError));
 	}
 	
 	sml_fail_unless(init_alerts_received == 3, NULL);
@@ -1067,7 +1067,7 @@
 	smlManagerFree(servermanager);
 	
 	sml_fail_unless(smlTransportFinalize(server, &error), NULL);
-	sml_fail_unless(smlTransportFinalize(client, &error), "%s", error->message);
+	sml_fail_unless(smlTransportFinalize(client, &error), "%s", GET_ERROR_MESSAGE(error));
 	
 	smlTransportFree(server);
 	smlTransportFree(client);
@@ -1105,9 +1105,9 @@
 	smlManagerSetLocalMaxMsgSize(servertracker->manager, TEST_DEFAULT_MAX_MSG_SIZE);
 	smlManagerSetLocalMaxObjSize(servertracker->manager, TEST_DEFAULT_MAX_OBJ_SIZE);
 	
-	sml_fail_unless(error == NULL, "%s", error->message);
-	sml_fail_unless(smlTransportInitialize(client, &error), "%s", error->message);
-	sml_fail_unless(smlTransportInitialize(server, &error), "%s", error->message);
+	sml_fail_unless(error == NULL, "%s", GET_ERROR_MESSAGE(error));
+	sml_fail_unless(smlTransportInitialize(client, &error), "%s", GET_ERROR_MESSAGE(error));
+	sml_fail_unless(smlTransportInitialize(server, &error), "%s", GET_ERROR_MESSAGE(error));
 
 	sml_fail_unless(smlManagerStart(clientmanager, &error), NULL);
 	sml_fail_unless(error == NULL, NULL);
@@ -1261,7 +1261,7 @@
 		smlManagerDispatch(servermanager);
 		smlManagerDispatch(clientmanager);
 		usleep(100);
-		sml_fail_unless(eventError == NULL, "%s", eventError->message);
+		sml_fail_unless(eventError == NULL, "%s",  GET_ERROR_MESSAGE(eventError));
 	}
 	
 	sml_fail_unless(smlSessionGetRemoteMaxMsgSize(servertracker->session) == TEST_DEFAULT_MAX_MSG_SIZE, NULL);
@@ -1278,7 +1278,7 @@
 		smlDsSessionDispatch(servertracker->dssessions[1]);
 		smlDsSessionDispatch(servertracker->dssessions[2]);
 		usleep(100);
-		sml_fail_unless(eventError == NULL, "%s", eventError->message);
+		sml_fail_unless(eventError == NULL, "%s",  GET_ERROR_MESSAGE(eventError));
 	}
 	
 	SmlDevInf *recvClientDevInf = smlDevInfAgentGetSessionDevInf(serveragent, servertracker->session);
@@ -1288,8 +1288,8 @@
 	sml_fail_unless(sml_dev_inf_get_support_large_objs(recvClientDevInf) == FALSE, NULL);
 	sml_fail_unless(sml_dev_inf_get_support_utc(recvClientDevInf) == FALSE, NULL);
 	
-	sml_fail_unless(smlDevInfAgentSendDevInf(serveragent, servertracker->session, &error), "%s", error->message);
-	sml_fail_unless(error == NULL, "%s", error->message);
+	sml_fail_unless(smlDevInfAgentSendDevInf(serveragent, servertracker->session, &error), "%s", GET_ERROR_MESSAGE(error));
+	sml_fail_unless(error == NULL, "%s", GET_ERROR_MESSAGE(error));
 	
 	smlDsSessionSendAlert(servertracker->dssessions[0], SML_ALERT_TWO_WAY, "last", "next", _alert_reply, GINT_TO_POINTER(1), &error);
 	smlDsSessionSendAlert(servertracker->dssessions[1], SML_ALERT_TWO_WAY, "last", "next", _alert_reply, GINT_TO_POINTER(1), &error);
@@ -1314,7 +1314,7 @@
 		smlManagerDispatch(servermanager);
 		smlManagerDispatch(clientmanager);
 		usleep(100);
-		sml_fail_unless(eventError == NULL, "%s", eventError->message);
+		sml_fail_unless(eventError == NULL, "%s",  GET_ERROR_MESSAGE(eventError));
 	}
 	
 	sml_fail_unless(smlSessionGetRemoteMaxMsgSize(clienttracker->session) == TEST_DEFAULT_MAX_MSG_SIZE, NULL);
@@ -1367,7 +1367,7 @@
 		smlManagerDispatch(servermanager);
 		smlManagerDispatch(clientmanager);
 		usleep(100);
-		sml_fail_unless(eventError == NULL, "%s", eventError->message);
+		sml_fail_unless(eventError == NULL, "%s",  GET_ERROR_MESSAGE(eventError));
 	}
 	
 	for (k = 0; k < 3; k++)
@@ -1408,7 +1408,7 @@
 		smlManagerDispatch(servermanager);
 		smlManagerDispatch(clientmanager);
 		usleep(100);
-		sml_fail_unless(eventError == NULL, "%s", eventError->message);
+		sml_fail_unless(eventError == NULL, "%s",  GET_ERROR_MESSAGE(eventError));
 	}
 
 	unsigned int i = 0;	
@@ -1436,7 +1436,7 @@
 		smlManagerDispatch(servermanager);
 		smlManagerDispatch(clientmanager);
 		usleep(100);
-		sml_fail_unless(eventError == NULL, "%s", eventError->message);
+		sml_fail_unless(eventError == NULL, "%s",  GET_ERROR_MESSAGE(eventError));
 	}
 	
 	
@@ -1457,7 +1457,7 @@
 		smlManagerDispatch(servermanager);
 		smlManagerDispatch(clientmanager);
 		usleep(100);
-		sml_fail_unless(eventError == NULL, "%s", eventError->message);
+		sml_fail_unless(eventError == NULL, "%s",  GET_ERROR_MESSAGE(eventError));
 	}
 	
 	sml_fail_unless(init_alerts_received == 3, NULL);
@@ -1513,7 +1513,7 @@
 	smlManagerFree(servermanager);
 	
 	sml_fail_unless(smlTransportFinalize(server, &error), NULL);
-	sml_fail_unless(smlTransportFinalize(client, &error), "%s", error->message);
+	sml_fail_unless(smlTransportFinalize(client, &error), "%s", GET_ERROR_MESSAGE(error));
 	
 	smlTransportFree(server);
 	smlTransportFree(client);
@@ -1538,13 +1538,13 @@
 	/* The OMA DS client is an OBEX server. */
 	SmlTransport *client = smlTransportNew(SML_TRANSPORT_OBEX_SERVER, &error);
 	sml_fail_unless(smlTransportSetConnectionType(client, SML_TRANSPORT_CONNECTION_TYPE_NET, &error), NULL);
-	sml_fail_unless(smlTransportSetConfigOption(client, "PORT", "12010", &error), "%s", error->message);
+	sml_fail_unless(smlTransportSetConfigOption(client, "PORT", "12010", &error), "%s", GET_ERROR_MESSAGE(error));
 
 	/* The OMA DS server is an OBEX client. */
 	SmlTransport *server = smlTransportNew(SML_TRANSPORT_OBEX_CLIENT, &error);
-	sml_fail_unless(smlTransportSetConnectionType(server, SML_TRANSPORT_CONNECTION_TYPE_NET, &error), "%s", error->message);
-	sml_fail_unless(smlTransportSetConfigOption(server, "PORT", "12010", &error), "%s", error->message);
-	sml_fail_unless(smlTransportSetConfigOption(server, "URL", "127.0.0.1", &error), "%s", error->message);
+	sml_fail_unless(smlTransportSetConnectionType(server, SML_TRANSPORT_CONNECTION_TYPE_NET, &error), "%s", GET_ERROR_MESSAGE(error));
+	sml_fail_unless(smlTransportSetConfigOption(server, "PORT", "12010", &error), "%s", GET_ERROR_MESSAGE(error));
+	sml_fail_unless(smlTransportSetConfigOption(server, "URL", "127.0.0.1", &error), "%s", GET_ERROR_MESSAGE(error));
 	
 	managerTracker *clienttracker = g_malloc0(sizeof(managerTracker));
 	SmlManager *clientmanager = clienttracker->manager = smlManagerNew(client, &error);
@@ -1560,8 +1560,8 @@
 	sml_fail_unless(smlManagerStart(servermanager, &error), NULL);
 	sml_fail_unless(error == NULL, NULL);
 
-	sml_fail_unless(smlTransportInitialize(client, &error), "%s", error->message);
-	sml_fail_unless(smlTransportInitialize(server, &error), "%s", error->message);
+	sml_fail_unless(smlTransportInitialize(client, &error), "%s", GET_ERROR_MESSAGE(error));
+	sml_fail_unless(smlTransportInitialize(server, &error), "%s", GET_ERROR_MESSAGE(error));
 
 	SmlLocation *loc = sml_location_new_with_options("test", NULL, &gerror);
 	sml_fail_unless(loc != NULL, NULL);
@@ -1637,7 +1637,7 @@
 		smlManagerDispatch(servermanager);
 		smlManagerDispatch(clientmanager);
 		usleep(100);
-		sml_fail_unless(eventError == NULL, "%s", eventError->message);
+		sml_fail_unless(eventError == NULL, "%s",  GET_ERROR_MESSAGE(eventError));
 	}
 	
 	sml_fail_unless(clienttracker->session != NULL, NULL);
@@ -1655,7 +1655,7 @@
 		smlManagerDispatch(servermanager);
 		smlManagerDispatch(clientmanager);
 		usleep(100);
-		sml_fail_unless(eventError == NULL, "%s", eventError->message);
+		sml_fail_unless(eventError == NULL, "%s",  GET_ERROR_MESSAGE(eventError));
 	}
 	
 	smlDsSessionGetAlert(servertracker->dssessions[0], _recv_alert, GINT_TO_POINTER(1));
@@ -1685,7 +1685,7 @@
 		smlManagerDispatch(servermanager);
 		smlManagerDispatch(clientmanager);
 		usleep(100);
-		sml_fail_unless(eventError == NULL, "%s", eventError->message);
+		sml_fail_unless(eventError == NULL, "%s",  GET_ERROR_MESSAGE(eventError));
 	}
 	
 	const char *content_types[] = {SML_ELEMENT_TEXT_VCARD, SML_ELEMENT_TEXT_VCAL, SML_ELEMENT_TEXT_PLAIN};
@@ -1728,7 +1728,7 @@
 		smlManagerDispatch(servermanager);
 		smlManagerDispatch(clientmanager);
 		usleep(100);
-		sml_fail_unless(eventError == NULL, "%s", eventError->message);
+		sml_fail_unless(eventError == NULL, "%s",  GET_ERROR_MESSAGE(eventError));
 	}
 	
 	sml_fail_unless(servertracker->session != NULL, NULL);
@@ -1741,7 +1741,7 @@
 		smlManagerDispatch(servermanager);
 		smlManagerDispatch(clientmanager);
 		usleep(100);
-		sml_fail_unless(eventError == NULL, "%s", eventError->message);
+		sml_fail_unless(eventError == NULL, "%s",  GET_ERROR_MESSAGE(eventError));
 	}
 	
 	sml_fail_unless(init_alerts_received == 3, NULL);
@@ -1799,7 +1799,7 @@
 	smlManagerFree(clientmanager);
 	smlManagerFree(servermanager);
 	
-	sml_fail_unless(smlTransportFinalize(server, &error), "%s", error->message);
+	sml_fail_unless(smlTransportFinalize(server, &error), "%s", GET_ERROR_MESSAGE(error));
 	sml_fail_unless(smlTransportFinalize(client, &error), NULL);
 	
 	smlTransportFree(server);
@@ -1840,13 +1840,13 @@
 	smlManagerSetLocalMaxMsgSize(servertracker->manager, TEST_DEFAULT_MAX_MSG_SIZE);
 	smlManagerSetLocalMaxObjSize(servertracker->manager, TEST_DEFAULT_MAX_OBJ_SIZE);
 	
-	sml_fail_unless(smlManagerStart(clientmanager, &error), "%s", error->message);
+	sml_fail_unless(smlManagerStart(clientmanager, &error), "%s", GET_ERROR_MESSAGE(error));
 	sml_fail_unless(error == NULL, NULL);
-	sml_fail_unless(smlManagerStart(servermanager, &error), "%s", error->message);
+	sml_fail_unless(smlManagerStart(servermanager, &error), "%s", GET_ERROR_MESSAGE(error));
 	sml_fail_unless(error == NULL, NULL);
 
-	sml_fail_unless(smlTransportInitialize(client, &error), "%s", error->message);
-	sml_fail_unless(smlTransportInitialize(server, &error), "%s", error->message);
+	sml_fail_unless(smlTransportInitialize(client, &error), "%s", GET_ERROR_MESSAGE(error));
+	sml_fail_unless(smlTransportInitialize(server, &error), "%s", GET_ERROR_MESSAGE(error));
 
 	SmlLocation *loc1 = sml_location_new_with_options("test1", NULL, &gerror);
 	sml_fail_unless(loc1 != NULL, NULL);
@@ -1909,8 +1909,8 @@
 	sml_fail_unless(smlDsServerAddSan(servertracker->ds[2], san, &error), NULL);
 	sml_fail_unless(error == NULL, NULL);
 
-	sml_fail_unless(smlNotificationSend(san, server, &error), "%s", error->message);
-	sml_fail_unless(error == NULL, "%s", error->message);
+	sml_fail_unless(smlNotificationSend(san, server, &error), "%s", GET_ERROR_MESSAGE(error));
+	sml_fail_unless(error == NULL, "%s", GET_ERROR_MESSAGE(error));
 	
 	smlNotificationFree(san);
 	
@@ -1918,7 +1918,7 @@
 		smlManagerDispatch(servermanager);
 		smlManagerDispatch(clientmanager);
 		usleep(100);
-		sml_fail_unless(eventError == NULL, "%s", eventError->message);
+		sml_fail_unless(eventError == NULL, "%s",  GET_ERROR_MESSAGE(eventError));
 	}
 	
 	sml_fail_unless(clienttracker->session != NULL, NULL);
@@ -1934,7 +1934,7 @@
 		smlManagerDispatch(servermanager);
 		smlManagerDispatch(clientmanager);
 		usleep(100);
-		sml_fail_unless(eventError == NULL, "%s", eventError->message);
+		sml_fail_unless(eventError == NULL, "%s",  GET_ERROR_MESSAGE(eventError));
 	}
 	
 	smlDsSessionGetAlert(servertracker->dssessions[0], _recv_alert, GINT_TO_POINTER(1));
@@ -1964,7 +1964,7 @@
 		smlManagerDispatch(servermanager);
 		smlManagerDispatch(clientmanager);
 		usleep(100);
-		sml_fail_unless(eventError == NULL, "%s", eventError->message);
+		sml_fail_unless(eventError == NULL, "%s",  GET_ERROR_MESSAGE(eventError));
 	}
 	
 	const char *content_types[] = {SML_ELEMENT_TEXT_VCARD, SML_ELEMENT_TEXT_VCAL, SML_ELEMENT_TEXT_PLAIN};
@@ -1986,7 +1986,7 @@
 		smlDsSessionCloseSync(clienttracker->dssessions[k], &error);
 	}
 	
-	sml_fail_unless(smlSessionFlush(clienttracker->session, TRUE, &error), "%s", error->message);
+	sml_fail_unless(smlSessionFlush(clienttracker->session, TRUE, &error), "%s", GET_ERROR_MESSAGE(error));
 	
 	smlDsSessionGetSync(servertracker->dssessions[0], _recv_sync, GINT_TO_POINTER(1));
 	smlDsSessionGetSync(servertracker->dssessions[1], _recv_sync, GINT_TO_POINTER(1));
@@ -2007,11 +2007,11 @@
 		smlManagerDispatch(servermanager);
 		smlManagerDispatch(clientmanager);
 		usleep(100);
-		sml_fail_unless(eventError == NULL, "%s", eventError->message);
+		sml_fail_unless(eventError == NULL, "%s",  GET_ERROR_MESSAGE(eventError));
 	}
 	
 	sml_fail_unless(servertracker->session != NULL, NULL);
-	sml_fail_unless(smlSessionEnd(servertracker->session, &error), "%s", error->message);
+	sml_fail_unless(smlSessionEnd(servertracker->session, &error), "%s", GET_ERROR_MESSAGE(error));
 	sml_fail_unless(error == NULL, NULL);
 	smlSessionUnref(servertracker->session);
 	smlSessionUnref(clienttracker->session);
@@ -2020,7 +2020,7 @@
 		smlManagerDispatch(servermanager);
 		smlManagerDispatch(clientmanager);
 		usleep(100);
-		sml_fail_unless(eventError == NULL, "%s", eventError->message);
+		sml_fail_unless(eventError == NULL, "%s",  GET_ERROR_MESSAGE(eventError));
 	}
 	
 	sml_fail_unless(init_alerts_received == 3, NULL);
@@ -2078,8 +2078,8 @@
 	smlManagerFree(clientmanager);
 	smlManagerFree(servermanager);
 	
-	sml_fail_unless(smlTransportFinalize(server, &error), "%s", error->message);
-	sml_fail_unless(smlTransportFinalize(client, &error), "%s", error->message);
+	sml_fail_unless(smlTransportFinalize(server, &error), "%s", GET_ERROR_MESSAGE(error));
+	sml_fail_unless(smlTransportFinalize(client, &error), "%s", GET_ERROR_MESSAGE(error));
 	
 	smlTransportFree(server);
 	smlTransportFree(client);