[tracker/clientapi] libtracker-client: Move D-Bus interface/service/object defs to header
- From: Martyn James Russell <mr src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [tracker/clientapi] libtracker-client: Move D-Bus interface/service/object defs to header
- Date: Tue, 12 Jan 2010 20:23:36 +0000 (UTC)
commit 6d649e52731be646841513747c6847810a71900b
Author: Martyn Russell <martyn lanedo com>
Date: Tue Jan 12 20:07:39 2010 +0000
libtracker-client: Move D-Bus interface/service/object defs to header
src/libtracker-client/tracker.c | 20 ++++++++------------
src/libtracker-client/tracker.h | 5 +++++
2 files changed, 13 insertions(+), 12 deletions(-)
---
diff --git a/src/libtracker-client/tracker.c b/src/libtracker-client/tracker.c
index a7f3127..f7d7dc0 100644
--- a/src/libtracker-client/tracker.c
+++ b/src/libtracker-client/tracker.c
@@ -30,11 +30,6 @@
#include "tracker-resources-glue.h"
#include "tracker-statistics-glue.h"
-#define TRACKER_SERVICE "org.freedesktop.Tracker1"
-#define TRACKER_OBJECT "/org/freedesktop/Tracker1"
-#define TRACKER_INTERFACE_RESOURCES "org.freedesktop.Tracker1.Resources"
-#define TRACKER_INTERFACE_STATISTICS "org.freedesktop.Tracker1.Statistics"
-
/**
* SECTION:tracker
* @short_description: A client library for querying and inserting
@@ -358,7 +353,8 @@ client_constructed (GObject *object)
return;
}
- if (!start_service (dbus_g_connection_get_connection (connection), TRACKER_SERVICE)) {
+ if (!start_service (dbus_g_connection_get_connection (connection),
+ TRACKER_DBUS_SERVICE)) {
/* unable to start tracker-store */
dbus_g_connection_unref (connection);
return;
@@ -369,15 +365,15 @@ client_constructed (GObject *object)
private->proxy_statistics =
dbus_g_proxy_new_for_name (connection,
- TRACKER_SERVICE,
- TRACKER_OBJECT "/Statistics",
- TRACKER_INTERFACE_STATISTICS);
+ TRACKER_DBUS_SERVICE,
+ TRACKER_DBUS_OBJECT "/Statistics",
+ TRACKER_DBUS_INTERFACE_STATISTICS);
private->proxy_resources =
dbus_g_proxy_new_for_name (connection,
- TRACKER_SERVICE,
- TRACKER_OBJECT "/Resources",
- TRACKER_INTERFACE_RESOURCES);
+ TRACKER_DBUS_SERVICE,
+ TRACKER_DBUS_OBJECT "/Resources",
+ TRACKER_DBUS_INTERFACE_RESOURCES);
}
static void
diff --git a/src/libtracker-client/tracker.h b/src/libtracker-client/tracker.h
index e786254..b2e51e3 100644
--- a/src/libtracker-client/tracker.h
+++ b/src/libtracker-client/tracker.h
@@ -25,6 +25,11 @@
G_BEGIN_DECLS
+#define TRACKER_DBUS_SERVICE "org.freedesktop.Tracker1"
+#define TRACKER_DBUS_OBJECT "/org/freedesktop/Tracker1"
+#define TRACKER_DBUS_INTERFACE_RESOURCES "org.freedesktop.Tracker1.Resources"
+#define TRACKER_DBUS_INTERFACE_STATISTICS "org.freedesktop.Tracker1.Statistics"
+
#define TRACKER_TYPE_CLIENT (tracker_client_get_type())
#define TRACKER_CLIENT(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), TRACKER_TYPE_CLIENT, TrackerClient))
#define TRACKER_CLIENT_CLASS(c) (G_TYPE_CHECK_CLASS_CAST ((c), TRACKER_TYPE_CLIENT, TrackerClientClass))
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]