[tracker/libtracker-bus: 19/51] libtracker-bus: Use steroids if available
- From: Jürg Billeter <juergbi src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [tracker/libtracker-bus: 19/51] libtracker-bus: Use steroids if available
- Date: Tue, 10 Aug 2010 14:09:24 +0000 (UTC)
commit fa8f25a58a1a37e60d6a94ff3f19e84dc6096b6e
Author: Jürg Billeter <j bitron ch>
Date: Wed Jul 21 14:50:53 2010 +0200
libtracker-bus: Use steroids if available
configure.ac | 2 +-
src/libtracker-bus/Makefile.am | 2 ++
src/libtracker-bus/config.vapi | 23 +++++++++++++++++++++++
src/libtracker-bus/tracker-bus.vala | 3 +--
4 files changed, 27 insertions(+), 3 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 9765a3a..db8b4fe 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1679,7 +1679,7 @@ if test "x$enable_dbus_fd_passing" != "xno" ; then
[have_dbus_fd_passing=no])
if test "x$have_dbus_fd_passing" = "xyes"; then
- AC_DEFINE(HAVE_DBUS_FD_PASSING, [], [Define if we have DBus >= 1.3 and want DBus FD passing])
+ AC_DEFINE(HAVE_DBUS_FD_PASSING, 1, [Define if we have DBus >= 1.3 and want DBus FD passing])
fi
else
have_dbus_fd_passing="no (disabled)"
diff --git a/src/libtracker-bus/Makefile.am b/src/libtracker-bus/Makefile.am
index 84d8184..d8bf09b 100644
--- a/src/libtracker-bus/Makefile.am
+++ b/src/libtracker-bus/Makefile.am
@@ -32,6 +32,7 @@ noinst_HEADERS = \
# Vala sources
vapi_sources = \
+ config.vapi \
$(top_srcdir)/src/libtracker-sparql/tracker-sparql-$(TRACKER_API_VERSION).vapi \
$(top_srcdir)/src/libtracker-bus/tracker-bus-fd-cursor.vapi \
$(top_srcdir)/src/libtracker-common/libtracker-common.vapi
@@ -57,6 +58,7 @@ MAINTAINERCLEANFILES = \
tracker-bus.h
EXTRA_DIST = \
+ config.vapi \
$(libtracker_bus_la_VALASOURCES) \
libtracker-bus.vala.stamp \
$(top_srcdir)/src/libtracker-bus/tracker-bus-fd-cursor.vapi
diff --git a/src/libtracker-bus/config.vapi b/src/libtracker-bus/config.vapi
new file mode 100644
index 0000000..992951e
--- /dev/null
+++ b/src/libtracker-bus/config.vapi
@@ -0,0 +1,23 @@
+/*
+ * Copyright (C) 2010, Nokia <ivan frade nokia com>
+ *
+ * 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; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * 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.
+ */
+
+[CCode (cprefix = "", lower_case_cprefix = "", cheader_filename = "config.h")]
+namespace Config {
+ public const bool HAVE_DBUS_FD_PASSING;
+}
diff --git a/src/libtracker-bus/tracker-bus.vala b/src/libtracker-bus/tracker-bus.vala
index 7ae90ed..01e0c86 100644
--- a/src/libtracker-bus/tracker-bus.vala
+++ b/src/libtracker-bus/tracker-bus.vala
@@ -57,8 +57,7 @@ public class Tracker.Bus.Connection : Tracker.Sparql.Connection {
initialized = true;
try {
- // FIXME: Test for steroids and resources interfaces?
- use_steroids = false;
+ use_steroids = Config.HAVE_DBUS_FD_PASSING;
connection = DBus.Bus.get (DBus.BusType.SESSION);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]