[Opensync-commits] r1178 - trunk/tests

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

Author: bellmich
Date: Mon Jul 13 14:09:45 2009
New Revision: 1178
URL: http://libsyncml.opensync.org/changeset/1178

Log:
migrated check_sync from SmlError to GError

Modified:
   trunk/tests/check_sync.c

Modified: trunk/tests/check_sync.c
==============================================================================
--- trunk/tests/check_sync.c	Mon Jul 13 14:02:32 2009	(r1177)
+++ trunk/tests/check_sync.c	Mon Jul 13 14:09:45 2009	(r1178)
@@ -66,7 +66,7 @@
 #define TEST_DEFAULT_MAX_MSG_SIZE    1024000
 #define TEST_DEFAULT_MAX_OBJ_SIZE    1024000
 unsigned int num_changes;
-SmlError *eventError;
+GError *eventError;
 
 void reset_testbed()
 {
@@ -98,7 +98,7 @@
 	setup_testbed(NULL);
 }
 
-static void _manager_event(SmlManager *manager, SmlManagerEventType type, SmlSession *session, SmlError *error, void *userdata)
+static void _manager_event(SmlManager *manager, SmlManagerEventType type, SmlSession *session, GError *error, void *userdata)
 {
 	smlTrace(TRACE_ENTRY, "%s(%p, %i, %p, %p, %p)", __func__, manager, type, session, error, userdata);
 	managerTracker *tracker = userdata;
@@ -114,9 +114,8 @@
 			g_atomic_int_inc(&num_disconnects);
 			break;
 		case SML_MANAGER_TRANSPORT_ERROR:
-			smlTrace(TRACE_INTERNAL, "%s - error: %s", __func__, smlErrorPrint(&error));
-			eventError = error;
-			smlErrorRef(&eventError);
+			smlTrace(TRACE_INTERNAL, "%s - error: %s", __func__, error->message);
+			eventError = g_error_copy(error);
 			transport_errors++;
 			break;
 		case SML_MANAGER_SESSION_NEW:
@@ -133,11 +132,10 @@
 			break;
 		case SML_MANAGER_SESSION_ERROR:
 		case SML_MANAGER_SESSION_WARNING:
-			smlTrace(TRACE_INTERNAL, "%s - error: %s", __func__, smlErrorPrint(&error));
+			smlTrace(TRACE_INTERNAL, "%s - error: %s", __func__, error->message);
 			if (eventError)
-				smlErrorDeref(&eventError);
-			eventError = error;
-			smlErrorRef(&eventError);
+				SML_ERROR_FREE(eventError);
+			eventError = g_error_copy(error);
 			session_errors++;
 			break;
 		default:
@@ -167,7 +165,7 @@
 	smlTrace(TRACE_EXIT, "%s", __func__);
 }
 
-static SmlBool _recv_alert(SmlDsSession *dsession, SmlAlertType type, const char *last, const char *next, void *userdata)
+static gboolean _recv_alert(SmlDsSession *dsession, SmlAlertType type, const char *last, const char *next, void *userdata)
 {
 	smlTrace(TRACE_ENTRY, "%s(%p, %i, %s, %s, %p)", __func__, dsession, type, VA_STRING(last), VA_STRING(next), userdata);
 	
@@ -214,50 +212,42 @@
 	smlTrace(TRACE_EXIT, "%s", __func__);
 }
 
-static void _add_reply(SmlDsSession *session, SmlStatus *status, const char *newuid, void *userdata)
+static void _add_reply(SmlDsSession *session, SmlStatus *status, void *userdata)
 {
-	smlTrace(TRACE_ENTRY, "%s(%p, %p, %s, %p)", __func__, session, status, VA_STRING(newuid), userdata);
+	smlTrace(TRACE_ENTRY, "%s(%p, %p, %p)", __func__, session, status, userdata);
 	
 	sml_fail_unless(status != NULL, NULL);
 	sml_fail_unless(smlStatusGetClass(status) == SML_ERRORCLASS_SUCCESS, NULL);
 	sml_fail_unless(GPOINTER_TO_INT(userdata) == 1 || GPOINTER_TO_INT(userdata) == 2, NULL);
 
-	if (GPOINTER_TO_INT(userdata) == 1) {
-		sml_fail_unless(!strcmp(newuid, "newuid"), NULL);
-	} else {
-		sml_fail_unless(newuid == NULL, NULL);
-	}
+	/* newuid is only supplied by mapping callback */
 	
 	add_replies_received++;
 
 	smlTrace(TRACE_EXIT, "%s", __func__);
 }
 
