From f551be81f8787216949a88203ab57474bf7c62b0 Mon Sep 17 00:00:00 2001 From: Claudio Takahasi Date: Thu, 4 Mar 2010 11:44:56 -0300 Subject: [PATCH] obexd: Move D-Bus interface name declarations to manager.c --- obexd/src/dbus.h | 5 ----- obexd/src/manager.c | 7 +++++-- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/obexd/src/dbus.h b/obexd/src/dbus.h index a183957a8..1ec74eb01 100644 --- a/obexd/src/dbus.h +++ b/obexd/src/dbus.h @@ -25,11 +25,6 @@ #define OPENOBEX_SERVICE "org.openobex" -#define OPENOBEX_MANAGER_PATH "/" -#define OPENOBEX_MANAGER_INTERFACE OPENOBEX_SERVICE ".Manager" -#define ERROR_INTERFACE OPENOBEX_SERVICE ".Error" - - void emit_transfer_progress(guint32 id, guint32 total, guint32 transfered); void register_record(struct server *server, gpointer user_data); diff --git a/obexd/src/manager.c b/obexd/src/manager.c index a4e2fc6ce..c5e4b31e7 100644 --- a/obexd/src/manager.c +++ b/obexd/src/manager.c @@ -46,8 +46,11 @@ #include "service.h" #include "obex-priv.h" -#define TRANSFER_INTERFACE OPENOBEX_SERVICE ".Transfer" -#define SESSION_INTERFACE OPENOBEX_SERVICE ".Session" +#define OPENOBEX_MANAGER_PATH "/" +#define OPENOBEX_MANAGER_INTERFACE OPENOBEX_SERVICE ".Manager" +#define ERROR_INTERFACE OPENOBEX_SERVICE ".Error" +#define TRANSFER_INTERFACE OPENOBEX_SERVICE ".Transfer" +#define SESSION_INTERFACE OPENOBEX_SERVICE ".Session" #define TIMEOUT 60*1000 /* Timeout for user response (miliseconds) */ -- 2.47.3