[Cluster-devel] conga make/version.in ricci/ricci/DBusControll ...
kupcevic at sourceware.org
kupcevic at sourceware.org
Fri Jul 28 17:33:38 UTC 2006
CVSROOT: /cvs/cluster
Module name: conga
Changes by: kupcevic at sourceware.org 2006-07-28 17:33:37
Modified files:
make : version.in
ricci/ricci : DBusController.cpp
Log message:
ricci: D-BUS API - dbus_message_append_args() different char pointers for different versions
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/make/version.in.diff?cvsroot=cluster&r1=1.10&r2=1.11
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/ricci/DBusController.cpp.diff?cvsroot=cluster&r1=1.13&r2=1.14
--- conga/make/version.in 2006/07/26 18:03:57 1.10
+++ conga/make/version.in 2006/07/28 17:33:37 1.11
@@ -1,2 +1,2 @@
VERSION=0.8
-RELEASE=9
+RELEASE=9.1
--- conga/ricci/ricci/DBusController.cpp 2006/07/25 19:30:15 1.13
+++ conga/ricci/ricci/DBusController.cpp 2006/07/28 17:33:37 1.14
@@ -126,9 +126,9 @@
const char* msg_clean_c_str = msg_clean.c_str();
const void* message_dbus_ready = 0;
-#if (DBUS_MAJOR_VERSION == 1) || (DBUS_MAJOR_VERSION == 0 && DBUS_MINOR_VERSION >= 90)
+#if (DBUS_MAJOR_VERSION == 1) || (DBUS_MAJOR_VERSION == 0 && DBUS_MINOR_VERSION >= 60)
message_dbus_ready = &msg_clean_c_str;
-#elif DBUS_MAJOR_VERSION == 0 && DBUS_MINOR_VERSION < 90
+#elif DBUS_MAJOR_VERSION == 0 && DBUS_MINOR_VERSION < 60
message_dbus_ready = msg_clean_c_str;
#else
#error "unrecognized major DBUS number"
More information about the Cluster-devel
mailing list