-static void _modify_reply(SmlDsSession *session, SmlStatus *status, const char *newuid, void *userdata)
+static void _modify_reply(SmlDsSession *session, SmlStatus *status, void *userdata)
 {
-	smlTrace(TRACE_ENTRY, "%s(%p, %p, %s, %p)", __func__, session, status, VA_STRING(newuid), userdata);
+	smlTrace(TRACE_ENTRY, "%s(%p, %p, %p)", __func__, session, status, userdata);
 	
 	sml_fail_unless(status != NULL, NULL);
 	sml_fail_unless(smlStatusGetClass(status) == SML_ERRORCLASS_SUCCESS, NULL);
 	sml_fail_unless(GPOINTER_TO_INT(userdata) == 1, NULL);
 
-	sml_fail_unless(newuid == NULL, NULL);
-	
 	modify_replies_received++;
 
 	smlTrace(TRACE_EXIT, "%s", __func__);
 }
 
-static void _delete_reply(SmlDsSession *session, SmlStatus *status, const char *newuid, void *userdata)
+static void _delete_reply(SmlDsSession *session, SmlStatus *status, void *userdata)
 {
-	smlTrace(TRACE_ENTRY, "%s(%p, %p, %s, %p)", __func__, session, status, VA_STRING(newuid), userdata);
+	smlTrace(TRACE_ENTRY, "%s(%p, %p, %p)", __func__, session, status, userdata);
 	
 	sml_fail_unless(status != NULL, NULL);
 	sml_fail_unless(smlStatusGetClass(status) == SML_ERRORCLASS_SUCCESS, NULL);
 	sml_fail_unless(GPOINTER_TO_INT(userdata) == 1, NULL);
 
-	sml_fail_unless(newuid == NULL, NULL);
-	
 	delete_replies_received++;
 
 	smlTrace(TRACE_EXIT, "%s", __func__);
@@ -297,7 +287,7 @@
 	smlTrace(TRACE_EXIT, "%s", __func__);
 }
 
-static SmlBool _recv_changes(SmlDsSession *dsession, SmlChangeType type, const char *uid, char *data, unsigned int size, const char *contenttype, void *userdata, SmlError **error)
+static gboolean _recv_changes(SmlDsSession *dsession, SmlChangeType type, const char *uid, char *data, unsigned int size, const char *contenttype, void *userdata, GError **error)
 {
 	smlTrace(TRACE_ENTRY, "%s(%p, %i, %s, %s, %i, %s, %p, %p)", __func__, dsession, type, VA_STRING(uid), VA_STRING(data), size, VA_STRING(contenttype), userdata, error);
 
@@ -331,7 +321,7 @@
 {
 	reset_testbed();
 	
-	SmlError *error = NULL;
+	GError *error = NULL;
 	GError *gerror = NULL;
 
 	SmlTransport *server = smlTransportNew(SML_TRANSPORT_HTTP_SERVER, &error);
@@ -350,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", smlErrorPrint(&error));
-	sml_fail_unless(smlTransportInitialize(client, &error), "%s", smlErrorPrint(&error));
-	sml_fail_unless(smlTransportInitialize(server, &error), "%s", smlErrorPrint(&error));
+	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(smlManagerStart(clientmanager, &error), NULL);
 	sml_fail_unless(error == NULL, NULL);
@@ -407,7 +397,7 @@
 	smlAuthSetEnable(auth2, FALSE);
 	smlAuthRegister(auth2, servermanager, &error);
 	
-	SmlSession *session = smlSessionNew(SML_SESSION_TYPE_CLIENT, SML_MIMETYPE_XML, SML_VERSION_12, SML_PROTOCOL_SYNCML, loc, loc, NULL, 0, &error);
+	SmlSession *session = smlSessionNew(SML_SESSION_TYPE_CLIENT, SML_MIMETYPE_XML, SML_VERSION_12, SML_PROTOCOL_SYNCML, loc, loc, 0, 0, &error);
 	
 	sml_fail_unless(smlManagerSessionAdd(clientmanager, session, NULL, &error), NULL);
 	sml_fail_unless(error == NULL, NULL);
@@ -425,7 +415,7 @@
 		smlManagerDispatch(servermanager);
 		smlManagerDispatch(clientmanager);
 		usleep(100);
-		sml_fail_unless(eventError == NULL, "%s", smlErrorPrint(&eventError));
+		sml_fail_unless(eventError == NULL, "%s", eventError->message);
 	}
 	
 	smlDsSessionGetAlert(servertracker->dssessions[0], _recv_alert, GINT_TO_POINTER(1));
@@ -443,7 +433,7 @@
 		smlManagerDispatch(servermanager);
 		smlManagerDispatch(clientmanager);
 		usleep(100);
-		sml_fail_unless(eventError == NULL, "%s", smlErrorPrint(&eventError));
+		sml_fail_unless(eventError == NULL, "%s", eventError->message);
 	}
 	
 	sml_fail_unless(init_alerts_received == 3, NULL);
