Hi,
I suspect there is a bug in e_dbus.c related to calling
function dbus_watch_get_unix_fd or dbus_watch_get_fd. It depends on which
version of dbus is installed.
The relevant code is:
if (DBUS_VERSION_MAJOR == 1 && DBUS_VERSION_MINOR == 1 &&
DBUS_VERSION_MICRO>= 1) || (DBUS_VERSION_MAJOR == 1 && DBUS_VERSION_MAJOR >
1) || (DBUS_VERSION_MAJOR > 1)
I think it should be:
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)
Note the third DBUS_VERSION_MAJOR should actually be DBUS_VERSION_MINOR.
I've never created a patch before so hopefully the one I've attached is done
correctly. More importantly, I hope I'm right and am not wasting peoples
time!
Thanks for a great job with enlightenment too!
Cheers,
Shane
P.S. In case attachments aren't allowed here is the contents of the patch:
--- e_dbus.c 2010-01-28 12:41:09.906905340 +0100
+++ e_dbus-test.c 2010-01-28 11:57:53.591131801 +0100
@@ -127,7 +127,7 @@
hd->watch = watch;
hd->enabled = dbus_watch_get_enabled(watch);
-#if (DBUS_VERSION_MAJOR == 1 && DBUS_VERSION_MINOR == 1 &&
DBUS_VERSION_MICRO>= 1) || (DBUS_VERSION_MAJOR == 1 && DBUS_VERSION_MAJOR >
1) || (DBUS_VERSION_MAJOR > 1)
+#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)
hd->fd = dbus_watch_get_unix_fd(hd->watch);
#else
hd->fd = dbus_watch_get_fd(hd->watch);
------------------------------------------------------------------------------
The Planet: dedicated and managed hosting, cloud storage, colocation
Stay online with enterprise data centers and the best network in the business
Choose flexible plans and management services without long-term contracts
Personal 24x7 support from experience hosting pros just a phone call away.
http://p.sf.net/sfu/theplanet-com
_______________________________________________
enlightenment-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
