From e1219aaf402f2aeaa41c80aa0dfd791e866ae2c8 Mon Sep 17 00:00:00 2001
From: sebastid <sebastid>
Date: Thu, 27 Jul 2006 15:34:16 +0000
Subject: [PATCH] - Check if the return type of the error message is string -
 Add test with error

SVN revision: 24238
---
 legacy/ecore/src/bin/ecore_dbus_test.c       | 8 ++++++++
 legacy/ecore/src/lib/ecore_dbus/ecore_dbus.c | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/legacy/ecore/src/bin/ecore_dbus_test.c b/legacy/ecore/src/bin/ecore_dbus_test.c
index 4e4949410f..5d1de040d4 100644
--- a/legacy/ecore/src/bin/ecore_dbus_test.c
+++ b/legacy/ecore/src/bin/ecore_dbus_test.c
@@ -58,6 +58,14 @@ ecore_dbus_event_server_add(void *udata, int ev_type, void *ev)
    ecore_dbus_method_list_names(event->server,
 				ecore_dbus_method_list_names_cb,
 				ecore_dbus_method_error_cb, NULL);
+   ecore_dbus_message_new_method_call(event->server,
+				      "org.freedesktop.DBus" /*destination*/,
+				      "/org/freedesktop/DBus" /*path*/,
+				      "org.freedesktop.DBus" /*interface*/,
+				      "ListName" /*method*/,
+				      ecore_dbus_method_list_names_cb,
+				      ecore_dbus_method_error_cb, NULL,
+				      NULL /*fmt*/);
    return 0;
 }
 
diff --git a/legacy/ecore/src/lib/ecore_dbus/ecore_dbus.c b/legacy/ecore/src/lib/ecore_dbus/ecore_dbus.c
index 7727dcae59..9d2159a44e 100644
--- a/legacy/ecore/src/lib/ecore_dbus/ecore_dbus.c
+++ b/legacy/ecore/src/lib/ecore_dbus/ecore_dbus.c
@@ -385,7 +385,7 @@ _ecore_dbus_event_server_data(void *udata, int ev_type, void *ev)
 		  if ((sent) && (sent->cb.error))
 		    {
 		       char *error = NULL;
-		       if (ev2->args)
+		       if ((ev2->args) && (ev2->args[0].type == ECORE_DBUS_DATA_TYPE_STRING))
 			 error = ev2->args[0].value;
 		       sent->cb.error(sent->cb.data, error);
 		    }