From mboxrd@z Thu Jan  1 00:00:00 1970
From: kupcevic@sourceware.org <kupcevic@sourceware.org>
Date: 28 Jul 2006 17:33:38 -0000
Subject: [Cluster-devel] conga make/version.in ricci/ricci/DBusControll ...
Message-ID: <20060728173338.29819.qmail@sourceware.org>
List-Id: <cluster-devel.redhat.com>
To: cluster-devel.redhat.com
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

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"