@@ -498,7 +488,7 @@
 	smlAuthFree(auth2);
 	
 	sml_fail_unless(smlTransportFinalize(server, &error), NULL);
-	sml_fail_unless(smlTransportFinalize(client, &error), "%s", smlErrorPrint(&error));
+	sml_fail_unless(smlTransportFinalize(client, &error), "%s", error->message);
 	
 	smlTransportFree(server);
 	smlTransportFree(client);
@@ -517,7 +507,7 @@
 	unsigned int num_items = 10;
 	num_changes = 3 * num_items;
 	
-	SmlError *error = NULL;
+	GError *error = NULL;
 	GError *gerror = NULL;
 
 	SmlTransport *server = smlTransportNew(SML_TRANSPORT_HTTP_SERVER, &error);
@@ -536,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", smlErrorPrint(&error));
-	sml_fail_unless(smlTransportInitialize(client, &error), "%s", smlErrorPrint(&error));
-	sml_fail_unless(smlTransportInitialize(server, &error), "%s", smlErrorPrint(&error));
+	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(smlManagerStart(clientmanager, &error), NULL);
 	sml_fail_unless(error == NULL, NULL);
@@ -592,7 +582,7 @@
 	smlAuthSetEnable(auth2, FALSE);
 	smlAuthRegister(auth2, servermanager, &error);
 	
-	clienttracker->session = smlSessionNew(SML_SESSION_TYPE_CLIENT, SML_MIMETYPE_XML, SML_VERSION_12, SML_PROTOCOL_SYNCML, loc, loc, NULL, 0, &error);
+	clienttracker->session = smlSessionNew(SML_SESSION_TYPE_CLIENT, SML_MIMETYPE_XML, SML_VERSION_12, SML_PROTOCOL_SYNCML, loc, loc, 0, 0, &error);
 	
 	sml_fail_unless(smlManagerSessionAdd(clientmanager, clienttracker->session, NULL, &error), NULL);
 	sml_fail_unless(error == NULL, NULL);
@@ -610,7 +600,7 @@
 		smlManagerDispatch(servermanager);
 		smlManagerDispatch(clientmanager);
 		usleep(100);
-		sml_fail_unless(eventError == NULL, "%s", smlErrorPrint(&eventError));
+		sml_fail_unless(eventError == NULL, "%s", eventError->message);
 	}
 	
 	smlDsSessionGetAlert(servertracker->dssessions[0], _recv_alert, GINT_TO_POINTER(1));
@@ -640,7 +630,7 @@
 		smlManagerDispatch(servermanager);
 		smlManagerDispatch(clientmanager);
 		usleep(100);
-		sml_fail_unless(eventError == NULL, "%s", smlErrorPrint(&eventError));
+		sml_fail_unless(eventError == NULL, "%s", eventError->message);
 	}
 
 	const char *content_types[] = {SML_ELEMENT_TEXT_VCARD, SML_ELEMENT_TEXT_VCAL, SML_ELEMENT_TEXT_PLAIN};
@@ -683,7 +673,7 @@
 		smlManagerDispatch(servermanager);
 		smlManagerDispatch(clientmanager);
 		usleep(100);
