Resolved conflict w/ security additions

1 files changed, 26 insertions, 0 deletions

diff --git a/tests/resource-test.c b/tests/resource-test.c
index 60b2e3a..93ab6aa 100644
--- a/tests/resource-test.c
+++ b/tests/resource-test.c
@@ -1,3 +1,25 @@
+/*************************************************************************
+This file is part of libresource
+
+Copyright (C) 2010 Nokia Corporation.
+
+This library is free software; you can redistribute
+it and/or modify it under the terms of the GNU Lesser General Public
+License as published by the Free Software Foundation
+version 2.1 of the License.
+
+This library is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public
+License along with this library; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+USA.
+*************************************************************************/
+
+
 #include <dbus/dbus.h>
 #include <check.h>
 #include <stdlib.h>
@@ -362,7 +384,11 @@ int resproto_send_message(resset_t          *rset,
 
 DBusConnection *resource_get_dbus_bus(DBusBusType type, DBusError *err)
 {
+#ifdef APPROXIMATE_DBUS_WITH_C0FFEE
 	return (DBusConnection *) 0xC0FFEE;
+#else
+	return dbus_bus_get(type, err);
+#endif
 }
 
 resproto_handler_t handlers[3];