diff -Nru tmp/xfmedia-0.7.0/src/remote.c work/xfmedia-0.7.0/src/remote.c --- tmp/xfmedia-0.7.0/src/remote.c 2005-03-14 04:07:33.000000000 +0000 +++ work/xfmedia-0.7.0/src/remote.c 2005-03-17 20:42:46.000000000 +0000 @@ -23,8 +23,6 @@ #include "remote.h" -#ifdef HAVE_DBUS - #include #ifdef HAVE_STRING_H @@ -76,6 +74,7 @@ #define UNIX_PATH_MAX 108 #endif +#ifdef HAVE_DBUS #ifndef DBUS_API_SUBJECT_TO_CHANGE /* exo 0.2 sets this, but 0.3 doesn't */ #define DBUS_API_SUBJECT_TO_CHANGE #endif @@ -91,6 +90,7 @@ #define DBUS_NAME_FLAG_PROHIBIT_REPLACEMENT DBUS_SERVICE_FLAG_PROHIBIT_REPLACEMENT #define DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER DBUS_SERVICE_REPLY_PRIMARY_OWNER #endif +#endif #include @@ -115,6 +115,8 @@ #define XFMEDIA_DBUS_PATH_FMT "/org/spuriousinterrupt/Xfmedia/%d" /*#define XFMEDIA_DBUS_PATH_FMT XFMEDIA_DBUS_PARENT_PATH "/%d"*/ +#ifdef HAVE_DBUS + static void xfmedia_dbus_unregister(DBusConnection *connection, void *user_data); static DBusHandlerResult xfmedia_dbus_message(DBusConnection *connection, DBusMessage *message, void *user_data); @@ -756,7 +758,7 @@ #else /* !defined(HAVE_DBUS) */ -gboolean +gint xfmedia_remote_init(XfMediaMainwin *mwin) { g_warning("Not compiled with D-BUS support. Remote control interface is not available");