-		sml_fail_unless(eventError == NULL, "%s", smlErrorPrint(&eventError));
+		sml_fail_unless(eventError == NULL, "%s", eventError->message);
 	}
 	
 	sml_fail_unless(servertracker->session != NULL, NULL);
@@ -697,7 +687,7 @@
 		smlManagerDispatch(servermanager);
 		smlManagerDispatch(clientmanager);
 		usleep(100);
-		sml_fail_unless(eventError == NULL, "%s", smlErrorPrint(&eventError));
+		sml_fail_unless(eventError == NULL, "%s", eventError->message);
 	}
 	
 	sml_fail_unless(init_alerts_received == 3, NULL);
@@ -752,7 +742,7 @@
 	smlManagerFree(servermanager);
 	
 	sml_fail_unless(smlTransportFinalize(server, &error), NULL);
-	sml_fail_unless(smlTransportFinalize(client, &error), "%s", smlErrorPrint(&error));
+	sml_fail_unless(smlTransportFinalize(client, &error), "%s", error->message);
 	
 	smlTransportFree(server);
 	smlTransportFree(client);
@@ -773,7 +763,7 @@
 	unsigned int num_items = 100;
 	num_changes = 3 * num_items;
 	
-	SmlError *error = NULL;
+	GError *error = NULL;
 	GError *gerror = NULL;
 
 	SmlTransport *server = smlTransportNew(SML_TRANSPORT_HTTP_SERVER, &error);
@@ -792,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", smlErrorPrint(&error));
-	sml_fail_unless(smlTransportInitialize(client, &error), "%s", smlErrorPrint(&error));
-	sml_fail_unless(smlTransportInitialize(server, &error), "%s", smlErrorPrint(&error));
+	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(smlManagerStart(clientmanager, &error), NULL);
 	sml_fail_unless(error == NULL, NULL);
@@ -848,7 +838,7 @@
 	smlAuthSetEnable(auth2, FALSE);
 	smlAuthRegister(auth2, servermanager, &error);
 	
-	clienttracker->session = smlSessionNew(SML_SESSION_TYPE_CLIENT, SML_MIMETYPE_XML, SML_VERSION_12, SML_PROTOCOL_SYNCML, loc, loc, NULL, 0, &error);
+	clienttracker->session = smlSessionNew(SML_SESSION_TYPE_CLIENT, SML_MIMETYPE_XML, SML_VERSION_12, SML_PROTOCOL_SYNCML, loc, loc, 0, 0, &error);
 	
 	sml_fail_unless(smlManagerSessionAdd(clientmanager, clienttracker->session, NULL, &error), NULL);
 	sml_fail_unless(error == NULL, NULL);
@@ -866,7 +856,7 @@
 		smlManagerDispatch(servermanager);
 		smlManagerDispatch(clientmanager);
 		usleep(100);
-		sml_fail_unless(eventError == NULL, "%s", smlErrorPrint(&eventError));
+		sml_fail_unless(eventError == NULL, "%s", eventError->message);
 	}
 	
 	smlDsSessionGetAlert(servertracker->dssessions[0], _recv_alert, GINT_TO_POINTER(1));
@@ -896,7 +886,7 @@
 		smlManagerDispatch(servermanager);
 		smlManagerDispatch(clientmanager);
 		usleep(100);
-		sml_fail_unless(eventError == NULL, "%s", smlErrorPrint(&eventError));
+		sml_fail_unless(eventError == NULL, "%s", eventError->message);
 	}
 	
 	const char *content_types[] = {SML_ELEMENT_TEXT_VCARD, SML_ELEMENT_TEXT_VCAL, SML_ELEMENT_TEXT_PLAIN};
@@ -939,7 +929,7 @@
 		smlManagerDispatch(servermanager);
 		smlManagerDispatch(clientmanager);
 		usleep(100);
-		sml_fail_unless(eventError == NULL, "%s", smlErrorPrint(&eventError));
+		sml_fail_unless(eventError == NULL, "%s", eventError->message);
 	}
 	
 	for (k = 0; k < 3; k++)
@@ -980,7 +970,7 @@
 		smlManagerDispatch(servermanager);
 		smlManagerDispatch(clientmanager);
 		usleep(100);
-		sml_fail_unless(eventError == NULL, "%s", smlErrorPrint(&eventError));
+		sml_fail_unless(eventError == NULL, "%s", eventError->message);
 	}
 
 	unsigned int i = 0;	
