[tracker/gdbus: 91/92] libtracker-common: Eradicate dbus-glib from common library
- From: Jürg Billeter <juergbi src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [tracker/gdbus: 91/92] libtracker-common: Eradicate dbus-glib from common library
- Date: Mon, 17 Jan 2011 09:39:19 +0000 (UTC)
commit d23a71c81f22f19aefede305f5fa3b66a392bcd3
Author: Philip Van Hoof <philip codeminded be>
Date: Fri Jan 14 15:42:01 2011 +0100
libtracker-common: Eradicate dbus-glib from common library
configure.ac | 18 ++++-----
src/libtracker-common/tracker-dbus.c | 74 +++++++++++++++-------------------
src/libtracker-common/tracker-dbus.h | 23 ----------
tests/libtracker-common/Makefile.am | 22 ++++++----
4 files changed, 53 insertions(+), 84 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index f1f4df5..243c3c3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -231,9 +231,7 @@ LIBTRACKER_CLIENT_CFLAGS="$LIBTRACKER_CLIENT_CFLAGS -Wno-deprecated-declarations
# Check requirements for libtracker-common
LIBTRACKER_COMMON_REQUIRED="glib-2.0 >= $GLIB_REQUIRED
- gio-unix-2.0 >= $GLIB_REQUIRED
- dbus-1 >= $DBUS_REQUIRED
- dbus-glib-1 >= $DBUS_GLIB_REQUIRED"
+ gio-unix-2.0 >= $GLIB_REQUIRED"
PKG_CHECK_MODULES(LIBTRACKER_COMMON, [$LIBTRACKER_COMMON_REQUIRED])
@@ -269,8 +267,7 @@ PKG_CHECK_MODULES(LIBTRACKER_FTS, [$LIBTRACKER_FTS_REQUIRED])
# Check requirements for libtracker-miner
LIBTRACKER_MINER_REQUIRED="glib-2.0 >= $GLIB_REQUIRED
gio-unix-2.0 >= $GLIB_REQUIRED
- dbus-1 >= $DBUS_REQUIRED
- dbus-glib-1 >= $DBUS_GLIB_REQUIRED"
+ dbus-1 >= $DBUS_REQUIRED"
PKG_CHECK_MODULES(LIBTRACKER_MINER, [$LIBTRACKER_MINER_REQUIRED])
@@ -716,8 +713,8 @@ if test "x$enable_upower" != "xno"; then
[have_upower=yes],
[have_upower=no])
- LIBTRACKER_COMMON_CFLAGS="$LIBTRACKER_COMMON_CFLAGS $UPOWER_CFLAGS"
- LIBTRACKER_COMMON_LIBS="$LIBTRACKER_COMMON_LIBS $UPOWER_LIBS"
+ TRACKER_MINER_FS_CFLAGS="$TRACKER_MINER_FS_CFLAGS $UPOWER_CFLAGS"
+ TRACKER_MINER_FS_LIBS="$TRACKER_MINER_FS_LIBS $UPOWER_LIBS"
if test "x$have_upower" = "xyes"; then
AC_DEFINE(HAVE_UPOWER, [], [Define if we have UPOWER])
@@ -745,12 +742,13 @@ AC_ARG_ENABLE(hal,
if test "x$have_upower" != "xyes" && test "x$enable_hal" != "xno"; then
PKG_CHECK_MODULES(HAL,
- [hal >= $HAL_REQUIRED],
+ [dbus-1 >= $DBUS_REQUIRED
+ hal >= $HAL_REQUIRED],
[have_hal=yes] ,
[have_hal=no])
- LIBTRACKER_COMMON_CFLAGS="$LIBTRACKER_COMMON_CFLAGS $HAL_CFLAGS"
- LIBTRACKER_COMMON_LIBS="$LIBTRACKER_COMMON_LIBS $HAL_LIBS"
+ TRACKER_MINER_FS_CFLAGS="$TRACKER_MINER_FS_CFLAGS $HAL_CFLAGS"
+ TRACKER_MINER_FS_LIBS="$TRACKER_MINER_FS_LIBS $HAL_LIBS"
if test "x$have_hal" = "xyes"; then
AC_DEFINE(HAVE_HAL, [], [Define if we have HAL])
diff --git a/src/libtracker-common/tracker-dbus.c b/src/libtracker-common/tracker-dbus.c
index 7ac6d77..0c9f9c6 100644
--- a/src/libtracker-common/tracker-dbus.c
+++ b/src/libtracker-common/tracker-dbus.c
@@ -23,8 +23,6 @@
#include <gio/gunixinputstream.h>
#include <gio/gunixoutputstream.h>
-#include <dbus/dbus-glib-bindings.h>
-
#include "tracker-dbus.h"
#include "tracker-log.h"
@@ -47,9 +45,8 @@ struct _TrackerDBusRequest {
};
static gboolean client_lookup_enabled;
-static DBusGConnection *freedesktop_connection;
-static DBusGProxy *freedesktop_proxy;
static GHashTable *clients;
+static GDBusConnection *connection;
static void client_data_free (gpointer data);
static gboolean client_clean_up_cb (gpointer data);
@@ -58,30 +55,13 @@ static gboolean
clients_init (void)
{
GError *error = NULL;
- DBusGConnection *conn;
-
- conn = dbus_g_bus_get (DBUS_BUS_SESSION, &error);
+ connection = g_bus_get_sync (G_BUS_TYPE_SESSION, NULL, &error);
- if (!conn) {
+ if (error) {
g_critical ("Could not connect to the D-Bus session bus, %s",
error ? error->message : "no error given.");
- g_error_free (error);
- return FALSE;
- }
-
- freedesktop_connection = dbus_g_connection_ref (conn);
-
- freedesktop_proxy =
- dbus_g_proxy_new_for_name (freedesktop_connection,
- DBUS_SERVICE_DBUS,
- DBUS_PATH_DBUS,
- DBUS_INTERFACE_DBUS);
-
- if (!freedesktop_proxy) {
- g_critical ("Could not create a proxy for the Freedesktop service, %s",
- error ? error->message : "no error given.");
- g_error_free (error);
- return FALSE;
+ g_clear_error (&error);
+ connection = NULL;
}
clients = g_hash_table_new_full (g_str_hash,
@@ -95,21 +75,16 @@ clients_init (void)
static gboolean
clients_shutdown (void)
{
- if (freedesktop_proxy) {
- g_object_unref (freedesktop_proxy);
- freedesktop_proxy = NULL;
- }
-
- if (freedesktop_connection) {
- dbus_g_connection_unref (freedesktop_connection);
- freedesktop_connection = NULL;
- }
-
if (clients) {
g_hash_table_unref (clients);
clients = NULL;
}
+ if (connection) {
+ g_object_unref (connection);
+ connection = NULL;
+ }
+
return TRUE;
}
@@ -134,18 +109,33 @@ static ClientData *
client_data_new (gchar *sender)
{
ClientData *cd;
- GError *error = NULL;
- guint pid;
gboolean get_binary = TRUE;
+ GError *error = NULL;
cd = g_slice_new0 (ClientData);
cd->sender = sender;
- if (org_freedesktop_DBus_get_connection_unix_process_id (freedesktop_proxy,
- sender,
- &pid,
- &error)) {
- cd->pid = pid;
+ if (connection) {
+ GVariant *v;
+
+ v = g_dbus_connection_call_sync (connection,
+ "org.freedesktop.DBus",
+ "/org/freedesktop/DBus",
+ "org.freedesktop.DBus",
+ "GetConnectionUnixProcessID",
+ g_variant_new ("(s)", sender),
+ G_VARIANT_TYPE ("(u)"),
+ G_DBUS_CALL_FLAGS_NONE,
+ -1,
+ NULL,
+ &error);
+
+ if (!error) {
+ g_variant_get (v, "(u)", &cd->pid);
+ g_variant_unref (v);
+ } else {
+ g_error_free (error);
+ }
}
if (get_binary) {
diff --git a/src/libtracker-common/tracker-dbus.h b/src/libtracker-common/tracker-dbus.h
index 8762167..e7c479f 100644
--- a/src/libtracker-common/tracker-dbus.h
+++ b/src/libtracker-common/tracker-dbus.h
@@ -31,29 +31,6 @@ G_BEGIN_DECLS
#define TRACKER_DBUS_ERROR_DOMAIN "TrackerDBus"
#define TRACKER_DBUS_ERROR tracker_dbus_error_quark()
-
-#define TRACKER_TYPE_INT_ARRAY_MAP \
- dbus_g_type_get_map ("GHashTable", G_TYPE_INT, DBUS_TYPE_G_INT_ARRAY)
-
-#define TRACKER_TYPE_FOUR_INT_ARRAY \
- dbus_g_type_get_collection ("GPtrArray", \
- dbus_g_type_get_struct("GValueArray", \
- G_TYPE_INT, \
- G_TYPE_INT, \
- G_TYPE_INT, \
- G_TYPE_INT, \
- G_TYPE_INVALID))
-
-#define TRACKER_TYPE_EVENT_ARRAY \
- dbus_g_type_get_collection ("GPtrArray", \
- dbus_g_type_get_struct ("GValueArray", \
- G_TYPE_STRING, \
- G_TYPE_STRING, \
- G_TYPE_INT, \
- G_TYPE_INVALID))
-#define TRACKER_TYPE_G_STRV_ARRAY \
- dbus_g_type_get_collection ("GPtrArray", G_TYPE_STRV)
-
#define tracker_gdbus_async_return_if_fail(expr,invocation) \
G_STMT_START { \
if G_LIKELY(expr) { } else { \
diff --git a/tests/libtracker-common/Makefile.am b/tests/libtracker-common/Makefile.am
index f3e33f7..104ccc6 100644
--- a/tests/libtracker-common/Makefile.am
+++ b/tests/libtracker-common/Makefile.am
@@ -3,28 +3,32 @@ include $(top_srcdir)/Makefile.decl
noinst_PROGRAMS = $(TEST_PROGS)
TEST_PROGS += \
- tracker-dbus \
tracker-type-utils \
tracker-file-utils \
tracker-utils
+# Disabled test until the mock objects are ported to gdbus
+# tracker-dbus
+
AM_CPPFLAGS = \
$(BUILD_CFLAGS) \
-I$(top_srcdir)/src \
-I$(top_srcdir)/tests/common \
- $(LIBTRACKER_COMMON_CFLAGS)
+ $(LIBTRACKER_COMMON_CFLAGS) \
+ $(TRACKER_DBUS_CFLAGS)
LDADD = \
$(top_builddir)/tests/common/libtracker-testcommon.la \
$(top_builddir)/src/libtracker-common/libtracker-common.la \
$(BUILD_LIBS) \
- $(LIBTRACKER_COMMON_LIBS)
-
-tracker_dbus_SOURCES = \
- tracker-dbus-test.c \
- mock-dbus.c \
- mock-dbus-gproxy.h \
- mock-dbus-gproxy.c
+ $(LIBTRACKER_COMMON_LIBS) \
+ $(TRACKER_DBUS_LIBS)
+
+#tracker_dbus_SOURCES = \
+# tracker-dbus-test.c \
+# mock-dbus.c \
+# mock-dbus-gproxy.h \
+# mock-dbus-gproxy.c
tracker_type_utils_SOURCES = tracker-type-utils-test.c
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
