[tracker/rss-enclosures] Require DBus 1.3.1, removed dead code now that we don't support DBus < 1.3.1
- From: Roberto Guido <rguido src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [tracker/rss-enclosures] Require DBus 1.3.1, removed dead code now that we don't support DBus < 1.3.1
- Date: Wed, 24 Nov 2010 01:45:42 +0000 (UTC)
commit 2b882aa3d0fe0b5b93e2bb87875448edd8affc98
Author: Philip Van Hoof <philip codeminded be>
Date: Mon Sep 13 14:58:02 2010 +0200
Require DBus 1.3.1, removed dead code now that we don't support DBus < 1.3.1
configure.ac | 31 +---
src/libtracker-bus/Makefile.am | 17 +-
src/libtracker-bus/config.vapi | 23 --
src/libtracker-bus/tracker-bus-array-update.c | 265 ---------------------
src/libtracker-bus/tracker-bus-array-update.h | 33 ---
src/libtracker-bus/tracker-bus-array-update.vapi | 23 --
src/libtracker-bus/tracker-bus-fd-cursor.c | 13 -
src/libtracker-bus/tracker-bus-fd-update.c | 45 ----
src/libtracker-bus/tracker-bus.vala | 106 +--------
src/libtracker-client/tracker.c | 276 ----------------------
src/miners/fs/tracker-miner-files.c | 24 +--
src/tracker-extract/tracker-dbus.c | 4 -
src/tracker-extract/tracker-dbus.h | 2 -
src/tracker-extract/tracker-extract.c | 2 -
src/tracker-extract/tracker-extract.h | 2 -
src/tracker-extract/tracker-main.c | 2 -
src/tracker-store/Makefile.am | 6 +-
src/tracker-store/tracker-dbus.c | 42 ++--
18 files changed, 32 insertions(+), 884 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index aa5b140..66c8415 100644
--- a/configure.ac
+++ b/configure.ac
@@ -131,7 +131,7 @@ if test "x$have_function" = "xno" ; then
fi
# Library required versions
-DBUS_REQUIRED=1.0
+DBUS_REQUIRED=1.3.1
DBUS_GLIB_REQUIRED=0.82
GLIB_REQUIRED=2.24.0
PANGO_REQUIRED=1.0.0
@@ -1695,35 +1695,6 @@ fi
AM_CONDITIONAL(HAVE_TOTEM_PL_PARSER, test "x$have_playlist" = "xyes")
-####################################################################
-# Check for DBus > 1.3.1 for Steroids (query over pipe) support
-####################################################################
-
-AC_ARG_ENABLE(dbus-fd-passing,
- AS_HELP_STRING([--enable-dbus-fd-passing],
- [enable DBus FD passing for faster IPC [[default=auto]]]),,
- [enable_dbus_fd_passing=auto])
-
-if test "x$enable_dbus_fd_passing" != "xno" ; then
- PKG_CHECK_EXISTS([dbus-1 >= 1.3.1],
- [have_dbus_fd_passing=yes],
- [have_dbus_fd_passing=no])
-
- if test "x$have_dbus_fd_passing" = "xyes"; then
- 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)"
-fi
-
-if test "x$enable_dbus_fd_passing" = "xyes"; then
- if test "x$have_dbus_fd_passing" != "xyes"; then
- AC_MSG_ERROR([Couldn't find a recent enough DBus for FD passing.])
- fi
-fi
-
-AM_CONDITIONAL(HAVE_DBUS_FD_PASSING, test "x$have_dbus_fd_passing" = "xyes")
-
##################################################################
# Enable mockup extractor module?
##################################################################
diff --git a/src/libtracker-bus/Makefile.am b/src/libtracker-bus/Makefile.am
index cf96e63..fcb2282 100644
--- a/src/libtracker-bus/Makefile.am
+++ b/src/libtracker-bus/Makefile.am
@@ -15,12 +15,6 @@ INCLUDES = \
$(GCOV_CFLAGS) \
$(GIO_CFLAGS)
-if HAVE_DBUS_FD_PASSING
-INCLUDES += -DHAVE_DBUS_FD_PASSING_IN_VALA=\"1\"
-else
-INCLUDES += -DHAVE_DBUS_FD_PASSING_IN_VALA=\"0\"
-endif
-
modules_LTLIBRARIES = libtracker-bus.la
libtracker_bus_la_VALASOURCES = \
@@ -34,8 +28,6 @@ libtracker_bus_la_SOURCES = \
tracker-bus-fd-cursor.c \
tracker-bus-fd-update.c \
tracker-bus-fd-update.h \
- tracker-bus-array-update.c \
- tracker-bus-array-update.h \
tracker-bus-shared.c \
tracker-bus-shared.h
@@ -47,12 +39,10 @@ noinst_HEADERS = \
# Vala sources
vapi_sources = \
- config.vapi \
$(top_builddir)/src/libtracker-sparql/tracker-sparql-$(TRACKER_API_VERSION).vapi \
$(top_srcdir)/src/libtracker-common/libtracker-common.vapi \
tracker-bus-fd-cursor.vapi \
- tracker-bus-fd-update.vapi \
- tracker-bus-array-update.vapi
+ tracker-bus-fd-update.vapi
libtracker-bus.vala.stamp: $(libtracker_bus_la_VALASOURCES) $(vapi_sources)
$(VALAC) $(GCOV_VALAFLAGS) -C $(VALAFLAGS) --pkg gio-2.0 --pkg dbus-glib-1 -H tracker-bus.h --vapi tracker-bus.vapi $^
@@ -75,10 +65,9 @@ MAINTAINERCLEANFILES = \
tracker-bus.h
EXTRA_DIST = \
- config.vapi \
$(libtracker_bus_la_VALASOURCES) \
libtracker-bus.vala.stamp \
tracker-bus.vapi \
tracker-bus-fd-cursor.vapi \
- tracker-bus-fd-update.vapi \
- tracker-bus-array-update.vapi
+ tracker-bus-fd-update.vapi
+
diff --git a/src/libtracker-bus/tracker-bus-fd-cursor.c b/src/libtracker-bus/tracker-bus-fd-cursor.c
index 1f5188b..760f5ee 100644
--- a/src/libtracker-bus/tracker-bus-fd-cursor.c
+++ b/src/libtracker-bus/tracker-bus-fd-cursor.c
@@ -257,7 +257,6 @@ tracker_bus_fd_query (DBusGConnection *gconnection,
GCancellable *cancellable,
GError **error)
{
-#ifdef HAVE_DBUS_FD_PASSING
DBusConnection *connection;
DBusMessage *message;
DBusMessageIter iter;
@@ -313,14 +312,8 @@ tracker_bus_fd_query (DBusGConnection *gconnection,
}
return TRACKER_SPARQL_CURSOR (cursor);
-#else /* HAVE_DBUS_FD_PASSING */
- g_assert_not_reached ();
- return NULL;
-#endif /* HAVE_DBUS_FD_PASSING */
}
-#ifdef HAVE_DBUS_FD_PASSING
-
static void
query_async_cb (gpointer buffer,
gssize buffer_size,
@@ -353,8 +346,6 @@ query_async_cb (gpointer buffer,
g_object_unref (res);
}
-#endif /* HAVE_DBUS_FD_PASSING */
-
void
tracker_bus_fd_query_async (DBusGConnection *gconnection,
const gchar *query,
@@ -362,7 +353,6 @@ tracker_bus_fd_query_async (DBusGConnection *gconnection,
GAsyncReadyCallback callback,
gpointer user_data)
{
-#ifdef HAVE_DBUS_FD_PASSING
GSimpleAsyncResult *res;
DBusConnection *connection;
DBusMessage *message;
@@ -406,9 +396,6 @@ tracker_bus_fd_query_async (DBusGConnection *gconnection,
cancellable,
query_async_cb, res);
/* message is destroyed by tracker_dbus_send_and_splice_async */
-#else /* HAVE_DBUS_FD_PASSING */
- g_assert_not_reached ();
-#endif /* HAVE_DBUS_FD_PASSING */
}
TrackerSparqlCursor *
diff --git a/src/libtracker-bus/tracker-bus-fd-update.c b/src/libtracker-bus/tracker-bus-fd-update.c
index 86c5846..a7baa13 100644
--- a/src/libtracker-bus/tracker-bus-fd-update.c
+++ b/src/libtracker-bus/tracker-bus-fd-update.c
@@ -36,8 +36,6 @@
#include "tracker-bus.h"
#include "tracker-bus-shared.h"
-#ifdef HAVE_DBUS_FD_PASSING
-
typedef enum {
FAST_UPDATE,
FAST_UPDATE_BLANK,
@@ -347,8 +345,6 @@ sparql_update_fast_async (DBusConnection *connection,
dbus_pending_call_set_notify (call, sparql_update_fast_callback, fad, NULL);
}
-#endif /* HAVE_DBUS_FD_PASSING */
-
/* Public API */
void
@@ -356,7 +352,6 @@ tracker_bus_fd_sparql_update (DBusGConnection *connection,
const char *query,
GError **error)
{
-#ifdef HAVE_DBUS_FD_PASSING
DBusMessage *reply;
g_return_if_fail (query != NULL);
@@ -369,9 +364,6 @@ tracker_bus_fd_sparql_update (DBusGConnection *connection,
}
dbus_message_unref (reply);
-#else
- g_assert_not_reached ();
-#endif /* HAVE_DBUS_FD_PASSING */
}
void
@@ -381,7 +373,6 @@ tracker_bus_fd_sparql_update_async (DBusGConnection *connection,
GAsyncReadyCallback callback,
gpointer user_data)
{
-#ifdef HAVE_DBUS_FD_PASSING
FastAsyncData *fad;
GError *error = NULL;
@@ -402,30 +393,21 @@ tracker_bus_fd_sparql_update_async (DBusGConnection *connection,
g_object_unref (fad->res);
fast_async_data_free (fad);
}
-
-#else
- g_assert_not_reached ();
-#endif /* HAVE_DBUS_FD_PASSING */
}
void
tracker_bus_fd_sparql_update_finish (GAsyncResult *res,
GError **error)
{
-#ifdef HAVE_DBUS_FD_PASSING
g_return_if_fail (res != NULL);
g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (res), error);
-#else /* HAVE_DBUS_FD_PASSING */
- g_assert_not_reached ();
-#endif /* HAVE_DBUS_FD_PASSING */
}
GVariant *
tracker_bus_fd_sparql_update_blank_finish (GAsyncResult *res,
GError **error)
{
-#ifdef HAVE_DBUS_FD_PASSING
g_return_val_if_fail (res != NULL, NULL);
if (g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (res), error)) {
@@ -433,10 +415,6 @@ tracker_bus_fd_sparql_update_blank_finish (GAsyncResult *res,
}
return g_variant_ref (g_simple_async_result_get_op_res_gpointer (G_SIMPLE_ASYNC_RESULT (res)));
-#else /* HAVE_DBUS_FD_PASSING */
- g_assert_not_reached ();
- return NULL;
-#endif /* HAVE_DBUS_FD_PASSING */
}
GVariant *
@@ -444,7 +422,6 @@ tracker_bus_fd_sparql_update_blank (DBusGConnection *connection,
const gchar *query,
GError **error)
{
-#ifdef HAVE_DBUS_FD_PASSING
DBusMessage *reply;
GVariant *result;
@@ -470,10 +447,6 @@ tracker_bus_fd_sparql_update_blank (DBusGConnection *connection,
dbus_message_unref (reply);
return result;
-#else /* HAVE_DBUS_FD_PASSING */
- g_assert_not_reached ();
- return NULL;
-#endif /* HAVE_DBUS_FD_PASSING */
}
void
@@ -483,7 +456,6 @@ tracker_bus_fd_sparql_update_blank_async (DBusGConnection *connection,
GAsyncReadyCallback callback,
gpointer user_data)
{
-#ifdef HAVE_DBUS_FD_PASSING
FastAsyncData *fad;
GError *error = NULL;
@@ -507,10 +479,6 @@ tracker_bus_fd_sparql_update_blank_async (DBusGConnection *connection,
g_object_unref (fad->res);
fast_async_data_free (fad);
}
-
-#else /* HAVE_DBUS_FD_PASSING */
- g_assert_not_reached ();
-#endif /* HAVE_DBUS_FD_PASSING */
}
void
@@ -518,7 +486,6 @@ tracker_bus_fd_sparql_batch_update (DBusGConnection *connection,
const char *query,
GError **error)
{
-#ifdef HAVE_DBUS_FD_PASSING
DBusMessage *reply;
g_return_if_fail (query != NULL);
@@ -531,9 +498,6 @@ tracker_bus_fd_sparql_batch_update (DBusGConnection *connection,
}
dbus_message_unref (reply);
-#else
- g_assert_not_reached ();
-#endif /* HAVE_DBUS_FD_PASSING */
}
void
@@ -543,7 +507,6 @@ tracker_bus_fd_sparql_batch_update_async (DBusGConnection *connection,
GAsyncReadyCallback callback,
gpointer user_data)
{
-#ifdef HAVE_DBUS_FD_PASSING
FastAsyncData *fad;
GError *error = NULL;
@@ -564,21 +527,13 @@ tracker_bus_fd_sparql_batch_update_async (DBusGConnection *connection,
g_object_unref (fad->res);
fast_async_data_free (fad);
}
-
-#else
- g_assert_not_reached ();
-#endif /* HAVE_DBUS_FD_PASSING */
}
void
tracker_bus_fd_sparql_batch_update_finish (GAsyncResult *res,
GError **error)
{
-#ifdef HAVE_DBUS_FD_PASSING
g_return_if_fail (res != NULL);
g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (res), error);
-#else /* HAVE_DBUS_FD_PASSING */
- g_assert_not_reached ();
-#endif /* HAVE_DBUS_FD_PASSING */
}
diff --git a/src/libtracker-bus/tracker-bus.vala b/src/libtracker-bus/tracker-bus.vala
index 5efe8b8..58fa0db 100644
--- a/src/libtracker-bus/tracker-bus.vala
+++ b/src/libtracker-bus/tracker-bus.vala
@@ -19,18 +19,6 @@
[DBus (name = "org.freedesktop.Tracker1.Resources", timeout = 2147483647 /* INT_MAX */)]
private interface Tracker.Bus.Resources : GLib.Object {
- public abstract string[,] sparql_query (string query) throws Sparql.Error, DBus.Error;
- [DBus (name = "SparqlQuery")]
- public abstract async string[,] sparql_query_async (string query) throws Sparql.Error, DBus.Error;
-
- public abstract void sparql_update (string query) throws Sparql.Error, DBus.Error;
- [DBus (name = "SparqlUpdate")]
- public abstract async void sparql_update_async (string query) throws Sparql.Error, DBus.Error;
-
- public abstract void batch_sparql_update (string query) throws Sparql.Error, DBus.Error;
- [DBus (name = "BatchSparqlUpdate")]
- public abstract async void batch_sparql_update_async (string query) throws Sparql.Error, DBus.Error;
-
public abstract void load (string uri) throws Sparql.Error, DBus.Error;
[DBus (name = "Load")]
public abstract async void load_async (string uri) throws Sparql.Error, DBus.Error;
@@ -51,23 +39,12 @@ public class Tracker.Bus.Connection : Tracker.Sparql.Connection {
static Resources resources_object;
static Statistics statistics_object;
static bool initialized;
- static bool use_steroids;
public Connection ()
requires (!initialized) {
initialized = true;
try {
- if (strcmp (Config.HAVE_DBUS_FD_PASSING_IN_VALA, "1") == 0) {
- string env_backend = Environment.get_variable ("TRACKER_BUS_BACKEND");
-
- if (env_backend == null || env_backend.ascii_casecmp ("dbus-glib") != 0) {
- use_steroids = true;
- }
- }
-
- debug ("Using steroids = %s", use_steroids ? "yes" : "no");
-
connection = DBus.Bus.get (DBus.BusType.SESSION);
// FIXME: Ideally we would just get these as and when we need them
@@ -92,17 +69,7 @@ public class Tracker.Bus.Connection : Tracker.Sparql.Connection {
public override Sparql.Cursor query (string sparql, Cancellable? cancellable) throws Sparql.Error, IOError {
try {
- if (use_steroids) {
- return tracker_bus_fd_query (connection, sparql, cancellable);
- } else {
- string[,] results = resources_object.sparql_query (sparql);
-
- if (cancellable != null && cancellable.is_cancelled ()) {
- throw new IOError.CANCELLED ("Operation was cancelled");
- }
-
- return new Tracker.Bus.ArrayCursor ((owned) results, results.length[0], results.length[1]);
- }
+ return tracker_bus_fd_query (connection, sparql, cancellable);
} catch (DBus.Error e) {
throw new Sparql.Error.INTERNAL (e.message);
}
@@ -110,17 +77,7 @@ public class Tracker.Bus.Connection : Tracker.Sparql.Connection {
public async override Sparql.Cursor query_async (string sparql, Cancellable? cancellable = null) throws Sparql.Error, IOError {
try {
- if (use_steroids) {
- return yield tracker_bus_fd_query_async (connection, sparql, cancellable);
- } else {
- string[,] results = yield resources_object.sparql_query_async (sparql);
-
- if (cancellable != null && cancellable.is_cancelled ()) {
- throw new IOError.CANCELLED ("Operation was cancelled");
- }
-
- return new Tracker.Bus.ArrayCursor ((owned) results, results.length[0], results.length[1]);
- }
+ return yield tracker_bus_fd_query_async (connection, sparql, cancellable);
} catch (DBus.Error e) {
throw new Sparql.Error.INTERNAL (e.message);
}
@@ -128,22 +85,10 @@ public class Tracker.Bus.Connection : Tracker.Sparql.Connection {
public override void update (string sparql, int priority = GLib.Priority.DEFAULT, Cancellable? cancellable = null) throws Sparql.Error, IOError {
try {
- if (use_steroids) {
- if (priority >= GLib.Priority.DEFAULT) {
- tracker_bus_fd_sparql_update (connection, sparql);
- } else {
- tracker_bus_fd_sparql_batch_update (connection, sparql);
- }
+ if (priority >= GLib.Priority.DEFAULT) {
+ tracker_bus_fd_sparql_update (connection, sparql);
} else {
- if (priority >= GLib.Priority.DEFAULT) {
- resources_object.sparql_update (sparql);
- } else {
- resources_object.batch_sparql_update (sparql);
- }
-
- if (cancellable != null && cancellable.is_cancelled ()) {
- throw new IOError.CANCELLED ("Operation was cancelled");
- }
+ tracker_bus_fd_sparql_batch_update (connection, sparql);
}
} catch (DBus.Error e) {
throw new Sparql.Error.INTERNAL (e.message);
@@ -152,22 +97,10 @@ public class Tracker.Bus.Connection : Tracker.Sparql.Connection {
public async override void update_async (string sparql, int priority = GLib.Priority.DEFAULT, Cancellable? cancellable = null) throws Sparql.Error, IOError {
try {
- if (use_steroids) {
- if (priority >= GLib.Priority.DEFAULT) {
- yield tracker_bus_fd_sparql_update_async (connection, sparql, cancellable);
- } else {
- yield tracker_bus_fd_sparql_batch_update_async (connection, sparql, cancellable);
- }
+ if (priority >= GLib.Priority.DEFAULT) {
+ yield tracker_bus_fd_sparql_update_async (connection, sparql, cancellable);
} else {
- if (priority >= GLib.Priority.DEFAULT) {
- yield resources_object.sparql_update_async (sparql);
- } else {
- yield resources_object.batch_sparql_update_async (sparql);
- }
-
- if (cancellable != null && cancellable.is_cancelled ()) {
- throw new IOError.CANCELLED ("Operation was cancelled");
- }
+ yield tracker_bus_fd_sparql_batch_update_async (connection, sparql, cancellable);
}
} catch (DBus.Error e) {
throw new Sparql.Error.INTERNAL (e.message);
@@ -177,16 +110,7 @@ public class Tracker.Bus.Connection : Tracker.Sparql.Connection {
public override GLib.Variant? update_blank (string sparql, int priority = GLib.Priority.DEFAULT, Cancellable? cancellable = null) throws Sparql.Error, IOError {
try {
GLib.Variant res = null;
-
- if (use_steroids) {
- res = tracker_bus_fd_sparql_update_blank (connection, sparql);
- } else {
- res = tracker_bus_array_sparql_update_blank (connection, sparql);
-
- if (cancellable != null && cancellable.is_cancelled ()) {
- throw new IOError.CANCELLED ("Operation was cancelled");
- }
- }
+ res = tracker_bus_fd_sparql_update_blank (connection, sparql);
return res;
} catch (DBus.Error e) {
throw new Sparql.Error.INTERNAL (e.message);
@@ -196,17 +120,7 @@ public class Tracker.Bus.Connection : Tracker.Sparql.Connection {
public async override GLib.Variant? update_blank_async (string sparql, int priority = GLib.Priority.DEFAULT, Cancellable? cancellable = null) throws Sparql.Error, IOError {
try {
GLib.Variant res = null;
-
- if (use_steroids) {
- res = yield tracker_bus_fd_sparql_update_blank_async (connection, sparql, cancellable);
- } else {
- res = yield tracker_bus_array_sparql_update_blank_async (connection, sparql, cancellable);
-
- if (cancellable != null && cancellable.is_cancelled ()) {
- throw new IOError.CANCELLED ("Operation was cancelled");
- }
- }
-
+ res = yield tracker_bus_fd_sparql_update_blank_async (connection, sparql, cancellable);
return res;
} catch (DBus.Error e) {
throw new Sparql.Error.INTERNAL (e.message);
diff --git a/src/libtracker-client/tracker.c b/src/libtracker-client/tracker.c
index 9e802ed..08641a0 100644
--- a/src/libtracker-client/tracker.c
+++ b/src/libtracker-client/tracker.c
@@ -119,9 +119,7 @@ typedef struct {
DBusGProxy *proxy_resources;
GHashTable *slow_pending_calls;
-#ifdef HAVE_DBUS_FD_PASSING
GHashTable *fast_pending_calls;
-#endif /* HAVE_DBUS_FS_PASSING */
guint last_call;
@@ -171,7 +169,6 @@ typedef struct {
#endif /* TRACKER_DISABLE_DEPRECATED */
struct TrackerResultIterator {
-#ifdef HAVE_DBUS_FD_PASSING
gchar *buffer;
gint buffer_index;
gssize buffer_size;
@@ -180,14 +177,8 @@ struct TrackerResultIterator {
gint *offsets;
gint *types;
gchar *data;
-#else /* HAVE_DBUS_FD_PASSING */
- GPtrArray *results;
- gint current_row;
-#endif /* HAVE_DBUS_FD_PASSING */
};
-#ifdef HAVE_DBUS_FD_PASSING
-
typedef enum {
FAST_QUERY,
FAST_UPDATE,
@@ -219,15 +210,6 @@ typedef struct {
FastAsyncData *data;
} FastPendingCallData;
-#else /* HAVE_DBUS_FD_PASSING */
-
-typedef struct {
- TrackerReplyIterator callback;
- gpointer user_data;
-} FastQueryAsyncCompatData;
-
-#endif /* HAVE_DBUS_FD_PASSING */
-
static gboolean is_service_available (void);
static void client_finalize (GObject *object);
static void client_set_property (GObject *object,
@@ -303,8 +285,6 @@ slow_pending_call_new (TrackerClient *client,
return id;
}
-#ifdef HAVE_DBUS_FD_PASSING
-
static void
fast_pending_call_destroy (gpointer data)
{
@@ -378,8 +358,6 @@ fast_async_data_new (TrackerClient *client,
return data;
}
-#endif /* HAVE_DBUS_FD_PASSING */
-
static void
writeback_cb (DBusGProxy *proxy,
const GHashTable *resources,
@@ -445,12 +423,10 @@ tracker_client_init (TrackerClient *client)
NULL,
(GDestroyNotify) slow_pending_call_destroy);
-#ifdef HAVE_DBUS_FD_PASSING
private->fast_pending_calls = g_hash_table_new_full (NULL,
NULL,
NULL,
(GDestroyNotify) fast_pending_call_destroy);
-#endif /* HAVE_DBUS_FD_PASSING */
}
static void
@@ -470,11 +446,9 @@ client_finalize (GObject *object)
g_hash_table_unref (private->slow_pending_calls);
}
-#ifdef HAVE_DBUS_FD_PASSING
if (private->fast_pending_calls) {
g_hash_table_unref (private->fast_pending_calls);
}
-#endif /* HAVE_DBUS_FD_PASSING */
}
static void
@@ -626,8 +600,6 @@ callback_with_void (DBusGProxy *proxy,
g_slice_free (CallbackVoid, cb);
}
-#ifdef HAVE_DBUS_FD_PASSING
-
static inline int
iterator_buffer_read_int (TrackerResultIterator *iterator)
{
@@ -689,38 +661,6 @@ callback_iterator (void *buffer,
fast_async_data_free (fad);
}
-#else /* HAVE_DBUS_FD_PASSING */
-
-static void
-callback_iterator_compat (GPtrArray *results,
- GError *error,
- gpointer user_data)
-{
- FastQueryAsyncCompatData *data = user_data;
- TrackerResultIterator *iterator;
-
- if (!data->callback) {
- g_slice_free (FastQueryAsyncCompatData, data);
- return;
- }
-
- if (error) {
- (* data->callback) (NULL, error, data->user_data);
- } else {
- iterator = g_slice_new0 (TrackerResultIterator);
- iterator->results = results;
- iterator->current_row = -1;
-
- (* data->callback) (iterator, error, data->user_data);
-
- tracker_result_iterator_free (iterator);
- }
-
- g_slice_free (FastQueryAsyncCompatData, data);
-}
-
-#endif /* HAVE_DBUS_FD_PASSING */
-
/* Deprecated and only used for 0.6 API */
static void
callback_with_array (DBusGProxy *proxy,
@@ -977,8 +917,6 @@ find_conversion (const char *format,
return start;
}
-#ifdef HAVE_DBUS_FD_PASSING
-
static GHashTable *
unmarshal_hash_table (DBusMessageIter *iter)
{
@@ -1256,8 +1194,6 @@ sparql_update_fast_async (TrackerClient *client,
dbus_pending_call_set_notify (call, sparql_update_fast_callback, fad, NULL);
}
-#endif /* HAVE_DBUS_FD_PASSING */
-
/**
* tracker_uri_vprintf_escaped:
* @format: a standard printf() format string, but notice
@@ -1469,7 +1405,6 @@ tracker_cancel_call (TrackerClient *client,
return TRUE;
}
-#ifdef HAVE_DBUS_FD_PASSING
/* Check fast pending data last */
data = g_hash_table_lookup (private->fast_pending_calls,
GUINT_TO_POINTER (call_id));
@@ -1513,7 +1448,6 @@ tracker_cancel_call (TrackerClient *client,
GUINT_TO_POINTER (call_id));
return TRUE;
}
-#endif /* HAVE_DBUS_FD_PASSING */
return FALSE;
}
@@ -1771,7 +1705,6 @@ tracker_resources_sparql_query_iterate (TrackerClient *client,
const gchar *query,
GError **error)
{
-#ifdef HAVE_DBUS_FD_PASSING
TrackerClientPrivate *private;
TrackerResultIterator *iterator;
DBusConnection *connection;
@@ -1825,26 +1758,6 @@ tracker_resources_sparql_query_iterate (TrackerClient *client,
}
return iterator;
-#else /* HAVE_DBUS_FD_PASSING */
- TrackerResultIterator *iterator;
- GError *inner_error = NULL;
-
- g_return_val_if_fail (TRACKER_IS_CLIENT (client), NULL);
- g_return_val_if_fail (query, NULL);
-
- iterator = g_slice_new0 (TrackerResultIterator);
-
- iterator->results = tracker_resources_sparql_query (client, query, &inner_error);
- iterator->current_row = -1;
-
- if (inner_error) {
- g_propagate_error (error, inner_error);
- g_slice_free (TrackerResultIterator, iterator);
- iterator = NULL;
- }
-
- return iterator;
-#endif /* HAVE_DBUS_FD_PASSING */
}
/**
@@ -1862,13 +1775,8 @@ tracker_result_iterator_free (TrackerResultIterator *iterator)
{
g_return_if_fail (iterator != NULL);
-#ifndef HAVE_DBUS_FD_PASSING
- g_ptr_array_foreach (iterator->results, (GFunc) g_free, NULL);
- g_ptr_array_free (iterator->results, TRUE);
-#else /* HAVE_DBUS_FD_PASSING */
g_free (iterator->buffer);
g_slice_free (TrackerResultIterator, iterator);
-#endif /* HAVE_DBUS_FD_PASSING */
}
/**
@@ -1884,28 +1792,9 @@ tracker_result_iterator_free (TrackerResultIterator *iterator)
guint
tracker_result_iterator_n_columns (TrackerResultIterator *iterator)
{
-#ifdef HAVE_DBUS_FD_PASSING
-
g_return_val_if_fail (iterator != NULL, 0);
return iterator->n_columns;
-#else /* HAVE_DBUS_FD_PASSING */
- GStrv row;
- guint i = 0;
-
- g_return_val_if_fail (iterator != NULL, 0);
-
- if (!iterator->results->len) {
- return 0;
- }
-
- row = g_ptr_array_index (iterator->results, 0);
-
- while (row[i++]) {
- }
-
- return i - 1;
-#endif /* HAVE_DBUS_FD_PASSING */
}
/**
@@ -1923,14 +1812,10 @@ tracker_result_iterator_n_columns (TrackerResultIterator *iterator)
gboolean
tracker_result_iterator_next (TrackerResultIterator *iterator)
{
-#ifdef HAVE_DBUS_FD_PASSING
int last_offset;
-#endif
g_return_val_if_fail (iterator != NULL, FALSE);
-#ifdef HAVE_DBUS_FD_PASSING
-
if (iterator->buffer_index >= iterator->buffer_size) {
return FALSE;
}
@@ -1954,14 +1839,6 @@ tracker_result_iterator_next (TrackerResultIterator *iterator)
iterator->buffer_index += last_offset + 1;
return TRUE;
-#else /* HAVE_DBUS_FD_PASSING */
- if (iterator->current_row < (gint)iterator->results->len - 1) {
- iterator->current_row++;
- return TRUE;
- } else {
- return FALSE;
- }
-#endif /* HAVE_DBUS_FD_PASSING */
}
/**
@@ -1982,7 +1859,6 @@ const gchar *
tracker_result_iterator_value (TrackerResultIterator *iterator,
guint column)
{
-#ifdef HAVE_DBUS_FD_PASSING
g_return_val_if_fail (iterator != NULL, NULL);
g_return_val_if_fail (column < tracker_result_iterator_n_columns (iterator), NULL);
@@ -1991,22 +1867,6 @@ tracker_result_iterator_value (TrackerResultIterator *iterator,
} else {
return iterator->data + iterator->offsets[column - 1] + 1;
}
-#else /* HAVE_DBUS_FD_PASSING */
- GStrv row;
-
- g_return_val_if_fail (iterator != NULL, NULL);
- g_return_val_if_fail (column < tracker_result_iterator_n_columns (iterator), NULL);
-
- if (!iterator->results->len) {
- return NULL;
- }
-
- g_return_val_if_fail (iterator->current_row < (gint) iterator->results->len, NULL);
-
- row = g_ptr_array_index (iterator->results, iterator->current_row);
-
- return row[column];
-#endif /* HAVE_DBUS_FD_PASSING */
}
/**
@@ -2032,7 +1892,6 @@ tracker_resources_sparql_update (TrackerClient *client,
const gchar *query,
GError **error)
{
-#ifdef HAVE_DBUS_FD_PASSING
DBusMessage *reply;
g_return_if_fail (TRACKER_IS_CLIENT (client));
@@ -2045,18 +1904,6 @@ tracker_resources_sparql_update (TrackerClient *client,
}
dbus_message_unref (reply);
-#else /* HAVE_DBUS_FD_PASSING */
- TrackerClientPrivate *private;
-
- g_return_if_fail (TRACKER_IS_CLIENT (client));
- g_return_if_fail (query != NULL);
-
- private = TRACKER_CLIENT_GET_PRIVATE (client);
-
- org_freedesktop_Tracker1_Resources_sparql_update (private->proxy_resources,
- query,
- error);
-#endif /* HAVE_DBUS_FD_PASSING */
}
/**
@@ -2074,7 +1921,6 @@ tracker_resources_sparql_update_blank (TrackerClient *client,
const gchar *query,
GError **error)
{
-#ifdef HAVE_DBUS_FD_PASSING
DBusMessage *reply;
DBusMessageIter iter, subiter, subsubiter;
GPtrArray *result;
@@ -2119,24 +1965,6 @@ tracker_resources_sparql_update_blank (TrackerClient *client,
dbus_message_unref (reply);
return result;
-#else /* HAVE_DBUS_FD_PASSING */
- TrackerClientPrivate *private;
- GPtrArray *result;
-
- g_return_val_if_fail (TRACKER_IS_CLIENT (client), NULL);
- g_return_val_if_fail (query != NULL, NULL);
-
- private = TRACKER_CLIENT_GET_PRIVATE (client);
-
- if (!org_freedesktop_Tracker1_Resources_sparql_update_blank (private->proxy_resources,
- query,
- &result,
- error)) {
- return NULL;
- }
-
- return result;
-#endif /* HAVE_DBUS_FD_PASSING */
}
/**
@@ -2159,7 +1987,6 @@ tracker_resources_batch_sparql_update (TrackerClient *client,
const gchar *query,
GError **error)
{
-#ifdef HAVE_DBUS_FD_PASSING
DBusMessage *reply;
reply = sparql_update_fast (client, query, FAST_UPDATE_BATCH, error);
@@ -2169,18 +1996,6 @@ tracker_resources_batch_sparql_update (TrackerClient *client,
}
dbus_message_unref (reply);
-#else /* HAVE_DBUS_FD_PASSING */
- TrackerClientPrivate *private;
-
- g_return_if_fail (TRACKER_IS_CLIENT (client));
- g_return_if_fail (query != NULL);
-
- private = TRACKER_CLIENT_GET_PRIVATE (client);
-
- org_freedesktop_Tracker1_Resources_batch_sparql_update (private->proxy_resources,
- query,
- error);
-#endif /* HAVE_DBUS_FD_PASSING */
}
/**
@@ -2352,7 +2167,6 @@ tracker_resources_sparql_query_iterate_async (TrackerClient *client,
TrackerReplyIterator callback,
gpointer user_data)
{
-#ifdef HAVE_DBUS_FD_PASSING
TrackerClientPrivate *private;
DBusConnection *connection;
DBusMessage *message;
@@ -2415,18 +2229,6 @@ tracker_resources_sparql_query_iterate_async (TrackerClient *client,
fad);
return fad->request_id;
-#else /* HAVE_DBUS_FD_PASSING */
- FastQueryAsyncCompatData *data;
-
- data = g_slice_new0 (FastQueryAsyncCompatData);
- data->callback = callback;
- data->user_data = user_data;
-
- return tracker_resources_sparql_query_async (client,
- query,
- callback_iterator_compat,
- data);
-#endif /* HAVE_DBUS_FD_PASSING */
}
/**
@@ -2449,7 +2251,6 @@ tracker_resources_sparql_update_async (TrackerClient *client,
TrackerReplyVoid callback,
gpointer user_data)
{
-#ifdef HAVE_DBUS_FD_PASSING
FastAsyncData *fad;
GError *error = NULL;
@@ -2475,31 +2276,6 @@ tracker_resources_sparql_update_async (TrackerClient *client,
}
return fad->request_id;
-#else /* HAVE_DBUS_FD_PASSING */
- TrackerClientPrivate *private;
- CallbackVoid *cb;
- DBusGProxyCall *call;
-
- g_return_val_if_fail (TRACKER_IS_CLIENT (client), 0);
- g_return_val_if_fail (query != NULL, 0);
- g_return_val_if_fail (callback != NULL, 0);
-
- private = TRACKER_CLIENT_GET_PRIVATE (client);
-
- cb = g_slice_new0 (CallbackVoid);
- cb->func = callback;
- cb->data = user_data;
- cb->client = g_object_ref (client);
-
- call = org_freedesktop_Tracker1_Resources_sparql_update_async (private->proxy_resources,
- query,
- callback_with_void,
- cb);
-
- cb->id = slow_pending_call_new (client, private->proxy_resources, call);
-
- return cb->id;
-#endif /* HAVE_DBUS_FD_PASSING */
}
/**
@@ -2522,7 +2298,6 @@ tracker_resources_sparql_update_blank_async (TrackerClient *client,
TrackerReplyGPtrArray callback,
gpointer user_data)
{
-#ifdef HAVE_DBUS_FD_PASSING
FastAsyncData *fad;
GError *error = NULL;
@@ -2548,31 +2323,6 @@ tracker_resources_sparql_update_blank_async (TrackerClient *client,
}
return fad->request_id;
-#else /* HAVE_DBUS_FD_PASSING */
- TrackerClientPrivate *private;
- CallbackGPtrArray *cb;
- DBusGProxyCall *call;
-
- g_return_val_if_fail (TRACKER_IS_CLIENT (client), 0);
- g_return_val_if_fail (query != NULL, 0);
- g_return_val_if_fail (callback != NULL, 0);
-
- private = TRACKER_CLIENT_GET_PRIVATE (client);
-
- cb = g_slice_new0 (CallbackGPtrArray);
- cb->func = callback;
- cb->data = user_data;
- cb->client = g_object_ref (client);
-
- call = org_freedesktop_Tracker1_Resources_sparql_update_blank_async (private->proxy_resources,
- query,
- callback_with_gptrarray,
- cb);
-
- cb->id = slow_pending_call_new (client, private->proxy_resources, call);
-
- return cb->id;
-#endif /* HAVE_DBUS_FD_PASSING */
}
/**
@@ -2597,7 +2347,6 @@ tracker_resources_batch_sparql_update_async (TrackerClient *client,
TrackerReplyVoid callback,
gpointer user_data)
{
-#ifdef HAVE_DBUS_FD_PASSING
FastAsyncData *fad;
GError *error = NULL;
@@ -2623,31 +2372,6 @@ tracker_resources_batch_sparql_update_async (TrackerClient *client,
}
return fad->request_id;
-#else /* HAVE_DBUS_FD_PASSING */
- TrackerClientPrivate *private;
- CallbackVoid *cb;
- DBusGProxyCall *call;
-
- g_return_val_if_fail (TRACKER_IS_CLIENT (client), 0);
- g_return_val_if_fail (query != NULL, 0);
- g_return_val_if_fail (callback != NULL, 0);
-
- private = TRACKER_CLIENT_GET_PRIVATE (client);
-
- cb = g_slice_new0 (CallbackVoid);
- cb->func = callback;
- cb->data = user_data;
- cb->client = g_object_ref (client);
-
- call = org_freedesktop_Tracker1_Resources_batch_sparql_update_async (private->proxy_resources,
- query,
- callback_with_void,
- cb);
-
- cb->id = slow_pending_call_new (client, private->proxy_resources, call);
-
- return cb->id;
-#endif /* HAVE_DBUS_FD_PASSING */
}
/**
diff --git a/src/miners/fs/tracker-miner-files.c b/src/miners/fs/tracker-miner-files.c
index 6438863..1ab9577 100644
--- a/src/miners/fs/tracker-miner-files.c
+++ b/src/miners/fs/tracker-miner-files.c
@@ -72,11 +72,7 @@ struct ProcessFileData {
TrackerSparqlBuilder *sparql;
GCancellable *cancellable;
GFile *file;
-#ifdef HAVE_DBUS_FD_PASSING
DBusPendingCall *call;
-#else /* HAVE_DBUS_FD_PASSING */
- DBusGProxyCall *call;
-#endif /* HAVE_DBUS_FD_PASSING */
};
typedef struct {
@@ -1962,11 +1958,6 @@ extractor_get_embedded_metadata_cb (DBusGProxy *proxy,
tracker_miner_fs_file_notify (TRACKER_MINER_FS (data->miner), data->file, NULL);
process_file_data_free (data);
-#ifndef HAVE_DBUS_FD_PASSING
- /* When using DBus FD passing, we let the caller free */
- g_free (preupdate);
- g_free (sparql);
-#endif /* HAVE_DBUS_FD_PASSING */
}
static void
@@ -1976,10 +1967,6 @@ extractor_get_embedded_metadata_cancel (GCancellable *cancellable,
GError *error;
/* Cancel extractor call */
-#ifndef HAVE_DBUS_FD_PASSING
- dbus_g_proxy_cancel_call (data->miner->private->extractor_proxy,
- data->call);
-#endif /* HAVE_DBUS_FD_PASSING */
error = g_error_new_literal (miner_files_error_quark, 0, "Embedded metadata extraction was cancelled");
tracker_miner_fs_file_notify (TRACKER_MINER_FS (data->miner), data->file, error);
@@ -1988,7 +1975,6 @@ extractor_get_embedded_metadata_cancel (GCancellable *cancellable,
g_error_free (error);
}
-#ifdef HAVE_DBUS_FD_PASSING
static FastAsyncData*
fast_async_data_new (org_freedesktop_Tracker1_Extract_get_metadata_reply callback,
gpointer user_data)
@@ -2089,14 +2075,12 @@ get_metadata_fast_async (DBusConnection *connection,
get_metadata_fast_cb,
data);
}
-#endif /* HAVE_DBUS_FD_PASSING */
static void
extractor_get_embedded_metadata (ProcessFileData *data,
const gchar *uri,
const gchar *mime_type)
{
-#ifdef HAVE_DBUS_FD_PASSING
get_metadata_fast_async (dbus_g_connection_get_connection (data->miner->private->connection),
uri,
mime_type,
@@ -2104,13 +2088,7 @@ extractor_get_embedded_metadata (ProcessFileData *data,
extractor_get_embedded_metadata_cb,
data);
data->call = NULL;
-#else /* HAVE_DBUS_FD_PASSING */
- data->call = org_freedesktop_Tracker1_Extract_get_metadata_async (data->miner->private->extractor_proxy,
- uri,
- mime_type,
- extractor_get_embedded_metadata_cb,
- data);
-#endif
+
g_signal_connect (data->cancellable, "cancelled",
G_CALLBACK (extractor_get_embedded_metadata_cancel), data);
}
diff --git a/src/tracker-extract/tracker-dbus.c b/src/tracker-extract/tracker-dbus.c
index c92e48a..675e5f6 100644
--- a/src/tracker-extract/tracker-dbus.c
+++ b/src/tracker-extract/tracker-dbus.c
@@ -177,8 +177,6 @@ tracker_dbus_register_objects (gpointer object)
return TRUE;
}
-#ifdef HAVE_DBUS_FD_PASSING
-
gboolean
tracker_dbus_connection_add_filter (DBusHandleMessageFunction function,
void *user_data)
@@ -196,8 +194,6 @@ tracker_dbus_connection_add_filter (DBusHandleMessageFunction function,
return TRUE;
}
-#endif /* HAVE_DBUS_FD_PASSING */
-
GObject *
tracker_dbus_get_object (GType type)
{
diff --git a/src/tracker-extract/tracker-dbus.h b/src/tracker-extract/tracker-dbus.h
index 1b6ee6c..5e7e335 100644
--- a/src/tracker-extract/tracker-dbus.h
+++ b/src/tracker-extract/tracker-dbus.h
@@ -31,10 +31,8 @@ G_BEGIN_DECLS
gboolean tracker_dbus_init (void);
void tracker_dbus_shutdown (void);
gboolean tracker_dbus_register_objects (gpointer object);
-#ifdef HAVE_DBUS_FD_PASSING
gboolean tracker_dbus_connection_add_filter (DBusHandleMessageFunction function,
void *user_data);
-#endif /* HAVE_DBUS_FD_PASSING */
GObject *tracker_dbus_get_object (GType type);
G_END_DECLS
diff --git a/src/tracker-extract/tracker-extract.c b/src/tracker-extract/tracker-extract.c
index 00b948c..ceda722 100644
--- a/src/tracker-extract/tracker-extract.c
+++ b/src/tracker-extract/tracker-extract.c
@@ -656,7 +656,6 @@ tracker_extract_get_metadata (TrackerExtract *object,
}
}
-#ifdef HAVE_DBUS_FD_PASSING
static void
get_metadata_fast (TrackerExtract *object,
DBusConnection *connection,
@@ -872,4 +871,3 @@ tracker_extract_connection_filter (DBusConnection *connection,
return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
}
-#endif /* HAVE_DBUS_FD_PASSING */
diff --git a/src/tracker-extract/tracker-extract.h b/src/tracker-extract/tracker-extract.h
index 2542a41..3d185df 100644
--- a/src/tracker-extract/tracker-extract.h
+++ b/src/tracker-extract/tracker-extract.h
@@ -61,11 +61,9 @@ void tracker_extract_get_metadata (TrackerExtract
const gchar *mime,
DBusGMethodInvocation *context,
GError **error);
-#ifdef HAVE_DBUS_FD_PASSING
DBusHandlerResult tracker_extract_connection_filter (DBusConnection *connection,
DBusMessage *message,
void *user_data);
-#endif /* HAVE_DBUS_FD_PASSING */
/* Not DBus API */
void tracker_extract_get_metadata_by_cmdline (TrackerExtract *object,
diff --git a/src/tracker-extract/tracker-main.c b/src/tracker-extract/tracker-main.c
index a99a249..c29981b 100644
--- a/src/tracker-extract/tracker-main.c
+++ b/src/tracker-extract/tracker-main.c
@@ -440,10 +440,8 @@ main (int argc, char *argv[])
return EXIT_FAILURE;
}
-#ifdef HAVE_DBUS_FD_PASSING
tracker_dbus_connection_add_filter (tracker_extract_connection_filter,
object);
-#endif
g_message ("Waiting for D-Bus requests...");
diff --git a/src/tracker-store/Makefile.am b/src/tracker-store/Makefile.am
index a1549ee..e0bf065 100644
--- a/src/tracker-store/Makefile.am
+++ b/src/tracker-store/Makefile.am
@@ -49,13 +49,9 @@ tracker_store_SOURCES = \
tracker-store.c \
tracker-store.h \
tracker-status.c \
- tracker-status.h
-
-if HAVE_DBUS_FD_PASSING
-tracker_store_SOURCES += \
+ tracker-status.h \
tracker-steroids.c \
tracker-steroids.h
-endif
if OS_WIN32
tracker_store_win_libs = -lws2_32 -lkernel32
diff --git a/src/tracker-store/tracker-dbus.c b/src/tracker-store/tracker-dbus.c
index b568015..208d74f 100644
--- a/src/tracker-store/tracker-dbus.c
+++ b/src/tracker-store/tracker-dbus.c
@@ -39,19 +39,14 @@
#include "tracker-backup.h"
#include "tracker-backup-glue.h"
#include "tracker-marshal.h"
-
-#ifdef HAVE_DBUS_FD_PASSING
#include "tracker-steroids.h"
-#endif
static DBusGConnection *connection;
static DBusGProxy *gproxy;
static GSList *objects;
static TrackerStatus *notifier;
static TrackerBackup *backup;
-#ifdef HAVE_DBUS_FD_PASSING
static TrackerSteroids *steroids;
-#endif
static gboolean
dbus_register_service (DBusGProxy *proxy,
@@ -185,32 +180,31 @@ dbus_set_available (gboolean available)
tracker_dbus_register_objects ();
}
} else {
- GSList *l;
+ GSList *l;
- if (objects) {
- dbus_g_proxy_disconnect_signal (gproxy,
- "NameOwnerChanged",
- G_CALLBACK (name_owner_changed_cb),
- tracker_dbus_get_object (TRACKER_TYPE_RESOURCES));
- }
+ if (objects) {
+ dbus_g_proxy_disconnect_signal (gproxy,
+ "NameOwnerChanged",
+ G_CALLBACK (name_owner_changed_cb),
+ tracker_dbus_get_object (TRACKER_TYPE_RESOURCES));
+ }
-#ifdef HAVE_DBUS_FD_PASSING
- if (steroids) {
+ if (steroids) {
dbus_connection_remove_filter (dbus_g_connection_get_connection (connection),
tracker_steroids_connection_filter,
steroids);
g_object_unref (steroids);
steroids = NULL;
- }
-#endif
+ }
- for (l = objects; l; l = l->next) {
- dbus_g_connection_unregister_g_object (connection, l->data);
- g_object_unref (l->data);
- }
- g_slist_free (objects);
- objects = NULL;
+ for (l = objects; l; l = l->next) {
+ dbus_g_connection_unregister_g_object (connection, l->data);
+ g_object_unref (l->data);
+ }
+
+ g_slist_free (objects);
+ objects = NULL;
}
}
@@ -304,7 +298,6 @@ tracker_dbus_register_objects (void)
TRACKER_RESOURCES_PATH);
objects = g_slist_prepend (objects, object);
-#ifdef HAVE_DBUS_FD_PASSING
if (!steroids) {
/* Add org.freedesktop.Tracker1.Steroids */
steroids = tracker_steroids_new ();
@@ -320,7 +313,6 @@ tracker_dbus_register_objects (void)
/* Note: TrackerSteroids should not go to the 'objects' list, as it is
* a filter, not an object registered */
}
-#endif
/* Reverse list since we added objects at the top each time */
objects = g_slist_reverse (objects);
@@ -373,11 +365,9 @@ tracker_dbus_get_object (GType type)
}
}
-#ifdef HAVE_DBUS_FD_PASSING
if (steroids && type == TRACKER_TYPE_STEROIDS) {
return G_OBJECT (steroids);
}
-#endif /* HAVE_DBUS_FD_PASSING */
if (notifier && type == TRACKER_TYPE_STATUS) {
return G_OBJECT (notifier);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
