[tracker/direct-access-update-fd-passing: 2/3] squash

[Philip Van Hoof <pvanhoof src gnome org>]

commit 1a73d8429b30417d665a42a1b45e763bab155345
Author: Philip Van Hoof <philip codeminded be>
Date:   Tue Jul 20 14:56:08 2010 +0200

    squash

 src/libtracker-bus/Makefile.am             |    5 ++-
 src/libtracker-bus/tracker-bus-fd-update.c |    5 ++-
 src/libtracker-bus/tracker-bus-fd-update.h |   44 ++++++++++++++++++++++++++++
 src/libtracker-bus/tracker-bus.vala        |    4 --
 4 files changed, 50 insertions(+), 8 deletions(-)
---
diff --git a/src/libtracker-bus/Makefile.am b/src/libtracker-bus/Makefile.am
index baeb939..5f5e820 100644
--- a/src/libtracker-bus/Makefile.am
+++ b/src/libtracker-bus/Makefile.am
@@ -24,7 +24,8 @@ libtracker_bus_ TRACKER_API_VERSION@_la_SOURCES = 	\
 	libtracker-bus.vala.stamp			\
 	$(libtracker_bus_la_VALASOURCES:.vala=.c)	\
 	tracker-bus-fd-cursor.c				\
-	tracker-bus-fd-update.c
+	tracker-bus-fd-update.c				\
+	tracker-bus-fd-update.h
 
 libtracker_bus_ TRACKER_API_VERSION@_la_LDFLAGS = 	\
 	-shared -fPIC -module -avoid-version
@@ -46,7 +47,7 @@ vapi_DATA = \
 	tracker-bus-$(TRACKER_API_VERSION).vapi
 
 libtracker-bus.vala.stamp: $(libtracker_bus_la_VALASOURCES) $(vapi_sources)
-	$(AM_V_GEN)$(VALAC) $(GCOV_VALAFLAGS) -C $(VALAFLAGS) --pkg gio-2.0 --pkg dbus-glib-1 -H tracker-bus.h --vapi tracker-bus-$(TRACKER_API_VERSION).vapi $^
+	$(AM_V_GEN)$(VALAC) $(GCOV_VALAFLAGS) -C $(VALAFLAGS) --pkg gio-2.0 --pkg dbus-glib-1 -H tracker-bus.h --vapi tracker-bus-$(TRACKER_API_VERSION).vapi tracker-bus-fd-update.vapi $^
 	$(AM_V_GEN)touch $@
 
 libtracker_bus_ TRACKER_API_VERSION@_la_LIBADD = 						\
diff --git a/src/libtracker-bus/tracker-bus-fd-update.c b/src/libtracker-bus/tracker-bus-fd-update.c
index a4cd57f..471ccdf 100644
--- a/src/libtracker-bus/tracker-bus-fd-update.c
+++ b/src/libtracker-bus/tracker-bus-fd-update.c
@@ -1,7 +1,7 @@
 /*
  * Copyright (C) 2006, Jamie McCracken <jamiemcc gnome org>
  * Copyright (C) 2008-2010, Nokia <ivan frade nokia com>
- * Copyright (C) 2010, Codeminded BVBA <abustany gnome org>
+ * Copyright (C) 2010, Codeminded BVBA <philip codeminded be>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -26,10 +26,11 @@
 #include <sys/types.h>
 #include <unistd.h>
 
+#include <glib-object.h>
 #include <libtracker-common/tracker-common.h>
-
 #include <libtracker-sparql/tracker-sparql.h>
 
+#include "tracker-bus-fd-update.h"
 #include "tracker-bus.h"
 
 #ifdef HAVE_DBUS_FD_PASSING
diff --git a/src/libtracker-bus/tracker-bus-fd-update.h b/src/libtracker-bus/tracker-bus-fd-update.h
new file mode 100644
index 0000000..98b4ca2
--- /dev/null
+++ b/src/libtracker-bus/tracker-bus-fd-update.h
@@ -0,0 +1,44 @@
+/*
+ * Copyright (C) 2006, Jamie McCracken <jamiemcc gnome org>
+ * Copyright (C) 2008-2010, Nokia <ivan frade nokia com>
+ * Copyright (C) 2010, Codeminded BVBA <philip codeminded be>
+ *
+ * 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.
+ */
+
+
+G_BEGIN_DECLS
+
+void        tracker_bus_fd_sparql_update             (DBusGConnection       *connection,
+                                                      const char            *query,
+                                                      GError               **error);
+void        tracker_bus_fd_sparql_update_async       (DBusGConnection       *connection,
+                                                      const char            *query,
+                                                      GCancellable          *cancellable,
+                                                      GAsyncReadyCallback    callback,
+                                                      gpointer               user_data);
+/* 
+GPtrArray * tracker_bus_fd_sparql_update_blank       (DBusGConnection       *connection,
+                                                      const gchar           *query,
+                                                      GError               **error);
+void        tracker_bus_fd_sparql_update_blank_async (DBusGConnection       *connection,
+                                                      const gchar           *query,
+                                                      GCancellable          *cancellable,
+                                                      GAsyncReadyCallback    callback,
+                                                      gpointer               user_data);
+*/
+
+G_END_DECLS
diff --git a/src/libtracker-bus/tracker-bus.vala b/src/libtracker-bus/tracker-bus.vala
index 21aa8fa..d7aa5a3 100644
--- a/src/libtracker-bus/tracker-bus.vala
+++ b/src/libtracker-bus/tracker-bus.vala
@@ -29,10 +29,6 @@ private interface Tracker.Bus.Resources : GLib.Object {
 
 // Imported DBus FD APIs until we have support with Vala
 public extern Tracker.Sparql.Cursor tracker_bus_fd_query (DBus.Connection connection, string query) throws GLib.Error;
-public extern void tracker_bus_fd_sparql_update (DBus.Connection connection, string query) throws GLib.Error;
-// public extern GLib.PtrArray tracker_bus_fd_sparql_update_blank (DBus.Connection connection, string query) throws GLib.Error;
-public extern async void tracker_bus_fd_sparql_update_async (DBus.Connection connection, string query, Cancellable? cancellable = null);
-// public extern async uint tracker_bus_fd_sparql_update_blank_async (DBus.Connection connection, string query, Cancellable? cancellable = null);
 
 public errordomain Tracker.BusError {
 	UNSUPPORTED