diff options
| author | singesang <singesang@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2008-10-14 10:31:10 +0000 |
|---|---|---|
| committer | singesang <singesang@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2008-10-14 10:31:10 +0000 |
| commit | 8add81854c5932ee489577ee9cc3bb9d69902f24 (patch) | |
| tree | d46e99773a785250faeea65fda8de5492139c469 /navit/binding | |
| parent | 81b05654ce4269c23eaf6e3d655f89bf9bb5da8f (diff) | |
| download | navit-8add81854c5932ee489577ee9cc3bb9d69902f24.tar.gz | |
Fix: Changed service_name due to some issues with qdbusviewer e.g.
git-svn-id: http://svn.code.sf.net/p/navit/code/trunk/navit@1461 ffa7fe5e-494d-0410-b361-a75ebd5db220
Diffstat (limited to 'navit/binding')
| -rw-r--r-- | navit/binding/dbus/binding_dbus.c | 8 | ||||
| -rwxr-xr-x | navit/binding/dbus/test.py | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/navit/binding/dbus/binding_dbus.c b/navit/binding/dbus/binding_dbus.c index a6b14fbd1..b22b18324 100644 --- a/navit/binding/dbus/binding_dbus.c +++ b/navit/binding/dbus/binding_dbus.c @@ -36,7 +36,7 @@ static DBusConnection *connection; -static char *service_name="org.navit-project.navit"; +static char *service_name="org.navit_project.navit"; static char *object_path="/org/navit_project/navit"; GHashTable *object_hash; @@ -448,9 +448,9 @@ navit_handler_func(DBusConnection *connection, DBusMessage *message, void *user_ DBusMessage *reply; gchar *idata; dbg(0,"Introspect\n"); - if (! strcmp(dbus_message_get_path(message), "/org/navit_project/navit")) { + if (! strcmp(dbus_message_get_path(message), object_path)) { g_file_get_contents("binding/dbus/navit.introspect", &idata, NULL, NULL); - reply = dbus_message_new_method_return(http://www.http.com//message); + reply = dbus_message_new_method_return(message); dbus_message_append_args(reply, DBUS_TYPE_STRING, &idata, DBUS_TYPE_INVALID); dbus_connection_send (connection, reply, NULL); dbus_message_unref (reply); @@ -460,7 +460,7 @@ navit_handler_func(DBusConnection *connection, DBusMessage *message, void *user_ } #endif for (i = 0 ; i < sizeof(dbus_methods)/sizeof(struct dbus_method) ; i++) { - path=g_strdup_printf("org.navit_project.navit%s", dbus_methods[i].path); + path=g_strdup_printf("%s%s", service_name, dbus_methods[i].path); if (dbus_message_is_method_call(message, path, dbus_methods[i].method) && dbus_message_has_signature(message, dbus_methods[i].signature)) { g_free(path); diff --git a/navit/binding/dbus/test.py b/navit/binding/dbus/test.py index 5f69fddbf..6447648cc 100755 --- a/navit/binding/dbus/test.py +++ b/navit/binding/dbus/test.py @@ -1,11 +1,11 @@ #! /usr/bin/python import dbus bus = dbus.SessionBus() -conn = bus.get_object('org.navit-project.navit', +conn = bus.get_object('org.navit_project.navit', '/org/navit_project/navit') iface = dbus.Interface(conn, dbus_interface='org.navit_project.navit'); iter=iface.iter(); -navit=bus.get_object('org.navit-project.navit', conn.get_navit(iter)); +navit=bus.get_object('org.navit_project.navit', conn.get_navit(iter)); iface.iter_destroy(iter); navit_iface = dbus.Interface(navit, dbus_interface='org.navit_project.navit.navit'); navit_iface.set_center((1,0x138a4a,0x5d773f)); |