@@ -1008,7 +998,7 @@
 		smlManagerDispatch(servermanager);
 		smlManagerDispatch(clientmanager);
 		usleep(100);
-		sml_fail_unless(eventError == NULL, "%s", smlErrorPrint(&eventError));
+		sml_fail_unless(eventError == NULL, "%s", eventError->message);
 	}
 	
 	sml_fail_unless(servertracker->session != NULL, NULL);
@@ -1022,7 +1012,7 @@
 		smlManagerDispatch(servermanager);
 		smlManagerDispatch(clientmanager);
 		usleep(100);
-		sml_fail_unless(eventError == NULL, "%s", smlErrorPrint(&eventError));
+		sml_fail_unless(eventError == NULL, "%s", eventError->message);
 	}
 	
 	sml_fail_unless(init_alerts_received == 3, NULL);
@@ -1077,7 +1067,7 @@
 	smlManagerFree(servermanager);
 	
 	sml_fail_unless(smlTransportFinalize(server, &error), NULL);
-	sml_fail_unless(smlTransportFinalize(client, &error), "%s", smlErrorPrint(&error));
+	sml_fail_unless(smlTransportFinalize(client, &error), "%s", error->message);
 	
 	smlTransportFree(server);
 	smlTransportFree(client);
@@ -1096,7 +1086,7 @@
 	unsigned int num_items = 100;
 	num_changes = 3 * num_items;
 
-	SmlError *error = NULL;
+	GError *error = NULL;
 	GError *gerror = NULL;
 
 	SmlTransport *server = smlTransportNew(SML_TRANSPORT_HTTP_SERVER, &error);
@@ -1115,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", smlErrorPrint(&error));
-	sml_fail_unless(smlTransportInitialize(client, &error), "%s", smlErrorPrint(&error));
-	sml_fail_unless(smlTransportInitialize(server, &error), "%s", smlErrorPrint(&error));
+	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(smlManagerStart(clientmanager, &error), NULL);
 	sml_fail_unless(error == NULL, NULL);
@@ -1241,7 +1231,7 @@
 	smlAuthSetEnable(auth2, FALSE);
 	smlAuthRegister(auth2, servermanager, &error);
 	
-	clienttracker->session = smlSessionNew(SML_SESSION_TYPE_CLIENT, SML_MIMETYPE_XML, SML_VERSION_12, SML_PROTOCOL_SYNCML, loc, loc, NULL, 0, &error);
+	clienttracker->session = smlSessionNew(SML_SESSION_TYPE_CLIENT, SML_MIMETYPE_XML, SML_VERSION_12, SML_PROTOCOL_SYNCML, loc, loc, 0, 0, &error);
 	smlSessionSetLocalMaxMsgSize(clienttracker->session, TEST_DEFAULT_MAX_MSG_SIZE);
 	sml_fail_unless(smlSessionGetRemoteMaxObjSize(clienttracker->session) == 0, NULL);
 	smlSessionSetLocalMaxObjSize(clienttracker->session, TEST_DEFAULT_MAX_OBJ_SIZE);
@@ -1271,7 +1261,7 @@
 		smlManagerDispatch(servermanager);
 		smlManagerDispatch(clientmanager);
 		usleep(100);
-		sml_fail_unless(eventError == NULL, "%s", smlErrorPrint(&eventError));
+		sml_fail_unless(eventError == NULL, "%s", eventError->message);
 	}
 	
 	sml_fail_unless(smlSessionGetRemoteMaxMsgSize(servertracker->session) == TEST_DEFAULT_MAX_MSG_SIZE, NULL);
@@ -1288,7 +1278,7 @@
 		smlDsSessionDispatch(servertracker->dssessions[1]);
 		smlDsSessionDispatch(servertracker->dssessions[2]);
 		usleep(100);
-		sml_fail_unless(eventError == NULL, "%s", smlErrorPrint(&eventError));
+		sml_fail_unless(eventError == NULL, "%s", eventError->message);
 	}
 	
 	SmlDevInf *recvClientDevInf = smlDevInfAgentGetSessionDevInf(serveragent, servertracker->session);
