diff options
author | horwitz <horwitz@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2010-03-01 22:01:57 +0000 |
---|---|---|
committer | horwitz <horwitz@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2010-03-01 22:01:57 +0000 |
commit | 05eb9f16f33fd34ef49797944bbd039983df7f44 (patch) | |
tree | b8257b18ef65b57f357e3f0bffc9854043fd1506 /navit/binding | |
parent | b79d2b660e27d63ac97dbeed287359c1defe4087 (diff) | |
download | navit-05eb9f16f33fd34ef49797944bbd039983df7f44.tar.gz |
fix:binding_dbus:use request_get_attr for request_navit_get_attr
git-svn-id: http://svn.code.sf.net/p/navit/code/trunk/navit@2975 ffa7fe5e-494d-0410-b361-a75ebd5db220
Diffstat (limited to 'navit/binding')
-rw-r--r-- | navit/binding/dbus/binding_dbus.c | 25 |
1 files changed, 1 insertions, 24 deletions
diff --git a/navit/binding/dbus/binding_dbus.c b/navit/binding/dbus/binding_dbus.c index f5f06a084..83acf2121 100644 --- a/navit/binding/dbus/binding_dbus.c +++ b/navit/binding/dbus/binding_dbus.c @@ -1093,30 +1093,7 @@ request_navit_resize(DBusConnection *connection, DBusMessage *message) static DBusHandlerResult request_navit_get_attr(DBusConnection *connection, DBusMessage *message) { - DBusMessage *reply; - DBusMessageIter iter; - struct attr attr; - enum attr_type attr_type; - struct attr_iter *attr_iter; - struct navit *navit; - - navit = object_get_from_message(message, "navit"); - if (! navit) - return dbus_error_invalid_object_path(connection, message); - - dbus_message_iter_init(message, &iter); - attr_type=attr_type_get_from_message(&iter); - if (attr_type == attr_none) - return dbus_error_invalid_attr_type(connection, message); - attr_iter=object_get_from_message_arg(&iter, "navit_attr_iter"); - if (navit_get_attr(navit, attr_type, &attr, attr_iter)) { - reply = dbus_message_new_method_return(message); - encode_attr(reply, &attr); - dbus_connection_send (connection, reply, NULL); - dbus_message_unref (reply); - return DBUS_HANDLER_RESULT_HANDLED; - } - return empty_reply(connection, message); + return request_get_attr(connection, message, "navit", NULL, (int (*)(void *, enum attr_type, struct attr *, struct attr_iter *))navit_get_attr); } static DBusHandlerResult |