yan/archived-lcd4linux
1
0
Fork 0
mirror of https://github.com/netfun2000/lcd4linux.git synced 2026-02-27 09:44:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

dbus_watch_get_unix_fd() only exists in libdbus >= 1.1.1

Browse Source 
git-svn-id: https://ssl.bulix.org/svn/lcd4linux/trunk@1056 3ae390bd-cb1e-0410-b409-cd5a39f66f1f
This commit is contained in:
volker
2009-11-16 16:10:03 +00:00
parent 5ef3e9233f
commit f6d08113a6
1 changed files with 17 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
plugin_dbus.c
View File

@@ -358,7 +358,12 @@ void plugin_exit_dbus(void)
static dbus_bool_t add_watch(DBusWatch * w, void *data)
{
(void) data; //ignore it
int fd = dbus_watch_get_unix_fd(w); //we assume we are using unix
#if (DBUS_VERSION_MAJOR == 1 && DBUS_VERSION_MINOR == 1 && DBUS_VERSION_MICRO >= 1) || (DBUS_VERSION_MAJOR == 1 && DBUS_VERSION_MINOR > 1) || (DBUS_VERSION_MAJOR > 1)
int fd = dbus_watch_get_unix_fd(w);
#else
int fd = dbus_watch_get_fd(w);
#endif
// int fd = dbus_watch_get_unix_fd(w); //we assume we are using unix
int flags = dbus_watch_get_flags(w);
event_add(watch_handle, w, fd, flags & DBUS_WATCH_READABLE, flags & DBUS_WATCH_WRITABLE, dbus_watch_get_enabled(w));
return TRUE;
@@ -367,12 +372,22 @@ static dbus_bool_t add_watch(DBusWatch * w, void *data)
static void remove_watch(DBusWatch * w, void *data)
{
(void) data; //ignore it
#if (DBUS_VERSION_MAJOR == 1 && DBUS_VERSION_MINOR == 1 && DBUS_VERSION_MICRO >= 1) || (DBUS_VERSION_MAJOR == 1 && DBUS_VERSION_MINOR > 1) || (DBUS_VERSION_MAJOR > 1)
event_del(dbus_watch_get_unix_fd(w));
#else
event_del(dbus_watch_get_fd(w));
#endif
// event_del(dbus_watch_get_unix_fd(w));
}
static void toggle_watch(DBusWatch * w, void *data)
{
int fd = dbus_watch_get_unix_fd(w); //we assume we are using unix
#if (DBUS_VERSION_MAJOR == 1 && DBUS_VERSION_MINOR == 1 && DBUS_VERSION_MICRO >= 1) || (DBUS_VERSION_MAJOR == 1 && DBUS_VERSION_MINOR > 1) || (DBUS_VERSION_MAJOR > 1)
int fd = dbus_watch_get_unix_fd(w);
#else
int fd = dbus_watch_get_fd(w);
#endif
// int fd = dbus_watch_get_unix_fd(w); //we assume we are using unix
int flags = dbus_watch_get_flags(w);
event_modify(fd, flags & DBUS_WATCH_READABLE, flags & DBUS_WATCH_WRITABLE, dbus_watch_get_enabled(w));
}