@@ -1298,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", smlErrorPrint(&error));
-	sml_fail_unless(error == NULL, "%s", smlErrorPrint(&error));
+	sml_fail_unless(smlDevInfAgentSendDevInf(serveragent, servertracker->session, &error), "%s", error->message);
+	sml_fail_unless(error == NULL, "%s", error->message);
 	
 	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);
@@ -1324,7 +1314,7 @@
 		smlManagerDispatch(servermanager);
 		smlManagerDispatch(clientmanager);
 		usleep(100);
-		sml_fail_unless(eventError == NULL, "%s", smlErrorPrint(&eventError));
+		sml_fail_unless(eventError == NULL, "%s", eventError->message);
 	}
 	
 	sml_fail_unless(smlSessionGetRemoteMaxMsgSize(clienttracker->session) == TEST_DEFAULT_MAX_MSG_SIZE, NULL);
@@ -1377,7 +1367,7 @@
 		smlManagerDispatch(servermanager);
 		smlManagerDispatch(clientmanager);
 		usleep(100);
-		sml_fail_unless(eventError == NULL, "%s", smlErrorPrint(&eventError));
+		sml_fail_unless(eventError == NULL, "%s", eventError->message);
 	}
 	
 	for (k = 0; k < 3; k++)
@@ -1418,7 +1408,7 @@
 		smlManagerDispatch(servermanager);
 		smlManagerDispatch(clientmanager);
 		usleep(100);
-		sml_fail_unless(eventError == NULL, "%s", smlErrorPrint(&eventError));
+		sml_fail_unless(eventError == NULL, "%s", eventError->message);
 	}
 
 	unsigned int i = 0;	
@@ -1446,7 +1436,7 @@
 		smlManagerDispatch(servermanager);
 		smlManagerDispatch(clientmanager);
 		usleep(100);
-		sml_fail_unless(eventError == NULL, "%s", smlErrorPrint(&eventError));
+		sml_fail_unless(eventError == NULL, "%s", eventError->message);
 	}
 	
 	
@@ -1467,7 +1457,7 @@
 		smlManagerDispatch(servermanager);
 		smlManagerDispatch(clientmanager);
 		usleep(100);
-		sml_fail_unless(eventError == NULL, "%s", smlErrorPrint(&eventError));
+		sml_fail_unless(eventError == NULL, "%s", eventError->message);
 	}
 	
 	sml_fail_unless(init_alerts_received == 3, NULL);
@@ -1523,7 +1513,7 @@
 	smlManagerFree(servermanager);
 	
 	sml_fail_unless(smlTransportFinalize(server, &error), NULL);
-	sml_fail_unless(smlTransportFinalize(client, &error), "%s", smlErrorPrint(&error));
+	sml_fail_unless(smlTransportFinalize(client, &error), "%s", error->message);
 	
 	smlTransportFree(server);
 	smlTransportFree(client);
@@ -1542,19 +1532,19 @@
 	unsigned int num_items = 10;
 	num_changes = 3 * num_items;
 	
