summaryrefslogtreecommitdiff
path: root/navit/binding
diff options
context:
space:
mode:
authormartin-s <martin-s@ffa7fe5e-494d-0410-b361-a75ebd5db220>2012-06-05 13:56:40 +0000
committermartin-s <martin-s@ffa7fe5e-494d-0410-b361-a75ebd5db220>2012-06-05 13:56:40 +0000
commit1415b906ae3766d2a1579929369abc5c42b99a35 (patch)
treee3921bf0655c5788ab8784311f98edc099de0279 /navit/binding
parent2597aa819975ca4842246a79bcfff8ff7d014c48 (diff)
downloadnavit-svn-1415b906ae3766d2a1579929369abc5c42b99a35.tar.gz
Fix:binding_dbus:Signature-compliant return values in case of no data
git-svn-id: http://svn.code.sf.net/p/navit/code/trunk/navit@5127 ffa7fe5e-494d-0410-b361-a75ebd5db220
Diffstat (limited to 'navit/binding')
-rw-r--r--navit/binding/dbus/binding_dbus.c16
1 files changed, 13 insertions, 3 deletions
diff --git a/navit/binding/dbus/binding_dbus.c b/navit/binding/dbus/binding_dbus.c
index a1a92dde..57585a95 100644
--- a/navit/binding/dbus/binding_dbus.c
+++ b/navit/binding/dbus/binding_dbus.c
@@ -353,6 +353,16 @@ dbus_error_invalid_object_path_parameter(DBusConnection *connection, DBusMessage
return dbus_error(connection, message, DBUS_ERROR_BAD_ADDRESS, "object path parameter invalid");
}
+static DBusHandlerResult
+dbus_error_no_data_available(DBusConnection *connection, DBusMessage *message)
+{
+#if 1
+ return dbus_error(connection, message, DBUS_ERROR_FILE_NOT_FOUND, "no data available");
+#else
+ return empty_reply(connection, message);
+#endif
+}
+
#if 0
static void
dbus_dump_iter(char *prefix, DBusMessageIter *iter)
@@ -688,7 +698,7 @@ request_get_attr(DBusConnection *connection, DBusMessage *message, char *type, v
dbus_message_unref (reply);
return DBUS_HANDLER_RESULT_HANDLED;
}
- return empty_reply(connection, message);
+ return dbus_error_no_data_available(connection, message);
}
@@ -849,7 +859,7 @@ request_graphics_get_data(DBusConnection *connection, DBusMessage *message)
dbus_message_unref (reply);
return DBUS_HANDLER_RESULT_HANDLED;
}
- return empty_reply(connection, message);
+ return dbus_error_no_data_available(connection, message);
}
/* gui */
@@ -1373,7 +1383,7 @@ request_search_list_get_result(DBusConnection *connection, DBusMessage *message)
return dbus_error_invalid_object_path(connection, message);
result=search_list_get_result(search_list);
if (!result)
- return empty_reply(connection, message);
+ return dbus_error_no_data_available(connection, message);
reply = dbus_message_new_method_return(message);
dbus_message_iter_init_append(reply, &iter);
dbus_message_iter_append_basic(&iter, DBUS_TYPE_INT32, &result->id);