-	SmlError *error = NULL;
+	GError *error = NULL;
 	GError *gerror = NULL;
 	
 	/* 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", smlErrorPrint(&error));
+	sml_fail_unless(smlTransportSetConfigOption(client, "PORT", "12010", &error), "%s", error->message);
 
 	/* 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", smlErrorPrint(&error));
-	sml_fail_unless(smlTransportSetConfigOption(server, "PORT", "12010", &error), "%s", smlErrorPrint(&error));
-	sml_fail_unless(smlTransportSetConfigOption(server, "URL", "127.0.0.1", &error), "%s", smlErrorPrint(&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);
 	
 	managerTracker *clienttracker = g_malloc0(sizeof(managerTracker));
 	SmlManager *clientmanager = clienttracker->manager = smlManagerNew(client, &error);
@@ -1570,8 +1560,8 @@
 	sml_fail_unless(smlManagerStart(servermanager, &error), NULL);
 	sml_fail_unless(error == NULL, NULL);
 
-	sml_fail_unless(smlTransportInitialize(client, &error), "%s", smlErrorPrint(&error));
-	sml_fail_unless(smlTransportInitialize(server, &error), "%s", smlErrorPrint(&error));
+	sml_fail_unless(smlTransportInitialize(client, &error), "%s", error->message);
+	sml_fail_unless(smlTransportInitialize(server, &error), "%s", error->message);
 
 	SmlLocation *loc = sml_location_new_with_options("test", NULL, &gerror);
 	sml_fail_unless(loc != NULL, NULL);
@@ -1647,7 +1637,7 @@
 		smlManagerDispatch(servermanager);
 		smlManagerDispatch(clientmanager);
 		usleep(100);
-		sml_fail_unless(eventError == NULL, "%s", smlErrorPrint(&eventError));
+		sml_fail_unless(eventError == NULL, "%s", eventError->message);
 	}
 	
 	sml_fail_unless(clienttracker->session != NULL, NULL);
@@ -1665,7 +1655,7 @@
 		smlManagerDispatch(servermanager);
 		smlManagerDispatch(clientmanager);
 		usleep(100);
-		sml_fail_unless(eventError == NULL, "%s", smlErrorPrint(&eventError));
+		sml_fail_unless(eventError == NULL, "%s", eventError->message);
 	}
 	
 	smlDsSessionGetAlert(servertracker->dssessions[0], _recv_alert, GINT_TO_POINTER(1));
@@ -1695,7 +1685,7 @@
 		smlManagerDispatch(servermanager);
 		smlManagerDispatch(clientmanager);
 		usleep(100);
-		sml_fail_unless(eventError == NULL, "%s", smlErrorPrint(&eventError));
+		sml_fail_unless(eventError == NULL, "%s", eventError->message);
 	}
 	
 	const char *content_types[] = {SML_ELEMENT_TEXT_VCARD, SML_ELEMENT_TEXT_VCAL, SML_ELEMENT_TEXT_PLAIN};
@@ -1738,7 +1728,7 @@
 		smlManagerDispatch(servermanager);
 		smlManagerDispatch(clientmanager);
 		usleep(100);
-		sml_fail_unless(eventError == NULL, "%s", smlErrorPrint(&eventError));
+		sml_fail_unless(eventError == NULL, "%s", eventError->message);
 	}
 	
 	sml_fail_unless(servertracker->session != NULL, NULL);
@@ -1751,7 +1741,7 @@
 		smlManagerDispatch(servermanager);
 		smlManagerDispatch(clientmanager);
 		usleep(100);
-		sml_fail_unless(eventError == NULL, "%s", smlErrorPrint(&eventError));
+		sml_fail_unless(eventError == NULL, "%s", eventError->message);
 	}
 	
 	sml_fail_unless(init_alerts_received == 3, NULL);
@@ -1809,7 +1799,7 @@
 	smlManagerFree(clientmanager);
 	smlManagerFree(servermanager);
 	
-	sml_fail_unless(smlTransportFinalize(server, &error), "%s", smlErrorPrint(&error));
+	sml_fail_unless(smlTransportFinalize(server, &error), "%s", error->message);
 	sml_fail_unless(smlTransportFinalize(client, &error), NULL);
 	
 	smlTransportFree(server);
@@ -1828,7 +1818,7 @@
 	unsigned int num_items = 10;
 	num_changes = 3 * num_items;
 	
-	SmlError *error = NULL;
+	GError *error = NULL;
 	GError *gerror = NULL;
 
 	SmlTransport *server = smlTransportNew(SML_TRANSPORT_OBEX_CLIENT, &error);
@@ -1850,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", smlErrorPrint(&error));
+	sml_fail_unless(smlManagerStart(clientmanager, &error), "%s", error->message);
 	sml_fail_unless(error == NULL, NULL);
-	sml_fail_unless(smlManagerStart(servermanager, &error), "%s", smlErrorPrint(&error));
+	sml_fail_unless(smlManagerStart(servermanager, &error), "%s", error->message);
 	sml_fail_unless(error == NULL, NULL);
 
-	sml_fail_unless(smlTransportInitialize(client, &error), "%s", smlErrorPrint(&error));
-	sml_fail_unless(smlTransportInitialize(server, &error), "%s", smlErrorPrint(&error));
+	sml_fail_unless(smlTransportInitialize(client, &error), "%s", error->message);
+	sml_fail_unless(smlTransportInitialize(server, &error), "%s", error->message);
 
 	SmlLocation *loc1 = sml_location_new_with_options("test1", NULL, &gerror);
 	sml_fail_unless(loc1 != NULL, NULL);
@@ -1919,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", smlErrorPrint(&error));
-	sml_fail_unless(error == NULL, "%s", smlErrorPrint(&error));
+	sml_fail_unless(smlNotificationSend(san, server, &error), "%s", error->message);
+	sml_fail_unless(error == NULL, "%s", error->message);
 	
 	smlNotificationFree(san);
 	
@@ -1928,7 +1918,7 @@
 		smlManagerDispatch(servermanager);
 		smlManagerDispatch(clientmanager);
 		usleep(100);
-		sml_fail_unless(eventError == NULL, "%s", smlErrorPrint(&eventError));
+		sml_fail_unless(eventError == NULL, "%s", eventError->message);
 	}
 	
 	sml_fail_unless(clienttracker->session != NULL, NULL);
@@ -1944,7 +1934,7 @@
 		smlManagerDispatch(servermanager);
 		smlManagerDispatch(clientmanager);
 		usleep(100);
-		sml_fail_unless(eventError == NULL, "%s", smlErrorPrint(&eventError));
+		sml_fail_unless(eventError == NULL, "%s", eventError->message);
 	}
 	
 	smlDsSessionGetAlert(servertracker->dssessions[0], _recv_alert, GINT_TO_POINTER(1));
@@ -1974,7 +1964,7 @@
 		smlManagerDispatch(servermanager);
 		smlManagerDispatch(clientmanager);
 		usleep(100);
-		sml_fail_unless(eventError == NULL, "%s", smlErrorPrint(&eventError));
+		sml_fail_unless(eventError == NULL, "%s", eventError->message);
 	}
 	
 	const char *content_types[] = {SML_ELEMENT_TEXT_VCARD, SML_ELEMENT_TEXT_VCAL, SML_ELEMENT_TEXT_PLAIN};
@@ -1996,7 +1986,7 @@
 		smlDsSessionCloseSync(clienttracker->dssessions[k], &error);
 	}
 	
-	sml_fail_unless(smlSessionFlush(clienttracker->session, TRUE, &error), "%s", smlErrorPrint(&error));
+	sml_fail_unless(smlSessionFlush(clienttracker->session, TRUE, &error), "%s", error->message);
 	
 	smlDsSessionGetSync(servertracker->dssessions[0], _recv_sync, GINT_TO_POINTER(1));
 	smlDsSessionGetSync(servertracker->dssessions[1], _recv_sync, GINT_TO_POINTER(1));
@@ -2017,11 +2007,11 @@
 		smlManagerDispatch(servermanager);
 		smlManagerDispatch(clientmanager);
 		usleep(100);
-		sml_fail_unless(eventError == NULL, "%s", smlErrorPrint(&eventError));
+		sml_fail_unless(eventError == NULL, "%s", eventError->message);
 	}
 	
 	sml_fail_unless(servertracker->session != NULL, NULL);
-	sml_fail_unless(smlSessionEnd(servertracker->session, &error), "%s", smlErrorPrint(&error));
+	sml_fail_unless(smlSessionEnd(servertracker->session, &error), "%s", error->message);
 	sml_fail_unless(error == NULL, NULL);
 	smlSessionUnref(servertracker->session);
 	smlSessionUnref(clienttracker->session);
@@ -2030,7 +2020,7 @@
 		smlManagerDispatch(servermanager);
 		smlManagerDispatch(clientmanager);
 		usleep(100);
-		sml_fail_unless(eventError == NULL, "%s", smlErrorPrint(&eventError));
+		sml_fail_unless(eventError == NULL, "%s", eventError->message);
 	}
 	
 	sml_fail_unless(init_alerts_received == 3, NULL);
@@ -2088,8 +2078,8 @@
 	smlManagerFree(clientmanager);
 	smlManagerFree(servermanager);
 	
-	sml_fail_unless(smlTransportFinalize(server, &error), "%s", smlErrorPrint(&error));
-	sml_fail_unless(smlTransportFinalize(client, &error), "%s", smlErrorPrint(&error));
+	sml_fail_unless(smlTransportFinalize(server, &error), "%s", error->message);
+	sml_fail_unless(smlTransportFinalize(client, &error), "%s", error->message);
 	
 	smlTransportFree(server);
 	smlTransportFree(client);