tracker r1322 - in branches/indexer-split: . data src/libtracker src/trackerd
- From: pvanhoof svn gnome org
- To: svn-commits-list gnome org
- Subject: tracker r1322 - in branches/indexer-split: . data src/libtracker src/trackerd
- Date: Mon, 28 Apr 2008 16:04:11 +0100 (BST)
Author: pvanhoof
Date: Mon Apr 28 15:04:11 2008
New Revision: 1322
URL: http://svn.gnome.org/viewvc/tracker?rev=1322&view=rev
Log:
2008-04-28 Philip Van Hoof <pvanhoof gnome org>
* Renamed TrackerXesamSearch to TrackerDBusXesamSearch
* Renamed TrackerDBusSearch to TrackerDBusTrackerSearch
* Renamed TrackerDBusDaemon to TrackerDBusTrackerDaemon
* Renamed TrackerDBusFiles to TrackerDBusTrackerFiles
* Renamed TrackerDBusMetadata to TrackerDBusTrackerMetadata
* Renamed TrackerDBusKeywords to TrackerDBusTrackerKeyWords
Added:
branches/indexer-split/data/tracker-dbus-tracker-daemon.xml
- copied unchanged from r1319, /branches/indexer-split/data/tracker-dbus-daemon.xml
branches/indexer-split/data/tracker-dbus-tracker-files.xml
- copied unchanged from r1319, /branches/indexer-split/data/tracker-dbus-files.xml
branches/indexer-split/data/tracker-dbus-tracker-keywords.xml
- copied unchanged from r1319, /branches/indexer-split/data/tracker-dbus-keywords.xml
branches/indexer-split/data/tracker-dbus-tracker-metadata.xml
- copied unchanged from r1319, /branches/indexer-split/data/tracker-dbus-metadata.xml
branches/indexer-split/data/tracker-dbus-tracker-search.xml
- copied unchanged from r1319, /branches/indexer-split/data/tracker-dbus-search.xml
branches/indexer-split/data/tracker-dbus-xesam-search.xml
- copied unchanged from r1317, /branches/indexer-split/data/tracker-xesam-search.xml
branches/indexer-split/src/trackerd/tracker-dbus-tracker-daemon.c
- copied, changed from r1319, /branches/indexer-split/src/trackerd/tracker-dbus-daemon.c
branches/indexer-split/src/trackerd/tracker-dbus-tracker-daemon.h
- copied, changed from r1319, /branches/indexer-split/src/trackerd/tracker-dbus-daemon.h
branches/indexer-split/src/trackerd/tracker-dbus-tracker-files.c
- copied, changed from r1319, /branches/indexer-split/src/trackerd/tracker-dbus-files.c
branches/indexer-split/src/trackerd/tracker-dbus-tracker-files.h
- copied, changed from r1319, /branches/indexer-split/src/trackerd/tracker-dbus-files.h
branches/indexer-split/src/trackerd/tracker-dbus-tracker-keywords.c
- copied, changed from r1319, /branches/indexer-split/src/trackerd/tracker-dbus-keywords.c
branches/indexer-split/src/trackerd/tracker-dbus-tracker-keywords.h
- copied, changed from r1319, /branches/indexer-split/src/trackerd/tracker-dbus-keywords.h
branches/indexer-split/src/trackerd/tracker-dbus-tracker-metadata.c
- copied, changed from r1319, /branches/indexer-split/src/trackerd/tracker-dbus-metadata.c
branches/indexer-split/src/trackerd/tracker-dbus-tracker-metadata.h
- copied, changed from r1319, /branches/indexer-split/src/trackerd/tracker-dbus-metadata.h
branches/indexer-split/src/trackerd/tracker-dbus-tracker-search.c
- copied, changed from r1319, /branches/indexer-split/src/trackerd/tracker-dbus-search.c
branches/indexer-split/src/trackerd/tracker-dbus-tracker-search.h
- copied, changed from r1319, /branches/indexer-split/src/trackerd/tracker-dbus-search.h
branches/indexer-split/src/trackerd/tracker-dbus-xesam-search.c
- copied, changed from r1317, /branches/indexer-split/src/trackerd/tracker-xesam-search.c
branches/indexer-split/src/trackerd/tracker-dbus-xesam-search.h
- copied, changed from r1317, /branches/indexer-split/src/trackerd/tracker-xesam-search.h
Removed:
branches/indexer-split/data/tracker-dbus-daemon.xml
branches/indexer-split/data/tracker-dbus-files.xml
branches/indexer-split/data/tracker-dbus-keywords.xml
branches/indexer-split/data/tracker-dbus-metadata.xml
branches/indexer-split/data/tracker-dbus-search.xml
branches/indexer-split/data/tracker-xesam-search.xml
branches/indexer-split/src/trackerd/tracker-dbus-daemon.c
branches/indexer-split/src/trackerd/tracker-dbus-daemon.h
branches/indexer-split/src/trackerd/tracker-dbus-files.c
branches/indexer-split/src/trackerd/tracker-dbus-files.h
branches/indexer-split/src/trackerd/tracker-dbus-keywords.c
branches/indexer-split/src/trackerd/tracker-dbus-keywords.h
branches/indexer-split/src/trackerd/tracker-dbus-metadata.c
branches/indexer-split/src/trackerd/tracker-dbus-metadata.h
branches/indexer-split/src/trackerd/tracker-dbus-search.c
branches/indexer-split/src/trackerd/tracker-dbus-search.h
branches/indexer-split/src/trackerd/tracker-xesam-search.c
branches/indexer-split/src/trackerd/tracker-xesam-search.h
Modified:
branches/indexer-split/ChangeLog
branches/indexer-split/data/Makefile.am
branches/indexer-split/src/libtracker/Makefile.am
branches/indexer-split/src/libtracker/tracker.c
branches/indexer-split/src/trackerd/ (props changed)
branches/indexer-split/src/trackerd/Makefile.am
branches/indexer-split/src/trackerd/tracker-cache.c
branches/indexer-split/src/trackerd/tracker-dbus.c
branches/indexer-split/src/trackerd/tracker-email-evolution.c
branches/indexer-split/src/trackerd/tracker-email-modest.c
branches/indexer-split/src/trackerd/tracker-email-utils.c
branches/indexer-split/src/trackerd/tracker-indexer.c
branches/indexer-split/src/trackerd/tracker-process-files.c
branches/indexer-split/src/trackerd/tracker-status.c
branches/indexer-split/src/trackerd/tracker-xesam-live-search.c
branches/indexer-split/src/trackerd/tracker-xesam-session.h
branches/indexer-split/src/trackerd/tracker-xesam.c
branches/indexer-split/src/trackerd/tracker-xesam.h
Modified: branches/indexer-split/data/Makefile.am
==============================================================================
--- branches/indexer-split/data/Makefile.am (original)
+++ branches/indexer-split/data/Makefile.am Mon Apr 28 15:04:11 2008
@@ -3,12 +3,12 @@
configdir = $(datadir)/tracker
config_DATA = \
- tracker-dbus-daemon.xml \
- tracker-dbus-files.xml \
- tracker-dbus-keywords.xml \
- tracker-dbus-metadata.xml \
- tracker-dbus-search.xml \
- tracker-xesam-search.xml \
+ tracker-dbus-tracker-daemon.xml \
+ tracker-dbus-tracker-files.xml \
+ tracker-dbus-tracker-keywords.xml \
+ tracker-dbus-tracker-metadata.xml \
+ tracker-dbus-tracker-search.xml \
+ tracker-dbus-xesam-search.xml \
sqlite-tracker.sql \
sqlite-cache.sql \
sqlite-email.sql \
Modified: branches/indexer-split/src/libtracker/Makefile.am
==============================================================================
--- branches/indexer-split/src/libtracker/Makefile.am (original)
+++ branches/indexer-split/src/libtracker/Makefile.am Mon Apr 28 15:04:11 2008
@@ -54,11 +54,11 @@
# Generate DBus files from XML data.
dbus_sources = \
- tracker-dbus-daemon-glue.h \
- tracker-dbus-files-glue.h \
- tracker-dbus-keywords-glue.h \
- tracker-dbus-metadata-glue.h \
- tracker-dbus-search-glue.h
+ tracker-dbus-tracker-daemon-glue.h \
+ tracker-dbus-tracker-files-glue.h \
+ tracker-dbus-tracker-keywords-glue.h \
+ tracker-dbus-tracker-metadata-glue.h \
+ tracker-dbus-tracker-search-glue.h
%-glue.h: $(top_builddir)/data/%.xml
$(DBUSBINDINGTOOL) --mode=glib-client --output=$@ --prefix=$(subst -,_,$*) $^
Modified: branches/indexer-split/src/libtracker/tracker.c
==============================================================================
--- branches/indexer-split/src/libtracker/tracker.c (original)
+++ branches/indexer-split/src/libtracker/tracker.c Mon Apr 28 15:04:11 2008
@@ -19,11 +19,11 @@
#include <string.h>
-#include "tracker-dbus-daemon-glue.h"
-#include "tracker-dbus-files-glue.h"
-#include "tracker-dbus-keywords-glue.h"
-#include "tracker-dbus-metadata-glue.h"
-#include "tracker-dbus-search-glue.h"
+#include "tracker-dbus-tracker-daemon-glue.h"
+#include "tracker-dbus-tracker-files-glue.h"
+#include "tracker-dbus-tracker-keywords-glue.h"
+#include "tracker-dbus-tracker-metadata-glue.h"
+#include "tracker-dbus-tracker-search-glue.h"
#include "tracker.h"
Modified: branches/indexer-split/src/trackerd/Makefile.am
==============================================================================
--- branches/indexer-split/src/trackerd/Makefile.am (original)
+++ branches/indexer-split/src/trackerd/Makefile.am Mon Apr 28 15:04:11 2008
@@ -97,18 +97,18 @@
tracker-db.h \
tracker-dbus.c \
tracker-dbus.h \
- tracker-dbus-daemon.c \
- tracker-dbus-daemon.h \
- tracker-dbus-files.c \
- tracker-dbus-files.h \
- tracker-dbus-keywords.c \
- tracker-dbus-keywords.h \
- tracker-dbus-metadata.c \
- tracker-dbus-metadata.h \
- tracker-dbus-search.c \
- tracker-dbus-search.h \
- tracker-xesam-search.c \
- tracker-xesam-search.h \
+ tracker-dbus-tracker-daemon.c \
+ tracker-dbus-tracker-daemon.h \
+ tracker-dbus-tracker-files.c \
+ tracker-dbus-tracker-files.h \
+ tracker-dbus-tracker-keywords.c \
+ tracker-dbus-tracker-keywords.h \
+ tracker-dbus-tracker-metadata.c \
+ tracker-dbus-tracker-metadata.h \
+ tracker-dbus-tracker-search.c \
+ tracker-dbus-tracker-search.h \
+ tracker-dbus-xesam-search.c \
+ tracker-dbus-xesam-search.h \
tracker-email.c \
tracker-email.h \
tracker-email-utils.c \
@@ -182,12 +182,12 @@
tracker-marshal.c
dbus_sources = \
- tracker-dbus-daemon-glue.h \
- tracker-dbus-files-glue.h \
- tracker-dbus-keywords-glue.h \
- tracker-dbus-metadata-glue.h \
- tracker-dbus-search-glue.h \
- tracker-xesam-search-glue.h
+ tracker-dbus-tracker-daemon-glue.h \
+ tracker-dbus-tracker-files-glue.h \
+ tracker-dbus-tracker-keywords-glue.h \
+ tracker-dbus-tracker-metadata-glue.h \
+ tracker-dbus-tracker-search-glue.h \
+ tracker-dbus-xesam-search-glue.h
%-glue.h: $(top_builddir)/data/%.xml
$(DBUSBINDINGTOOL) --mode=glib-server --output=$@ --prefix=$(subst -,_,$*) $^
Modified: branches/indexer-split/src/trackerd/tracker-cache.c
==============================================================================
--- branches/indexer-split/src/trackerd/tracker-cache.c (original)
+++ branches/indexer-split/src/trackerd/tracker-cache.c Mon Apr 28 15:04:11 2008
@@ -29,7 +29,7 @@
#include "tracker-utils.h"
#include "tracker-db-sqlite.h"
#include "tracker-dbus.h"
-#include "tracker-dbus-daemon.h"
+#include "tracker-dbus-tracker-daemon.h"
#include "tracker-cache.h"
#include "tracker-status.h"
@@ -311,7 +311,7 @@
GObject *object;
gboolean stopped_trans = FALSE;
- object = tracker_dbus_get_object (TRACKER_TYPE_DBUS_DAEMON);
+ object = tracker_dbus_get_object (TRACKER_TYPE_DBUS_TRACKER_DAEMON);
while (TRUE) {
Copied: branches/indexer-split/src/trackerd/tracker-dbus-tracker-daemon.c (from r1319, /branches/indexer-split/src/trackerd/tracker-dbus-daemon.c)
==============================================================================
--- /branches/indexer-split/src/trackerd/tracker-dbus-daemon.c (original)
+++ branches/indexer-split/src/trackerd/tracker-dbus-tracker-daemon.c Mon Apr 28 15:04:11 2008
@@ -28,19 +28,19 @@
#include <libtracker-common/tracker-config.h>
#include "tracker-dbus.h"
-#include "tracker-dbus-daemon.h"
+#include "tracker-dbus-tracker-daemon.h"
#include "tracker-db.h"
#include "tracker-status.h"
#include "tracker-marshal.h"
-#define GET_PRIV(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), TRACKER_TYPE_DBUS_DAEMON, TrackerDBusDaemonPriv))
+#define GET_PRIV(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), TRACKER_TYPE_DBUS_TRACKER_DAEMON, TrackerDBusTrackerDaemonPriv))
typedef struct {
DBusGProxy *fd_proxy;
DBConnection *db_con;
TrackerConfig *config;
Tracker *tracker;
-} TrackerDBusDaemonPriv;
+} TrackerDBusTrackerDaemonPriv;
enum {
PROP_0,
@@ -64,10 +64,10 @@
static guint signals[LAST_SIGNAL] = {0};
-G_DEFINE_TYPE(TrackerDBusDaemon, tracker_dbus_daemon, G_TYPE_OBJECT)
+G_DEFINE_TYPE(TrackerDBusTrackerDaemon, tracker_dbus_tracker_daemon, G_TYPE_OBJECT)
static void
-tracker_dbus_daemon_class_init (TrackerDBusDaemonClass *klass)
+tracker_dbus_tracker_daemon_class_init (TrackerDBusTrackerDaemonClass *klass)
{
GObjectClass *object_class;
@@ -136,18 +136,18 @@
G_TYPE_INT,
G_TYPE_INT);
- g_type_class_add_private (object_class, sizeof (TrackerDBusDaemonPriv));
+ g_type_class_add_private (object_class, sizeof (TrackerDBusTrackerDaemonPriv));
}
static void
-tracker_dbus_daemon_init (TrackerDBusDaemon *object)
+tracker_dbus_tracker_daemon_init (TrackerDBusTrackerDaemon *object)
{
}
static void
dbus_daemon_finalize (GObject *object)
{
- TrackerDBusDaemonPriv *priv;
+ TrackerDBusTrackerDaemonPriv *priv;
priv = GET_PRIV (object);
@@ -159,7 +159,7 @@
g_object_unref (priv->config);
}
- G_OBJECT_CLASS (tracker_dbus_daemon_parent_class)->finalize (object);
+ G_OBJECT_CLASS (tracker_dbus_tracker_daemon_parent_class)->finalize (object);
}
static void
@@ -168,21 +168,21 @@
const GValue *value,
GParamSpec *pspec)
{
- TrackerDBusDaemonPriv *priv;
+ TrackerDBusTrackerDaemonPriv *priv;
priv = GET_PRIV (object);
switch (param_id) {
case PROP_DB_CONNECTION:
- tracker_dbus_daemon_set_db_connection (TRACKER_DBUS_DAEMON (object),
+ tracker_dbus_tracker_daemon_set_db_connection (TRACKER_DBUS_TRACKER_DAEMON (object),
g_value_get_pointer (value));
break;
case PROP_CONFIG:
- tracker_dbus_daemon_set_config (TRACKER_DBUS_DAEMON (object),
+ tracker_dbus_tracker_daemon_set_config (TRACKER_DBUS_TRACKER_DAEMON (object),
g_value_get_pointer (value));
break;
case PROP_TRACKER:
- tracker_dbus_daemon_set_tracker (TRACKER_DBUS_DAEMON (object),
+ tracker_dbus_tracker_daemon_set_tracker (TRACKER_DBUS_TRACKER_DAEMON (object),
g_value_get_pointer (value));
break;
@@ -192,17 +192,17 @@
};
}
-TrackerDBusDaemon *
-tracker_dbus_daemon_new (DBConnection *db_con,
+TrackerDBusTrackerDaemon *
+tracker_dbus_tracker_daemon_new (DBConnection *db_con,
TrackerConfig *config,
Tracker *tracker)
{
- TrackerDBusDaemon *object;
+ TrackerDBusTrackerDaemon *object;
g_return_val_if_fail (db_con != NULL, NULL);
g_return_val_if_fail (TRACKER_IS_CONFIG (config), NULL);
- object = g_object_new (TRACKER_TYPE_DBUS_DAEMON,
+ object = g_object_new (TRACKER_TYPE_DBUS_TRACKER_DAEMON,
"db-connection", db_con,
"config", config,
"tracker", tracker,
@@ -212,12 +212,12 @@
}
void
-tracker_dbus_daemon_set_db_connection (TrackerDBusDaemon *object,
+tracker_dbus_tracker_daemon_set_db_connection (TrackerDBusTrackerDaemon *object,
DBConnection *db_con)
{
- TrackerDBusDaemonPriv *priv;
+ TrackerDBusTrackerDaemonPriv *priv;
- g_return_if_fail (TRACKER_IS_DBUS_DAEMON (object));
+ g_return_if_fail (TRACKER_IS_DBUS_TRACKER_DAEMON (object));
g_return_if_fail (db_con != NULL);
priv = GET_PRIV (object);
@@ -228,12 +228,12 @@
}
void
-tracker_dbus_daemon_set_config (TrackerDBusDaemon *object,
+tracker_dbus_tracker_daemon_set_config (TrackerDBusTrackerDaemon *object,
TrackerConfig *config)
{
- TrackerDBusDaemonPriv *priv;
+ TrackerDBusTrackerDaemonPriv *priv;
- g_return_if_fail (TRACKER_IS_DBUS_DAEMON (object));
+ g_return_if_fail (TRACKER_IS_DBUS_TRACKER_DAEMON (object));
g_return_if_fail (TRACKER_IS_CONFIG (config));
priv = GET_PRIV (object);
@@ -248,12 +248,12 @@
}
void
-tracker_dbus_daemon_set_tracker (TrackerDBusDaemon *object,
+tracker_dbus_tracker_daemon_set_tracker (TrackerDBusTrackerDaemon *object,
Tracker *tracker)
{
- TrackerDBusDaemonPriv *priv;
+ TrackerDBusTrackerDaemonPriv *priv;
- g_return_if_fail (TRACKER_IS_DBUS_DAEMON (object));
+ g_return_if_fail (TRACKER_IS_DBUS_TRACKER_DAEMON (object));
g_return_if_fail (tracker != NULL);
priv = GET_PRIV (object);
@@ -267,7 +267,7 @@
* Functions
*/
gboolean
-tracker_dbus_daemon_get_version (TrackerDBusDaemon *object,
+tracker_dbus_tracker_daemon_get_version (TrackerDBusTrackerDaemon *object,
gint *version,
GError **error)
{
@@ -288,11 +288,11 @@
}
gboolean
-tracker_dbus_daemon_get_status (TrackerDBusDaemon *object,
+tracker_dbus_tracker_daemon_get_status (TrackerDBusTrackerDaemon *object,
gchar **status,
GError **error)
{
- TrackerDBusDaemonPriv *priv;
+ TrackerDBusTrackerDaemonPriv *priv;
guint request_id;
request_id = tracker_dbus_get_next_request_id ();
@@ -312,12 +312,12 @@
}
gboolean
-tracker_dbus_daemon_get_services (TrackerDBusDaemon *object,
+tracker_dbus_tracker_daemon_get_services (TrackerDBusTrackerDaemon *object,
gboolean main_services_only,
GHashTable **values,
GError **error)
{
- TrackerDBusDaemonPriv *priv;
+ TrackerDBusTrackerDaemonPriv *priv;
TrackerDBResultSet *result_set;
guint request_id;
DBConnection *db_con;
@@ -348,11 +348,11 @@
}
gboolean
-tracker_dbus_daemon_get_stats (TrackerDBusDaemon *object,
+tracker_dbus_tracker_daemon_get_stats (TrackerDBusTrackerDaemon *object,
GPtrArray **values,
GError **error)
{
- TrackerDBusDaemonPriv *priv;
+ TrackerDBusTrackerDaemonPriv *priv;
TrackerDBResultSet *result_set;
guint request_id;
DBConnection *db_con;
@@ -381,12 +381,12 @@
}
gboolean
-tracker_dbus_daemon_set_bool_option (TrackerDBusDaemon *object,
+tracker_dbus_tracker_daemon_set_bool_option (TrackerDBusTrackerDaemon *object,
const gchar *option,
gboolean value,
GError **error)
{
- TrackerDBusDaemonPriv *priv;
+ TrackerDBusTrackerDaemonPriv *priv;
guint request_id;
gboolean signal_state_change = FALSE;
@@ -470,12 +470,12 @@
}
gboolean
-tracker_dbus_daemon_set_int_option (TrackerDBusDaemon *object,
+tracker_dbus_tracker_daemon_set_int_option (TrackerDBusTrackerDaemon *object,
const gchar *option,
gint value,
GError **error)
{
- TrackerDBusDaemonPriv *priv;
+ TrackerDBusTrackerDaemonPriv *priv;
guint request_id;
/* FIXME: Shouldn't we just make the TrackerConfig module a
@@ -514,11 +514,11 @@
}
gboolean
-tracker_dbus_daemon_shutdown (TrackerDBusDaemon *object,
+tracker_dbus_tracker_daemon_shutdown (TrackerDBusTrackerDaemon *object,
gboolean reindex,
GError **error)
{
- TrackerDBusDaemonPriv *priv;
+ TrackerDBusTrackerDaemonPriv *priv;
guint request_id;
request_id = tracker_dbus_get_next_request_id ();
@@ -542,10 +542,10 @@
}
gboolean
-tracker_dbus_daemon_prompt_index_signals (TrackerDBusDaemon *object,
+tracker_dbus_tracker_daemon_prompt_index_signals (TrackerDBusTrackerDaemon *object,
GError **error)
{
- TrackerDBusDaemonPriv *priv;
+ TrackerDBusTrackerDaemonPriv *priv;
guint request_id;
request_id = tracker_dbus_get_next_request_id ();
Copied: branches/indexer-split/src/trackerd/tracker-dbus-tracker-daemon.h (from r1319, /branches/indexer-split/src/trackerd/tracker-dbus-daemon.h)
==============================================================================
--- /branches/indexer-split/src/trackerd/tracker-dbus-daemon.h (original)
+++ branches/indexer-split/src/trackerd/tracker-dbus-tracker-daemon.h Mon Apr 28 15:04:11 2008
@@ -19,8 +19,8 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef __TRACKER_DBUS_DAEMON_H__
-#define __TRACKER_DBUS_DAEMON_H__
+#ifndef __TRACKER_DBUS_TRACKER_DAEMON_H__
+#define __TRACKER_DBUS_TRACKER_DAEMON_H__
#include <dbus/dbus-glib.h>
#include <dbus/dbus-glib-bindings.h>
@@ -30,70 +30,70 @@
#include "tracker-db-sqlite.h"
-#define TRACKER_DBUS_DAEMON_SERVICE "org.freedesktop.Tracker"
-#define TRACKER_DBUS_DAEMON_PATH "/org/freedesktop/Tracker"
-#define TRACKER_DBUS_DAEMON_INTERFACE "org.freedesktop.Tracker"
+#define TRACKER_DBUS_TRACKER_DAEMON_SERVICE "org.freedesktop.Tracker"
+#define TRACKER_DBUS_TRACKER_DAEMON_PATH "/org/freedesktop/Tracker"
+#define TRACKER_DBUS_TRACKER_DAEMON_INTERFACE "org.freedesktop.Tracker"
G_BEGIN_DECLS
-#define TRACKER_TYPE_DBUS_DAEMON (tracker_dbus_daemon_get_type ())
-#define TRACKER_DBUS_DAEMON(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), TRACKER_TYPE_DBUS_DAEMON, TrackerDBusDaemon))
-#define TRACKER_DBUS_DAEMON_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TRACKER_TYPE_DBUS_DAEMON, TrackerDBusDaemonClass))
-#define TRACKER_IS_DBUS_DAEMON(object) (G_TYPE_CHECK_INSTANCE_TYPE ((object), TRACKER_TYPE_DBUS_DAEMON))
-#define TRACKER_IS_DBUS_DAEMON_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TRACKER_TYPE_DBUS_DAEMON))
-#define TRACKER_DBUS_DAEMON_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TRACKER_TYPE_DBUS_DAEMON, TrackerDBusDaemonClass))
+#define TRACKER_TYPE_DBUS_TRACKER_DAEMON (tracker_dbus_tracker_daemon_get_type ())
+#define TRACKER_DBUS_TRACKER_DAEMON(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), TRACKER_TYPE_DBUS_TRACKER_DAEMON, TrackerDBusTrackerDaemon))
+#define TRACKER_DBUS_TRACKER_DAEMON_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TRACKER_TYPE_DBUS_TRACKER_DAEMON, TrackerDBusTrackerDaemonClass))
+#define TRACKER_IS_DBUS_TRACKER_DAEMON(object) (G_TYPE_CHECK_INSTANCE_TYPE ((object), TRACKER_TYPE_DBUS_TRACKER_DAEMON))
+#define TRACKER_IS_DBUS_TRACKER_DAEMON_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TRACKER_TYPE_DBUS_TRACKER_DAEMON))
+#define TRACKER_DBUS_TRACKER_DAEMON_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TRACKER_TYPE_DBUS_TRACKER_DAEMON, TrackerDBusTrackerDaemonClass))
-typedef struct TrackerDBusDaemon TrackerDBusDaemon;
-typedef struct TrackerDBusDaemonClass TrackerDBusDaemonClass;
+typedef struct TrackerDBusTrackerDaemon TrackerDBusTrackerDaemon;
+typedef struct TrackerDBusTrackerDaemonClass TrackerDBusTrackerDaemonClass;
-struct TrackerDBusDaemon {
+struct TrackerDBusTrackerDaemon {
GObject parent;
};
-struct TrackerDBusDaemonClass {
+struct TrackerDBusTrackerDaemonClass {
GObjectClass parent;
};
-GType tracker_dbus_daemon_get_type (void);
+GType tracker_dbus_tracker_daemon_get_type (void);
-TrackerDBusDaemon *tracker_dbus_daemon_new (DBConnection *db_con,
+TrackerDBusTrackerDaemon *tracker_dbus_tracker_daemon_new (DBConnection *db_con,
TrackerConfig *config,
Tracker *tracker);
-void tracker_dbus_daemon_set_db_connection (TrackerDBusDaemon *object,
+void tracker_dbus_tracker_daemon_set_db_connection (TrackerDBusTrackerDaemon *object,
DBConnection *db_con);
-void tracker_dbus_daemon_set_config (TrackerDBusDaemon *object,
+void tracker_dbus_tracker_daemon_set_config (TrackerDBusTrackerDaemon *object,
TrackerConfig *config);
-void tracker_dbus_daemon_set_tracker (TrackerDBusDaemon *object,
+void tracker_dbus_tracker_daemon_set_tracker (TrackerDBusTrackerDaemon *object,
Tracker *tracker);
-gboolean tracker_dbus_daemon_get_version (TrackerDBusDaemon *object,
+gboolean tracker_dbus_tracker_daemon_get_version (TrackerDBusTrackerDaemon *object,
gint *version,
GError **error);
-gboolean tracker_dbus_daemon_get_status (TrackerDBusDaemon *object,
+gboolean tracker_dbus_tracker_daemon_get_status (TrackerDBusTrackerDaemon *object,
gchar **status,
GError **error);
-gboolean tracker_dbus_daemon_get_services (TrackerDBusDaemon *object,
+gboolean tracker_dbus_tracker_daemon_get_services (TrackerDBusTrackerDaemon *object,
gboolean main_services_only,
GHashTable **values,
GError **error);
-gboolean tracker_dbus_daemon_get_stats (TrackerDBusDaemon *object,
+gboolean tracker_dbus_tracker_daemon_get_stats (TrackerDBusTrackerDaemon *object,
GPtrArray **values,
GError **error);
-gboolean tracker_dbus_daemon_set_bool_option (TrackerDBusDaemon *object,
+gboolean tracker_dbus_tracker_daemon_set_bool_option (TrackerDBusTrackerDaemon *object,
const gchar *option,
gboolean value,
GError **error);
-gboolean tracker_dbus_daemon_set_int_option (TrackerDBusDaemon *object,
+gboolean tracker_dbus_tracker_daemon_set_int_option (TrackerDBusTrackerDaemon *object,
const gchar *option,
gint value,
GError **error);
-gboolean tracker_dbus_daemon_shutdown (TrackerDBusDaemon *object,
+gboolean tracker_dbus_tracker_daemon_shutdown (TrackerDBusTrackerDaemon *object,
gboolean reindex,
GError **error);
-gboolean tracker_dbus_daemon_prompt_index_signals (TrackerDBusDaemon *object,
+gboolean tracker_dbus_tracker_daemon_prompt_index_signals (TrackerDBusTrackerDaemon *object,
GError **error);
G_END_DECLS
-#endif /* __TRACKER_DBUS_DAEMON_H__ */
+#endif /* __TRACKER_DBUS_TRACKER_DAEMON_H__ */
Copied: branches/indexer-split/src/trackerd/tracker-dbus-tracker-files.c (from r1319, /branches/indexer-split/src/trackerd/tracker-dbus-files.c)
==============================================================================
--- /branches/indexer-split/src/trackerd/tracker-dbus-files.c (original)
+++ branches/indexer-split/src/trackerd/tracker-dbus-tracker-files.c Mon Apr 28 15:04:11 2008
@@ -24,22 +24,25 @@
#include <stdlib.h>
#include <string.h>
+
#include <libtracker-common/tracker-log.h>
+#include <libtracker-common/tracker-config.h>
#include <libtracker-common/tracker-utils.h>
#include <libtracker-common/tracker-type-utils.h>
#include "tracker-dbus.h"
-#include "tracker-dbus-files.h"
+#include "tracker-dbus-tracker-files.h"
#include "tracker-db.h"
#include "tracker-metadata.h"
#include "tracker-service-manager.h"
#include "tracker-marshal.h"
-#define GET_PRIV(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), TRACKER_TYPE_DBUS_FILES, TrackerDBusFilesPriv))
+
+#define GET_PRIV(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), TRACKER_TYPE_DBUS_TRACKER_FILES, TrackerDBusTrackerFilesPriv))
typedef struct {
DBConnection *db_con;
-} TrackerDBusFilesPriv;
+} TrackerDBusTrackerFilesPriv;
enum {
PROP_0,
@@ -52,10 +55,10 @@
const GValue *value,
GParamSpec *pspec);
-G_DEFINE_TYPE(TrackerDBusFiles, tracker_dbus_files, G_TYPE_OBJECT)
+G_DEFINE_TYPE(TrackerDBusTrackerFiles, tracker_dbus_tracker_files, G_TYPE_OBJECT)
static void
-tracker_dbus_files_class_init (TrackerDBusFilesClass *klass)
+tracker_dbus_tracker_files_class_init (TrackerDBusTrackerFilesClass *klass)
{
GObjectClass *object_class;
@@ -71,22 +74,22 @@
"Database connection to use in transactions",
G_PARAM_WRITABLE));
- g_type_class_add_private (object_class, sizeof (TrackerDBusFilesPriv));
+ g_type_class_add_private (object_class, sizeof (TrackerDBusTrackerFilesPriv));
}
static void
-tracker_dbus_files_init (TrackerDBusFiles *object)
+tracker_dbus_tracker_files_init (TrackerDBusTrackerFiles *object)
{
}
static void
dbus_files_finalize (GObject *object)
{
- TrackerDBusFilesPriv *priv;
+ TrackerDBusTrackerFilesPriv *priv;
priv = GET_PRIV (object);
- G_OBJECT_CLASS (tracker_dbus_files_parent_class)->finalize (object);
+ G_OBJECT_CLASS (tracker_dbus_tracker_files_parent_class)->finalize (object);
}
static void
@@ -95,13 +98,13 @@
const GValue *value,
GParamSpec *pspec)
{
- TrackerDBusFilesPriv *priv;
+ TrackerDBusTrackerFilesPriv *priv;
priv = GET_PRIV (object);
switch (param_id) {
case PROP_DB_CONNECTION:
- tracker_dbus_files_set_db_connection (TRACKER_DBUS_FILES (object),
+ tracker_dbus_tracker_files_set_db_connection (TRACKER_DBUS_TRACKER_FILES (object),
g_value_get_pointer (value));
break;
@@ -111,12 +114,12 @@
};
}
-TrackerDBusFiles *
-tracker_dbus_files_new (DBConnection *db_con)
+TrackerDBusTrackerFiles *
+tracker_dbus_tracker_files_new (DBConnection *db_con)
{
- TrackerDBusFiles *object;
+ TrackerDBusTrackerFiles *object;
- object = g_object_new (TRACKER_TYPE_DBUS_FILES,
+ object = g_object_new (TRACKER_TYPE_DBUS_TRACKER_FILES,
"db-connection", db_con,
NULL);
@@ -124,12 +127,12 @@
}
void
-tracker_dbus_files_set_db_connection (TrackerDBusFiles *object,
+tracker_dbus_tracker_files_set_db_connection (TrackerDBusTrackerFiles *object,
DBConnection *db_con)
{
- TrackerDBusFilesPriv *priv;
+ TrackerDBusTrackerFilesPriv *priv;
- g_return_if_fail (TRACKER_IS_DBUS_FILES (object));
+ g_return_if_fail (TRACKER_IS_DBUS_TRACKER_FILES (object));
g_return_if_fail (db_con != NULL);
priv = GET_PRIV (object);
@@ -143,13 +146,13 @@
* Functions
*/
gboolean
-tracker_dbus_files_exist (TrackerDBusFiles *object,
+tracker_dbus_tracker_files_exist (TrackerDBusTrackerFiles *object,
const gchar *uri,
gboolean auto_create,
gboolean *value,
GError **error)
{
- TrackerDBusFilesPriv *priv;
+ TrackerDBusTrackerFilesPriv *priv;
guint request_id;
DBConnection *db_con;
guint32 file_id;
@@ -200,7 +203,7 @@
}
gboolean
-tracker_dbus_files_create (TrackerDBusFiles *object,
+tracker_dbus_tracker_files_create (TrackerDBusTrackerFiles *object,
const gchar *uri,
gboolean is_directory,
const gchar *mime,
@@ -208,7 +211,7 @@
gint mtime,
GError **error)
{
- TrackerDBusFilesPriv *priv;
+ TrackerDBusTrackerFilesPriv *priv;
guint request_id;
DBConnection *db_con;
FileInfo *info;
@@ -270,9 +273,9 @@
"File or directory has been created in database, uri:'%s'",
uri);
- file_id_str = tracker_uint_to_str (file_id);
- mtime_str = tracker_int_to_str (mtime);
- size_str = tracker_int_to_str (size);
+ file_id_str = tracker_uint_to_string (file_id);
+ mtime_str = tracker_int_to_string (mtime);
+ size_str = tracker_int_to_string (size);
tracker_db_set_single_metadata (db_con,
service,
@@ -325,11 +328,11 @@
}
gboolean
-tracker_dbus_files_delete (TrackerDBusFiles *object,
+tracker_dbus_tracker_files_delete (TrackerDBusTrackerFiles *object,
const gchar *uri,
GError **error)
{
- TrackerDBusFilesPriv *priv;
+ TrackerDBusTrackerFilesPriv *priv;
TrackerDBResultSet *result_set;
guint request_id;
DBConnection *db_con;
@@ -403,12 +406,12 @@
}
gboolean
-tracker_dbus_files_get_service_type (TrackerDBusFiles *object,
+tracker_dbus_tracker_files_get_service_type (TrackerDBusTrackerFiles *object,
const gchar *uri,
gchar **value,
GError **error)
{
- TrackerDBusFilesPriv *priv;
+ TrackerDBusTrackerFilesPriv *priv;
TrackerDBResultSet *result_set;
guint request_id;
DBConnection *db_con;
@@ -442,7 +445,7 @@
}
/* Get mime */
- file_id_str = tracker_uint_to_str (file_id);
+ file_id_str = tracker_uint_to_string (file_id);
mime = NULL;
result_set = tracker_db_get_metadata (db_con,
@@ -487,14 +490,14 @@
}
gboolean
-tracker_dbus_files_get_text_contents (TrackerDBusFiles *object,
+tracker_dbus_tracker_files_get_text_contents (TrackerDBusTrackerFiles *object,
const gchar *uri,
gint offset,
gint max_length,
gchar **value,
GError **error)
{
- TrackerDBusFilesPriv *priv;
+ TrackerDBusTrackerFilesPriv *priv;
TrackerDBResultSet *result_set;
guint request_id;
DBConnection *db_con;
@@ -533,8 +536,8 @@
}
}
- offset_str = tracker_int_to_str (offset);
- max_length_str = tracker_int_to_str (max_length);
+ offset_str = tracker_int_to_string (offset);
+ max_length_str = tracker_int_to_string (max_length);
result_set = tracker_exec_proc (db_con->blob,
"GetFileContents",
@@ -568,14 +571,14 @@
}
gboolean
-tracker_dbus_files_search_text_contents (TrackerDBusFiles *object,
+tracker_dbus_tracker_files_search_text_contents (TrackerDBusTrackerFiles *object,
const gchar *uri,
const gchar *text,
gint max_length,
gchar **value,
GError **error)
{
- TrackerDBusFilesPriv *priv;
+ TrackerDBusTrackerFilesPriv *priv;
TrackerDBResultSet *result_set = NULL;
guint request_id;
DBConnection *db_con;
@@ -608,7 +611,7 @@
path = tracker_get_vfs_path (uri);
}
- max_length_str = tracker_int_to_str (max_length);
+ max_length_str = tracker_int_to_string (max_length);
/* result_set = tracker_exec_proc (db_con, */
/* "SearchFileContents", */
@@ -642,7 +645,7 @@
}
gboolean
-tracker_dbus_files_get_by_service_type (TrackerDBusFiles *object,
+tracker_dbus_tracker_files_get_by_service_type (TrackerDBusTrackerFiles *object,
gint live_query_id,
const gchar *service,
gint offset,
@@ -650,7 +653,7 @@
gchar ***values,
GError **error)
{
- TrackerDBusFilesPriv *priv;
+ TrackerDBusTrackerFilesPriv *priv;
TrackerDBResultSet *result_set;
guint request_id;
DBConnection *db_con;
@@ -699,7 +702,7 @@
}
gboolean
-tracker_dbus_files_get_by_mime_type (TrackerDBusFiles *object,
+tracker_dbus_tracker_files_get_by_mime_type (TrackerDBusTrackerFiles *object,
gint live_query_id,
gchar **mime_types,
gint offset,
@@ -707,7 +710,7 @@
gchar ***values,
GError **error)
{
- TrackerDBusFilesPriv *priv;
+ TrackerDBusTrackerFilesPriv *priv;
TrackerDBResultSet *result_set;
guint request_id;
DBConnection *db_con;
@@ -751,7 +754,7 @@
}
gboolean
-tracker_dbus_files_get_by_mime_type_vfs (TrackerDBusFiles *object,
+tracker_dbus_tracker_files_get_by_mime_type_vfs (TrackerDBusTrackerFiles *object,
gint live_query_id,
gchar **mime_types,
gint offset,
@@ -759,7 +762,7 @@
gchar ***values,
GError **error)
{
- TrackerDBusFilesPriv *priv;
+ TrackerDBusTrackerFilesPriv *priv;
TrackerDBResultSet *result_set;
guint request_id;
DBConnection *db_con;
@@ -806,12 +809,12 @@
}
gboolean
-tracker_dbus_files_get_mtime (TrackerDBusFiles *object,
+tracker_dbus_tracker_files_get_mtime (TrackerDBusTrackerFiles *object,
const gchar *uri,
gint *value,
GError **error)
{
- TrackerDBusFilesPriv *priv;
+ TrackerDBusTrackerFilesPriv *priv;
TrackerDBResultSet *result_set;
guint request_id;
DBConnection *db_con;
@@ -865,14 +868,14 @@
}
gboolean
-tracker_dbus_files_get_metadata_for_files_in_folder (TrackerDBusFiles *object,
+tracker_dbus_tracker_files_get_metadata_for_files_in_folder (TrackerDBusTrackerFiles *object,
gint live_query_id,
const gchar *uri,
gchar **fields,
GPtrArray **values,
GError **error)
{
- TrackerDBusFilesPriv *priv;
+ TrackerDBusTrackerFilesPriv *priv;
TrackerDBResultSet *result_set;
guint request_id;
DBConnection *db_con;
Copied: branches/indexer-split/src/trackerd/tracker-dbus-tracker-files.h (from r1319, /branches/indexer-split/src/trackerd/tracker-dbus-files.h)
==============================================================================
--- /branches/indexer-split/src/trackerd/tracker-dbus-files.h (original)
+++ branches/indexer-split/src/trackerd/tracker-dbus-tracker-files.h Mon Apr 28 15:04:11 2008
@@ -19,8 +19,8 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef __TRACKER_DBUS_FILES_H__
-#define __TRACKER_DBUS_FILES_H__
+#ifndef __TRACKER_DBUS_TRACKER_FILES_H__
+#define __TRACKER_DBUS_TRACKER_FILES_H__
#include <dbus/dbus-glib.h>
#include <dbus/dbus-glib-bindings.h>
@@ -28,94 +28,94 @@
#include "tracker-db-sqlite.h"
-#define TRACKER_DBUS_FILES_SERVICE "org.freedesktop.Tracker"
-#define TRACKER_DBUS_FILES_PATH "/org/freedesktop/Tracker/Files"
-#define TRACKER_DBUS_FILES_INTERFACE "org.freedesktop.Tracker.Files"
+#define TRACKER_DBUS_TRACKER_FILES_SERVICE "org.freedesktop.Tracker"
+#define TRACKER_DBUS_TRACKER_FILES_PATH "/org/freedesktop/Tracker/Files"
+#define TRACKER_DBUS_TRACKER_FILES_INTERFACE "org.freedesktop.Tracker.Files"
G_BEGIN_DECLS
-#define TRACKER_TYPE_DBUS_FILES (tracker_dbus_files_get_type ())
-#define TRACKER_DBUS_FILES(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), TRACKER_TYPE_DBUS_FILES, TrackerDBusFiles))
-#define TRACKER_DBUS_FILES_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TRACKER_TYPE_DBUS_FILES, TrackerDBusFilesClass))
-#define TRACKER_IS_DBUS_FILES(object) (G_TYPE_CHECK_INSTANCE_TYPE ((object), TRACKER_TYPE_DBUS_FILES))
-#define TRACKER_IS_DBUS_FILES_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TRACKER_TYPE_DBUS_FILES))
-#define TRACKER_DBUS_FILES_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TRACKER_TYPE_DBUS_FILES, TrackerDBusFilesClass))
+#define TRACKER_TYPE_DBUS_TRACKER_FILES (tracker_dbus_tracker_files_get_type ())
+#define TRACKER_DBUS_TRACKER_FILES(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), TRACKER_TYPE_DBUS_TRACKER_FILES, TrackerDBusTrackerFiles))
+#define TRACKER_DBUS_TRACKER_FILES_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TRACKER_TYPE_DBUS_TRACKER_FILES, TrackerDBusTrackerFilesClass))
+#define TRACKER_IS_DBUS_TRACKER_FILES(object) (G_TYPE_CHECK_INSTANCE_TYPE ((object), TRACKER_TYPE_DBUS_TRACKER_FILES))
+#define TRACKER_IS_DBUS_TRACKER_FILES_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TRACKER_TYPE_DBUS_TRACKER_FILES))
+#define TRACKER_DBUS_TRACKER_FILES_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TRACKER_TYPE_DBUS_TRACKER_FILES, TrackerDBusTrackerFilesClass))
-typedef struct TrackerDBusFiles TrackerDBusFiles;
-typedef struct TrackerDBusFilesClass TrackerDBusFilesClass;
+typedef struct TrackerDBusTrackerFiles TrackerDBusTrackerFiles;
+typedef struct TrackerDBusTrackerFilesClass TrackerDBusTrackerFilesClass;
-struct TrackerDBusFiles {
+struct TrackerDBusTrackerFiles {
GObject parent;
};
-struct TrackerDBusFilesClass {
+struct TrackerDBusTrackerFilesClass {
GObjectClass parent;
};
-GType tracker_dbus_files_get_type (void);
+GType tracker_dbus_tracker_files_get_type (void);
-TrackerDBusFiles *
- tracker_dbus_files_new (DBConnection *db_con);
-void tracker_dbus_files_set_db_connection (TrackerDBusFiles *object,
+TrackerDBusTrackerFiles *
+ tracker_dbus_tracker_files_new (DBConnection *db_con);
+void tracker_dbus_tracker_files_set_db_connection (TrackerDBusTrackerFiles *object,
DBConnection *db_con);
-gboolean tracker_dbus_files_exist (TrackerDBusFiles *object,
+gboolean tracker_dbus_tracker_files_exist (TrackerDBusTrackerFiles *object,
const gchar *uri,
gboolean auto_create,
gboolean *value,
GError **error);
-gboolean tracker_dbus_files_create (TrackerDBusFiles *object,
+gboolean tracker_dbus_tracker_files_create (TrackerDBusTrackerFiles *object,
const gchar *uri,
gboolean is_directory,
const gchar *mime,
gint size,
gint mtime,
GError **error);
-gboolean tracker_dbus_files_delete (TrackerDBusFiles *object,
+gboolean tracker_dbus_tracker_files_delete (TrackerDBusTrackerFiles *object,
const gchar *uri,
GError **error);
-gboolean tracker_dbus_files_get_service_type (TrackerDBusFiles *object,
+gboolean tracker_dbus_tracker_files_get_service_type (TrackerDBusTrackerFiles *object,
const gchar *uri,
gchar **value,
GError **error);
-gboolean tracker_dbus_files_get_text_contents (TrackerDBusFiles *object,
+gboolean tracker_dbus_tracker_files_get_text_contents (TrackerDBusTrackerFiles *object,
const gchar *uri,
gint offset,
gint max_length,
gchar **value,
GError **error);
-gboolean tracker_dbus_files_search_text_contents (TrackerDBusFiles *object,
+gboolean tracker_dbus_tracker_files_search_text_contents (TrackerDBusTrackerFiles *object,
const gchar *uri,
const gchar *text,
gint max_length,
gchar **value,
GError **error);
-gboolean tracker_dbus_files_get_by_service_type (TrackerDBusFiles *object,
+gboolean tracker_dbus_tracker_files_get_by_service_type (TrackerDBusTrackerFiles *object,
gint live_query_id,
const gchar *service,
gint offset,
gint max_hits,
gchar ***values,
GError **error);
-gboolean tracker_dbus_files_get_by_mime_type (TrackerDBusFiles *object,
+gboolean tracker_dbus_tracker_files_get_by_mime_type (TrackerDBusTrackerFiles *object,
gint live_query_id,
gchar **mime_types,
gint offset,
gint max_hits,
gchar ***values,
GError **error);
-gboolean tracker_dbus_files_get_by_mime_type_vfs (TrackerDBusFiles *object,
+gboolean tracker_dbus_tracker_files_get_by_mime_type_vfs (TrackerDBusTrackerFiles *object,
gint live_query_id,
gchar **mime_types,
gint offset,
gint max_hits,
gchar ***values,
GError **error);
-gboolean tracker_dbus_files_get_mtime (TrackerDBusFiles *object,
+gboolean tracker_dbus_tracker_files_get_mtime (TrackerDBusTrackerFiles *object,
const gchar *uri,
gint *value,
GError **error);
-gboolean tracker_dbus_files_get_metadata_for_files_in_folder (TrackerDBusFiles *object,
+gboolean tracker_dbus_tracker_files_get_metadata_for_files_in_folder (TrackerDBusTrackerFiles *object,
gint live_query_id,
const gchar *uri,
gchar **fields,
@@ -124,4 +124,4 @@
G_END_DECLS
-#endif /* __TRACKER_DBUS_FILES_H__ */
+#endif /* __TRACKER_DBUS_TRACKER_FILES_H__ */
Copied: branches/indexer-split/src/trackerd/tracker-dbus-tracker-keywords.c (from r1319, /branches/indexer-split/src/trackerd/tracker-dbus-keywords.c)
==============================================================================
--- /branches/indexer-split/src/trackerd/tracker-dbus-keywords.c (original)
+++ branches/indexer-split/src/trackerd/tracker-dbus-tracker-keywords.c Mon Apr 28 15:04:11 2008
@@ -28,16 +28,16 @@
#include <libtracker-common/tracker-utils.h>
#include "tracker-dbus.h"
-#include "tracker-dbus-keywords.h"
+#include "tracker-dbus-tracker-keywords.h"
#include "tracker-db.h"
#include "tracker-marshal.h"
-#define GET_PRIV(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), TRACKER_TYPE_DBUS_KEYWORDS, TrackerDBusKeywordsPriv))
+#define GET_PRIV(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), TRACKER_TYPE_DBUS_TRACKER_KEYWORDS, TrackerDBusTrackerKeywordsPriv))
typedef struct {
DBusGProxy *fd_proxy;
DBConnection *db_con;
-} TrackerDBusKeywordsPriv;
+} TrackerDBusTrackerKeywordsPriv;
enum {
PROP_0,
@@ -58,10 +58,10 @@
static guint signals[LAST_SIGNAL] = {0};
-G_DEFINE_TYPE(TrackerDBusKeywords, tracker_dbus_keywords, G_TYPE_OBJECT)
+G_DEFINE_TYPE(TrackerDBusTrackerKeywords, tracker_dbus_tracker_keywords, G_TYPE_OBJECT)
static void
-tracker_dbus_keywords_class_init (TrackerDBusKeywordsClass *klass)
+tracker_dbus_tracker_keywords_class_init (TrackerDBusTrackerKeywordsClass *klass)
{
GObjectClass *object_class;
@@ -96,18 +96,18 @@
G_TYPE_NONE,
3, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING);
- g_type_class_add_private (object_class, sizeof (TrackerDBusKeywordsPriv));
+ g_type_class_add_private (object_class, sizeof (TrackerDBusTrackerKeywordsPriv));
}
static void
-tracker_dbus_keywords_init (TrackerDBusKeywords *object)
+tracker_dbus_tracker_keywords_init (TrackerDBusTrackerKeywords *object)
{
}
static void
dbus_keywords_finalize (GObject *object)
{
- TrackerDBusKeywordsPriv *priv;
+ TrackerDBusTrackerKeywordsPriv *priv;
priv = GET_PRIV (object);
@@ -115,7 +115,7 @@
g_object_unref (priv->fd_proxy);
}
- G_OBJECT_CLASS (tracker_dbus_keywords_parent_class)->finalize (object);
+ G_OBJECT_CLASS (tracker_dbus_tracker_keywords_parent_class)->finalize (object);
}
static void
@@ -124,13 +124,13 @@
const GValue *value,
GParamSpec *pspec)
{
- TrackerDBusKeywordsPriv *priv;
+ TrackerDBusTrackerKeywordsPriv *priv;
priv = GET_PRIV (object);
switch (param_id) {
case PROP_DB_CONNECTION:
- tracker_dbus_keywords_set_db_connection (TRACKER_DBUS_KEYWORDS (object),
+ tracker_dbus_tracker_keywords_set_db_connection (TRACKER_DBUS_TRACKER_KEYWORDS (object),
g_value_get_pointer (value));
break;
@@ -140,12 +140,12 @@
};
}
-TrackerDBusKeywords *
-tracker_dbus_keywords_new (DBConnection *db_con)
+TrackerDBusTrackerKeywords *
+tracker_dbus_tracker_keywords_new (DBConnection *db_con)
{
- TrackerDBusKeywords *object;
+ TrackerDBusTrackerKeywords *object;
- object = g_object_new (TRACKER_TYPE_DBUS_KEYWORDS,
+ object = g_object_new (TRACKER_TYPE_DBUS_TRACKER_KEYWORDS,
"db-connection", db_con,
NULL);
@@ -153,12 +153,12 @@
}
void
-tracker_dbus_keywords_set_db_connection (TrackerDBusKeywords *object,
+tracker_dbus_tracker_keywords_set_db_connection (TrackerDBusTrackerKeywords *object,
DBConnection *db_con)
{
- TrackerDBusKeywordsPriv *priv;
+ TrackerDBusTrackerKeywordsPriv *priv;
- g_return_if_fail (TRACKER_IS_DBUS_KEYWORDS (object));
+ g_return_if_fail (TRACKER_IS_DBUS_TRACKER_KEYWORDS (object));
g_return_if_fail (db_con != NULL);
priv = GET_PRIV (object);
@@ -172,12 +172,12 @@
* Functions
*/
gboolean
-tracker_dbus_keywords_get_list (TrackerDBusKeywords *object,
+tracker_dbus_tracker_keywords_get_list (TrackerDBusTrackerKeywords *object,
const gchar *service,
GPtrArray **values,
GError **error)
{
- TrackerDBusKeywordsPriv *priv;
+ TrackerDBusTrackerKeywordsPriv *priv;
TrackerDBResultSet *result_set;
guint request_id;
DBConnection *db_con;
@@ -220,13 +220,13 @@
}
gboolean
-tracker_dbus_keywords_get (TrackerDBusKeywords *object,
+tracker_dbus_tracker_keywords_get (TrackerDBusTrackerKeywords *object,
const gchar *service,
const gchar *uri,
gchar ***values,
GError **error)
{
- TrackerDBusKeywordsPriv *priv;
+ TrackerDBusTrackerKeywordsPriv *priv;
TrackerDBResultSet *result_set;
DBConnection *db_con;
guint request_id;
@@ -292,13 +292,13 @@
}
gboolean
-tracker_dbus_keywords_add (TrackerDBusKeywords *object,
+tracker_dbus_tracker_keywords_add (TrackerDBusTrackerKeywords *object,
const gchar *service,
const gchar *uri,
gchar **values,
GError **error)
{
- TrackerDBusKeywordsPriv *priv;
+ TrackerDBusTrackerKeywordsPriv *priv;
DBConnection *db_con;
guint request_id;
gchar *id;
@@ -363,13 +363,13 @@
}
gboolean
-tracker_dbus_keywords_remove (TrackerDBusKeywords *object,
+tracker_dbus_tracker_keywords_remove (TrackerDBusTrackerKeywords *object,
const gchar *service,
const gchar *uri,
gchar **values,
GError **error)
{
- TrackerDBusKeywordsPriv *priv;
+ TrackerDBusTrackerKeywordsPriv *priv;
DBConnection *db_con;
guint request_id;
gchar *id;
@@ -438,12 +438,12 @@
}
gboolean
-tracker_dbus_keywords_remove_all (TrackerDBusKeywords *object,
+tracker_dbus_tracker_keywords_remove_all (TrackerDBusTrackerKeywords *object,
const gchar *service,
const gchar *uri,
GError **error)
{
- TrackerDBusKeywordsPriv *priv;
+ TrackerDBusTrackerKeywordsPriv *priv;
DBConnection *db_con;
guint request_id;
gchar *id;
@@ -501,7 +501,7 @@
}
gboolean
-tracker_dbus_keywords_search (TrackerDBusKeywords *object,
+tracker_dbus_tracker_keywords_search (TrackerDBusTrackerKeywords *object,
gint live_query_id,
const gchar *service,
const gchar **keywords,
@@ -510,7 +510,7 @@
gchar ***values,
GError **error)
{
- TrackerDBusKeywordsPriv *priv;
+ TrackerDBusTrackerKeywordsPriv *priv;
TrackerDBResultSet *result_set;
DBConnection *db_con;
guint request_id;
Copied: branches/indexer-split/src/trackerd/tracker-dbus-tracker-keywords.h (from r1319, /branches/indexer-split/src/trackerd/tracker-dbus-keywords.h)
==============================================================================
--- /branches/indexer-split/src/trackerd/tracker-dbus-keywords.h (original)
+++ branches/indexer-split/src/trackerd/tracker-dbus-tracker-keywords.h Mon Apr 28 15:04:11 2008
@@ -19,8 +19,8 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef __TRACKER_DBUS_KEYWORDS_H__
-#define __TRACKER_DBUS_KEYWORDS_H__
+#ifndef __TRACKER_DBUS_TRACKER_KEYWORDS_H__
+#define __TRACKER_DBUS_TRACKER_KEYWORDS_H__
#include <dbus/dbus-glib.h>
#include <dbus/dbus-glib-bindings.h>
@@ -28,60 +28,60 @@
#include "tracker-db-sqlite.h"
-#define TRACKER_DBUS_KEYWORDS_SERVICE "org.freedesktop.Tracker"
-#define TRACKER_DBUS_KEYWORDS_PATH "/org/freedesktop/Tracker/Keywords"
-#define TRACKER_DBUS_KEYWORDS_INTERFACE "org.freedesktop.Tracker.Keywords"
+#define TRACKER_DBUS_TRACKER_KEYWORDS_SERVICE "org.freedesktop.Tracker"
+#define TRACKER_DBUS_TRACKER_KEYWORDS_PATH "/org/freedesktop/Tracker/Keywords"
+#define TRACKER_DBUS_TRACKER_KEYWORDS_INTERFACE "org.freedesktop.Tracker.Keywords"
G_BEGIN_DECLS
-#define TRACKER_TYPE_DBUS_KEYWORDS (tracker_dbus_keywords_get_type ())
-#define TRACKER_DBUS_KEYWORDS(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), TRACKER_TYPE_DBUS_KEYWORDS, TrackerDBusKeywords))
-#define TRACKER_DBUS_KEYWORDS_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TRACKER_TYPE_DBUS_KEYWORDS, TrackerDBusKeywordsClass))
-#define TRACKER_IS_DBUS_KEYWORDS(object) (G_TYPE_CHECK_INSTANCE_TYPE ((object), TRACKER_TYPE_DBUS_KEYWORDS))
-#define TRACKER_IS_DBUS_KEYWORDS_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TRACKER_TYPE_DBUS_KEYWORDS))
-#define TRACKER_DBUS_KEYWORDS_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TRACKER_TYPE_DBUS_KEYWORDS, TrackerDBusKeywordsClass))
+#define TRACKER_TYPE_DBUS_TRACKER_KEYWORDS (tracker_dbus_tracker_keywords_get_type ())
+#define TRACKER_DBUS_TRACKER_KEYWORDS(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), TRACKER_TYPE_DBUS_TRACKER_KEYWORDS, TrackerDBusTrackerKeywords))
+#define TRACKER_DBUS_TRACKER_KEYWORDS_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TRACKER_TYPE_DBUS_TRACKER_KEYWORDS, TrackerDBusTrackerKeywordsClass))
+#define TRACKER_IS_DBUS_TRACKER_KEYWORDS(object) (G_TYPE_CHECK_INSTANCE_TYPE ((object), TRACKER_TYPE_DBUS_TRACKER_KEYWORDS))
+#define TRACKER_IS_DBUS_TRACKER_KEYWORDS_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TRACKER_TYPE_DBUS_TRACKER_KEYWORDS))
+#define TRACKER_DBUS_TRACKER_KEYWORDS_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TRACKER_TYPE_DBUS_TRACKER_KEYWORDS, TrackerDBusTrackerKeywordsClass))
-typedef struct TrackerDBusKeywords TrackerDBusKeywords;
-typedef struct TrackerDBusKeywordsClass TrackerDBusKeywordsClass;
+typedef struct TrackerDBusTrackerKeywords TrackerDBusTrackerKeywords;
+typedef struct TrackerDBusTrackerKeywordsClass TrackerDBusTrackerKeywordsClass;
-struct TrackerDBusKeywords {
+struct TrackerDBusTrackerKeywords {
GObject parent;
};
-struct TrackerDBusKeywordsClass {
+struct TrackerDBusTrackerKeywordsClass {
GObjectClass parent;
};
-GType tracker_dbus_keywords_get_type (void);
+GType tracker_dbus_tracker_keywords_get_type (void);
-TrackerDBusKeywords *
- tracker_dbus_keywords_new (DBConnection *db_con);
-void tracker_dbus_keywords_set_db_connection (TrackerDBusKeywords *object,
+TrackerDBusTrackerKeywords *
+ tracker_dbus_tracker_keywords_new (DBConnection *db_con);
+void tracker_dbus_tracker_keywords_set_db_connection (TrackerDBusTrackerKeywords *object,
DBConnection *db_con);
-gboolean tracker_dbus_keywords_get_list (TrackerDBusKeywords *object,
+gboolean tracker_dbus_tracker_keywords_get_list (TrackerDBusTrackerKeywords *object,
const gchar *service,
GPtrArray **values,
GError **error);
-gboolean tracker_dbus_keywords_get (TrackerDBusKeywords *object,
+gboolean tracker_dbus_tracker_keywords_get (TrackerDBusTrackerKeywords *object,
const gchar *service,
const gchar *uri,
gchar ***values,
GError **error);
-gboolean tracker_dbus_keywords_add (TrackerDBusKeywords *object,
+gboolean tracker_dbus_tracker_keywords_add (TrackerDBusTrackerKeywords *object,
const gchar *service,
const gchar *uri,
gchar **values,
GError **error);
-gboolean tracker_dbus_keywords_remove (TrackerDBusKeywords *object,
+gboolean tracker_dbus_tracker_keywords_remove (TrackerDBusTrackerKeywords *object,
const gchar *service,
const gchar *uri,
gchar **values,
GError **error);
-gboolean tracker_dbus_keywords_remove_all (TrackerDBusKeywords *object,
+gboolean tracker_dbus_tracker_keywords_remove_all (TrackerDBusTrackerKeywords *object,
const gchar *service,
const gchar *uri,
GError **error);
-gboolean tracker_dbus_keywords_search (TrackerDBusKeywords *object,
+gboolean tracker_dbus_tracker_keywords_search (TrackerDBusTrackerKeywords *object,
gint live_query_id,
const gchar *service,
const gchar **keywords,
@@ -92,4 +92,4 @@
G_END_DECLS
-#endif /* __TRACKER_DBUS_KEYWORDS_H__ */
+#endif /* __TRACKER_DBUS_TRACKER_KEYWORDS_H__ */
Copied: branches/indexer-split/src/trackerd/tracker-dbus-tracker-metadata.c (from r1319, /branches/indexer-split/src/trackerd/tracker-dbus-metadata.c)
==============================================================================
--- /branches/indexer-split/src/trackerd/tracker-dbus-metadata.c (original)
+++ branches/indexer-split/src/trackerd/tracker-dbus-tracker-metadata.c Mon Apr 28 15:04:11 2008
@@ -28,15 +28,15 @@
#include <libtracker-common/tracker-utils.h>
#include "tracker-dbus.h"
-#include "tracker-dbus-metadata.h"
+#include "tracker-dbus-tracker-metadata.h"
#include "tracker-db.h"
#include "tracker-marshal.h"
-#define GET_PRIV(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), TRACKER_TYPE_DBUS_METADATA, TrackerDBusMetadataPriv))
+#define GET_PRIV(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), TRACKER_TYPE_DBUS_TRACKER_METADATA, TrackerDBusTrackerMetadataPriv))
typedef struct {
DBConnection *db_con;
-} TrackerDBusMetadataPriv;
+} TrackerDBusTrackerMetadataPriv;
enum {
PROP_0,
@@ -57,10 +57,10 @@
NULL
};
-G_DEFINE_TYPE(TrackerDBusMetadata, tracker_dbus_metadata, G_TYPE_OBJECT)
+G_DEFINE_TYPE(TrackerDBusTrackerMetadata, tracker_dbus_tracker_metadata, G_TYPE_OBJECT)
static void
-tracker_dbus_metadata_class_init (TrackerDBusMetadataClass *klass)
+tracker_dbus_tracker_metadata_class_init (TrackerDBusTrackerMetadataClass *klass)
{
GObjectClass *object_class;
@@ -76,22 +76,22 @@
"Database connection to use in transactions",
G_PARAM_WRITABLE));
- g_type_class_add_private (object_class, sizeof (TrackerDBusMetadataPriv));
+ g_type_class_add_private (object_class, sizeof (TrackerDBusTrackerMetadataPriv));
}
static void
-tracker_dbus_metadata_init (TrackerDBusMetadata *object)
+tracker_dbus_tracker_metadata_init (TrackerDBusTrackerMetadata *object)
{
}
static void
dbus_metadata_finalize (GObject *object)
{
- TrackerDBusMetadataPriv *priv;
+ TrackerDBusTrackerMetadataPriv *priv;
priv = GET_PRIV (object);
- G_OBJECT_CLASS (tracker_dbus_metadata_parent_class)->finalize (object);
+ G_OBJECT_CLASS (tracker_dbus_tracker_metadata_parent_class)->finalize (object);
}
static void
@@ -100,13 +100,13 @@
const GValue *value,
GParamSpec *pspec)
{
- TrackerDBusMetadataPriv *priv;
+ TrackerDBusTrackerMetadataPriv *priv;
priv = GET_PRIV (object);
switch (param_id) {
case PROP_DB_CONNECTION:
- tracker_dbus_metadata_set_db_connection (TRACKER_DBUS_METADATA (object),
+ tracker_dbus_tracker_metadata_set_db_connection (TRACKER_DBUS_TRACKER_METADATA (object),
g_value_get_pointer (value));
break;
@@ -116,12 +116,12 @@
};
}
-TrackerDBusMetadata *
-tracker_dbus_metadata_new (DBConnection *db_con)
+TrackerDBusTrackerMetadata *
+tracker_dbus_tracker_metadata_new (DBConnection *db_con)
{
- TrackerDBusMetadata *object;
+ TrackerDBusTrackerMetadata *object;
- object = g_object_new (TRACKER_TYPE_DBUS_METADATA,
+ object = g_object_new (TRACKER_TYPE_DBUS_TRACKER_METADATA,
"db-connection", db_con,
NULL);
@@ -129,12 +129,12 @@
}
void
-tracker_dbus_metadata_set_db_connection (TrackerDBusMetadata *object,
+tracker_dbus_tracker_metadata_set_db_connection (TrackerDBusTrackerMetadata *object,
DBConnection *db_con)
{
- TrackerDBusMetadataPriv *priv;
+ TrackerDBusTrackerMetadataPriv *priv;
- g_return_if_fail (TRACKER_IS_DBUS_METADATA (object));
+ g_return_if_fail (TRACKER_IS_DBUS_TRACKER_METADATA (object));
g_return_if_fail (db_con != NULL);
priv = GET_PRIV (object);
@@ -148,14 +148,14 @@
* Functions
*/
gboolean
-tracker_dbus_metadata_get (TrackerDBusMetadata *object,
+tracker_dbus_tracker_metadata_get (TrackerDBusTrackerMetadata *object,
const gchar *service,
const gchar *id,
gchar **keys,
gchar ***values,
GError **error)
{
- TrackerDBusMetadataPriv *priv;
+ TrackerDBusTrackerMetadataPriv *priv;
TrackerDBResultSet *result_set;
guint request_id;
DBConnection *db_con;
@@ -291,14 +291,14 @@
}
gboolean
-tracker_dbus_metadata_set (TrackerDBusMetadata *object,
+tracker_dbus_tracker_metadata_set (TrackerDBusTrackerMetadata *object,
const gchar *service,
const gchar *id,
gchar **keys,
gchar **values,
GError **error)
{
- TrackerDBusMetadataPriv *priv;
+ TrackerDBusTrackerMetadataPriv *priv;
guint request_id;
DBConnection *db_con;
gchar *service_id;
@@ -378,12 +378,12 @@
}
gboolean
-tracker_dbus_metadata_register_type (TrackerDBusMetadata *object,
+tracker_dbus_tracker_metadata_register_type (TrackerDBusTrackerMetadata *object,
const gchar *metadata,
const gchar *type,
GError **error)
{
- TrackerDBusMetadataPriv *priv;
+ TrackerDBusTrackerMetadataPriv *priv;
guint request_id;
DBConnection *db_con;
const gchar *type_id;
@@ -444,14 +444,14 @@
}
gboolean
-tracker_dbus_metadata_get_type_details (TrackerDBusMetadata *object,
+tracker_dbus_tracker_metadata_get_type_details (TrackerDBusTrackerMetadata *object,
const gchar *metadata,
gchar **type,
gboolean *is_embedded,
gboolean *is_writable,
GError **error)
{
- TrackerDBusMetadataPriv *priv;
+ TrackerDBusTrackerMetadataPriv *priv;
TrackerDBResultSet *result_set;
guint request_id;
DBConnection *db_con;
@@ -498,12 +498,12 @@
}
gboolean
-tracker_dbus_metadata_get_registered_types (TrackerDBusMetadata *object,
+tracker_dbus_tracker_metadata_get_registered_types (TrackerDBusTrackerMetadata *object,
const gchar *class,
gchar ***values,
GError **error)
{
- TrackerDBusMetadataPriv *priv;
+ TrackerDBusTrackerMetadataPriv *priv;
TrackerDBResultSet *result_set;
guint request_id;
DBConnection *db_con;
@@ -534,12 +534,12 @@
}
gboolean
-tracker_dbus_metadata_get_writable_types (TrackerDBusMetadata *object,
+tracker_dbus_tracker_metadata_get_writable_types (TrackerDBusTrackerMetadata *object,
const gchar *class,
gchar ***values,
GError **error)
{
- TrackerDBusMetadataPriv *priv;
+ TrackerDBusTrackerMetadataPriv *priv;
TrackerDBResultSet *result_set;
guint request_id;
DBConnection *db_con;
@@ -576,11 +576,11 @@
}
gboolean
-tracker_dbus_metadata_get_registered_classes (TrackerDBusMetadata *object,
+tracker_dbus_tracker_metadata_get_registered_classes (TrackerDBusTrackerMetadata *object,
gchar ***values,
GError **error)
{
- TrackerDBusMetadataPriv *priv;
+ TrackerDBusTrackerMetadataPriv *priv;
TrackerDBResultSet *result_set;
guint request_id;
DBConnection *db_con;
Copied: branches/indexer-split/src/trackerd/tracker-dbus-tracker-metadata.h (from r1319, /branches/indexer-split/src/trackerd/tracker-dbus-metadata.h)
==============================================================================
--- /branches/indexer-split/src/trackerd/tracker-dbus-metadata.h (original)
+++ branches/indexer-split/src/trackerd/tracker-dbus-tracker-metadata.h Mon Apr 28 15:04:11 2008
@@ -19,8 +19,8 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef __TRACKER_DBUS_METADATA_H__
-#define __TRACKER_DBUS_METADATA_H__
+#ifndef __TRACKER_DBUS_TRACKER_METADATA_H__
+#define __TRACKER_DBUS_TRACKER_METADATA_H__
#include <dbus/dbus-glib.h>
#include <dbus/dbus-glib-bindings.h>
@@ -29,66 +29,66 @@
#include "tracker-db-sqlite.h"
#include "tracker-indexer.h"
-#define TRACKER_DBUS_METADATA_SERVICE "org.freedesktop.Tracker"
-#define TRACKER_DBUS_METADATA_PATH "/org/freedesktop/Tracker/Metadata"
-#define TRACKER_DBUS_METADATA_INTERFACE "org.freedesktop.Tracker.Metadata"
+#define TRACKER_DBUS_TRACKER_METADATA_SERVICE "org.freedesktop.Tracker"
+#define TRACKER_DBUS_TRACKER_METADATA_PATH "/org/freedesktop/Tracker/Metadata"
+#define TRACKER_DBUS_TRACKER_METADATA_INTERFACE "org.freedesktop.Tracker.Metadata"
G_BEGIN_DECLS
-#define TRACKER_TYPE_DBUS_METADATA (tracker_dbus_metadata_get_type ())
-#define TRACKER_DBUS_METADATA(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), TRACKER_TYPE_DBUS_METADATA, TrackerDBusMetadata))
-#define TRACKER_DBUS_METADATA_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TRACKER_TYPE_DBUS_METADATA, TrackerDBusMetadataClass))
-#define TRACKER_IS_DBUS_METADATA(object) (G_TYPE_CHECK_INSTANCE_TYPE ((object), TRACKER_TYPE_DBUS_METADATA))
-#define TRACKER_IS_DBUS_METADATA_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TRACKER_TYPE_DBUS_METADATA))
-#define TRACKER_DBUS_METADATA_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TRACKER_TYPE_DBUS_METADATA, TrackerDBusMetadataClass))
+#define TRACKER_TYPE_DBUS_TRACKER_METADATA (tracker_dbus_tracker_metadata_get_type ())
+#define TRACKER_DBUS_TRACKER_METADATA(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), TRACKER_TYPE_DBUS_TRACKER_METADATA, TrackerDBusTrackerMetadata))
+#define TRACKER_DBUS_TRACKER_METADATA_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TRACKER_TYPE_DBUS_TRACKER_METADATA, TrackerDBusTrackerMetadataClass))
+#define TRACKER_IS_DBUS_TRACKER_METADATA(object) (G_TYPE_CHECK_INSTANCE_TYPE ((object), TRACKER_TYPE_DBUS_TRACKER_METADATA))
+#define TRACKER_IS_DBUS_TRACKER_METADATA_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TRACKER_TYPE_DBUS_TRACKER_METADATA))
+#define TRACKER_DBUS_TRACKER_METADATA_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TRACKER_TYPE_DBUS_TRACKER_METADATA, TrackerDBusTrackerMetadataClass))
-typedef struct TrackerDBusMetadata TrackerDBusMetadata;
-typedef struct TrackerDBusMetadataClass TrackerDBusMetadataClass;
+typedef struct TrackerDBusTrackerMetadata TrackerDBusTrackerMetadata;
+typedef struct TrackerDBusTrackerMetadataClass TrackerDBusTrackerMetadataClass;
-struct TrackerDBusMetadata {
+struct TrackerDBusTrackerMetadata {
GObject parent;
};
-struct TrackerDBusMetadataClass {
+struct TrackerDBusTrackerMetadataClass {
GObjectClass parent;
};
-GType tracker_dbus_metadata_get_type (void);
-TrackerDBusMetadata *
- tracker_dbus_metadata_new (DBConnection *db_con);
-void tracker_dbus_metadata_set_db_connection (TrackerDBusMetadata *object,
+GType tracker_dbus_tracker_metadata_get_type (void);
+TrackerDBusTrackerMetadata *
+ tracker_dbus_tracker_metadata_new (DBConnection *db_con);
+void tracker_dbus_tracker_metadata_set_db_connection (TrackerDBusTrackerMetadata *object,
DBConnection *db_con);
-gboolean tracker_dbus_metadata_get (TrackerDBusMetadata *object,
+gboolean tracker_dbus_tracker_metadata_get (TrackerDBusTrackerMetadata *object,
const gchar *service,
const gchar *id,
gchar **keys,
gchar ***values,
GError **error);
-gboolean tracker_dbus_metadata_set (TrackerDBusMetadata *object,
+gboolean tracker_dbus_tracker_metadata_set (TrackerDBusTrackerMetadata *object,
const gchar *service,
const gchar *id,
gchar **keys,
gchar **values,
GError **error);
-gboolean tracker_dbus_metadata_register_type (TrackerDBusMetadata *object,
+gboolean tracker_dbus_tracker_metadata_register_type (TrackerDBusTrackerMetadata *object,
const gchar *metadata,
const gchar *type,
GError **error);
-gboolean tracker_dbus_metadata_get_type_details (TrackerDBusMetadata *object,
+gboolean tracker_dbus_tracker_metadata_get_type_details (TrackerDBusTrackerMetadata *object,
const gchar *metadata,
gchar **type,
gboolean *is_embedded,
gboolean *is_writable,
GError **error);
-gboolean tracker_dbus_metadata_get_registered_types (TrackerDBusMetadata *object,
+gboolean tracker_dbus_tracker_metadata_get_registered_types (TrackerDBusTrackerMetadata *object,
const gchar *metadata,
gchar ***values,
GError **error);
-gboolean tracker_dbus_metadata_get_writable_types (TrackerDBusMetadata *object,
+gboolean tracker_dbus_tracker_metadata_get_writable_types (TrackerDBusTrackerMetadata *object,
const gchar *class,
gchar ***values,
GError **error);
-gboolean tracker_dbus_metadata_get_registered_classes (TrackerDBusMetadata *object,
+gboolean tracker_dbus_tracker_metadata_get_registered_classes (TrackerDBusTrackerMetadata *object,
gchar ***values,
GError **error);
Copied: branches/indexer-split/src/trackerd/tracker-dbus-tracker-search.c (from r1319, /branches/indexer-split/src/trackerd/tracker-dbus-search.c)
==============================================================================
--- /branches/indexer-split/src/trackerd/tracker-dbus-search.c (original)
+++ branches/indexer-split/src/trackerd/tracker-dbus-tracker-search.c Mon Apr 28 15:04:11 2008
@@ -28,7 +28,7 @@
#include <libtracker-common/tracker-utils.h>
#include "tracker-dbus.h"
-#include "tracker-dbus-search.h"
+#include "tracker-dbus-tracker-search.h"
#include "tracker-rdf-query.h"
#include "tracker-query-tree.h"
#include "tracker-indexer.h"
@@ -37,14 +37,14 @@
#define DEFAULT_SEARCH_MAX_HITS 1024
-#define GET_PRIV(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), TRACKER_TYPE_DBUS_SEARCH, TrackerDBusSearchPriv))
+#define GET_PRIV(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), TRACKER_TYPE_DBUS_TRACKER_SEARCH, TrackerDBusTrackerSearchPriv))
typedef struct {
DBusGProxy *fd_proxy;
DBConnection *db_con;
Indexer *file_index;
Indexer *email_index;
-} TrackerDBusSearchPriv;
+} TrackerDBusTrackerSearchPriv;
enum {
PROP_0,
@@ -59,10 +59,10 @@
const GValue *value,
GParamSpec *pspec);
-G_DEFINE_TYPE(TrackerDBusSearch, tracker_dbus_search, G_TYPE_OBJECT)
+G_DEFINE_TYPE(TrackerDBusTrackerSearch, tracker_dbus_tracker_search, G_TYPE_OBJECT)
static void
-tracker_dbus_search_class_init (TrackerDBusSearchClass *klass)
+tracker_dbus_tracker_search_class_init (TrackerDBusTrackerSearchClass *klass)
{
GObjectClass *object_class;
@@ -90,18 +90,18 @@
"Email index",
G_PARAM_WRITABLE));
- g_type_class_add_private (object_class, sizeof (TrackerDBusSearchPriv));
+ g_type_class_add_private (object_class, sizeof (TrackerDBusTrackerSearchPriv));
}
static void
-tracker_dbus_search_init (TrackerDBusSearch *object)
+tracker_dbus_tracker_search_init (TrackerDBusTrackerSearch *object)
{
}
static void
dbus_search_finalize (GObject *object)
{
- TrackerDBusSearchPriv *priv;
+ TrackerDBusTrackerSearchPriv *priv;
priv = GET_PRIV (object);
@@ -109,7 +109,7 @@
g_object_unref (priv->fd_proxy);
}
- G_OBJECT_CLASS (tracker_dbus_search_parent_class)->finalize (object);
+ G_OBJECT_CLASS (tracker_dbus_tracker_search_parent_class)->finalize (object);
}
static void
@@ -118,21 +118,21 @@
const GValue *value,
GParamSpec *pspec)
{
- TrackerDBusSearchPriv *priv;
+ TrackerDBusTrackerSearchPriv *priv;
priv = GET_PRIV (object);
switch (param_id) {
case PROP_DB_CONNECTION:
- tracker_dbus_search_set_db_connection (TRACKER_DBUS_SEARCH (object),
+ tracker_dbus_tracker_search_set_db_connection (TRACKER_DBUS_TRACKER_SEARCH (object),
g_value_get_pointer (value));
break;
case PROP_FILE_INDEX:
- tracker_dbus_search_set_file_index (TRACKER_DBUS_SEARCH (object),
+ tracker_dbus_tracker_search_set_file_index (TRACKER_DBUS_TRACKER_SEARCH (object),
g_value_get_pointer (value));
break;
case PROP_EMAIL_INDEX:
- tracker_dbus_search_set_email_index (TRACKER_DBUS_SEARCH (object),
+ tracker_dbus_tracker_search_set_email_index (TRACKER_DBUS_TRACKER_SEARCH (object),
g_value_get_pointer (value));
break;
default:
@@ -141,12 +141,12 @@
};
}
-TrackerDBusSearch *
-tracker_dbus_search_new (DBConnection *db_con)
+TrackerDBusTrackerSearch *
+tracker_dbus_tracker_search_new (DBConnection *db_con)
{
- TrackerDBusSearch *object;
+ TrackerDBusTrackerSearch *object;
- object = g_object_new (TRACKER_TYPE_DBUS_SEARCH,
+ object = g_object_new (TRACKER_TYPE_DBUS_TRACKER_SEARCH,
"db-connection", db_con,
NULL);
@@ -154,12 +154,12 @@
}
void
-tracker_dbus_search_set_db_connection (TrackerDBusSearch *object,
+tracker_dbus_tracker_search_set_db_connection (TrackerDBusTrackerSearch *object,
DBConnection *db_con)
{
- TrackerDBusSearchPriv *priv;
+ TrackerDBusTrackerSearchPriv *priv;
- g_return_if_fail (TRACKER_IS_DBUS_SEARCH (object));
+ g_return_if_fail (TRACKER_IS_DBUS_TRACKER_SEARCH (object));
g_return_if_fail (db_con != NULL);
priv = GET_PRIV (object);
@@ -170,12 +170,12 @@
}
void
-tracker_dbus_search_set_file_index (TrackerDBusSearch *object,
+tracker_dbus_tracker_search_set_file_index (TrackerDBusTrackerSearch *object,
Indexer *file_index)
{
- TrackerDBusSearchPriv *priv;
+ TrackerDBusTrackerSearchPriv *priv;
- g_return_if_fail (TRACKER_IS_DBUS_SEARCH (object));
+ g_return_if_fail (TRACKER_IS_DBUS_TRACKER_SEARCH (object));
g_return_if_fail (file_index != NULL);
priv = GET_PRIV (object);
@@ -186,12 +186,12 @@
}
void
-tracker_dbus_search_set_email_index (TrackerDBusSearch *object,
+tracker_dbus_tracker_search_set_email_index (TrackerDBusTrackerSearch *object,
Indexer *email_index)
{
- TrackerDBusSearchPriv *priv;
+ TrackerDBusTrackerSearchPriv *priv;
- g_return_if_fail (TRACKER_IS_DBUS_SEARCH (object));
+ g_return_if_fail (TRACKER_IS_DBUS_TRACKER_SEARCH (object));
g_return_if_fail (email_index != NULL);
priv = GET_PRIV (object);
@@ -215,13 +215,13 @@
}
gboolean
-tracker_dbus_search_get_hit_count (TrackerDBusSearch *object,
+tracker_dbus_tracker_search_get_hit_count (TrackerDBusTrackerSearch *object,
const gchar *service,
const gchar *search_text,
gint *value,
GError **error)
{
- TrackerDBusSearchPriv *priv;
+ TrackerDBusTrackerSearchPriv *priv;
TrackerQueryTree *tree;
GArray *array;
guint request_id;
@@ -297,12 +297,12 @@
}
gboolean
-tracker_dbus_search_get_hit_count_all (TrackerDBusSearch *object,
+tracker_dbus_tracker_search_get_hit_count_all (TrackerDBusTrackerSearch *object,
const gchar *search_text,
GPtrArray **values,
GError **error)
{
- TrackerDBusSearchPriv *priv;
+ TrackerDBusTrackerSearchPriv *priv;
TrackerDBResultSet *result_set = NULL;
TrackerQueryTree *tree;
GArray *hit_counts;
@@ -378,7 +378,7 @@
}
gboolean
-tracker_dbus_search_text (TrackerDBusSearch *object,
+tracker_dbus_tracker_search_text (TrackerDBusTrackerSearch *object,
gint live_query_id,
const gchar *service,
const gchar *search_text,
@@ -387,7 +387,7 @@
gchar ***values,
GError **error)
{
- TrackerDBusSearchPriv *priv;
+ TrackerDBusTrackerSearchPriv *priv;
TrackerDBResultSet *result_set;
guint request_id;
DBConnection *db_con;
@@ -483,7 +483,7 @@
}
gboolean
-tracker_dbus_search_text_detailed (TrackerDBusSearch *object,
+tracker_dbus_tracker_search_text_detailed (TrackerDBusTrackerSearch *object,
gint live_query_id,
const gchar *service,
const gchar *search_text,
@@ -492,7 +492,7 @@
GPtrArray **values,
GError **error)
{
- TrackerDBusSearchPriv *priv;
+ TrackerDBusTrackerSearchPriv *priv;
TrackerDBResultSet *result_set;
guint request_id;
DBConnection *db_con;
@@ -555,14 +555,14 @@
}
gboolean
-tracker_dbus_search_get_snippet (TrackerDBusSearch *object,
+tracker_dbus_tracker_search_get_snippet (TrackerDBusTrackerSearch *object,
const gchar *service,
const gchar *id,
const gchar *search_text,
gchar **values,
GError **error)
{
- TrackerDBusSearchPriv *priv;
+ TrackerDBusTrackerSearchPriv *priv;
TrackerDBResultSet *result_set;
guint request_id;
DBConnection *db_con;
@@ -649,7 +649,7 @@
}
gboolean
-tracker_dbus_search_files_by_text (TrackerDBusSearch *object,
+tracker_dbus_tracker_search_files_by_text (TrackerDBusTrackerSearch *object,
gint live_query_id,
const gchar *search_text,
gint offset,
@@ -658,7 +658,7 @@
GHashTable **values,
GError **error)
{
- TrackerDBusSearchPriv *priv;
+ TrackerDBusTrackerSearchPriv *priv;
TrackerDBResultSet *result_set;
guint request_id;
DBConnection *db_con;
@@ -700,7 +700,7 @@
}
gboolean
-tracker_dbus_search_metadata (TrackerDBusSearch *object,
+tracker_dbus_tracker_search_metadata (TrackerDBusTrackerSearch *object,
const gchar *service,
const gchar *field,
const gchar *search_text,
@@ -709,7 +709,7 @@
gchar ***values,
GError **error)
{
- TrackerDBusSearchPriv *priv;
+ TrackerDBusTrackerSearchPriv *priv;
TrackerDBResultSet *result_set;
guint request_id;
DBConnection *db_con;
@@ -766,14 +766,14 @@
}
gboolean
-tracker_dbus_search_matching_fields (TrackerDBusSearch *object,
+tracker_dbus_tracker_search_matching_fields (TrackerDBusTrackerSearch *object,
const gchar *service,
const gchar *id,
const gchar *search_text,
GHashTable **values,
GError **error)
{
- TrackerDBusSearchPriv *priv;
+ TrackerDBusTrackerSearchPriv *priv;
TrackerDBResultSet *result_set;
guint request_id;
DBConnection *db_con;
@@ -830,7 +830,7 @@
}
gboolean
-tracker_dbus_search_query (TrackerDBusSearch *object,
+tracker_dbus_tracker_search_query (TrackerDBusTrackerSearch *object,
gint live_query_id,
const gchar *service,
gchar **fields,
@@ -843,7 +843,7 @@
GPtrArray **values,
GError **error)
{
- TrackerDBusSearchPriv *priv;
+ TrackerDBusTrackerSearchPriv *priv;
TrackerDBResultSet *result_set;
guint request_id;
DBConnection *db_con;
@@ -955,13 +955,13 @@
}
gboolean
-tracker_dbus_search_suggest (TrackerDBusSearch *object,
+tracker_dbus_tracker_search_suggest (TrackerDBusTrackerSearch *object,
const gchar *search_text,
gint max_dist,
gchar **value,
GError **error)
{
- TrackerDBusSearchPriv *priv;
+ TrackerDBusTrackerSearchPriv *priv;
guint request_id;
request_id = tracker_dbus_get_next_request_id ();
Copied: branches/indexer-split/src/trackerd/tracker-dbus-tracker-search.h (from r1319, /branches/indexer-split/src/trackerd/tracker-dbus-search.h)
==============================================================================
--- /branches/indexer-split/src/trackerd/tracker-dbus-search.h (original)
+++ branches/indexer-split/src/trackerd/tracker-dbus-tracker-search.h Mon Apr 28 15:04:11 2008
@@ -19,8 +19,8 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef __TRACKER_DBUS_SEARCH_H__
-#define __TRACKER_DBUS_SEARCH_H__
+#ifndef __TRACKER_DBUS_TRACKER_SEARCH_H__
+#define __TRACKER_DBUS_TRACKER_SEARCH_H__
#include <dbus/dbus-glib.h>
#include <dbus/dbus-glib-bindings.h>
@@ -29,50 +29,50 @@
#include "tracker-db-sqlite.h"
#include "tracker-indexer.h"
-#define TRACKER_DBUS_SEARCH_SERVICE "org.freedesktop.Tracker"
-#define TRACKER_DBUS_SEARCH_PATH "/org/freedesktop/Tracker/Search"
-#define TRACKER_DBUS_SEARCH_INTERFACE "org.freedesktop.Tracker.Search"
+#define TRACKER_DBUS_TRACKER_SEARCH_SERVICE "org.freedesktop.Tracker"
+#define TRACKER_DBUS_TRACKER_SEARCH_PATH "/org/freedesktop/Tracker/Search"
+#define TRACKER_DBUS_TRACKER_SEARCH_INTERFACE "org.freedesktop.Tracker.Search"
G_BEGIN_DECLS
-#define TRACKER_TYPE_DBUS_SEARCH (tracker_dbus_search_get_type ())
-#define TRACKER_DBUS_SEARCH(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), TRACKER_TYPE_DBUS_SEARCH, TrackerDBusSearch))
-#define TRACKER_DBUS_SEARCH_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TRACKER_TYPE_DBUS_SEARCH, TrackerDBusSearchClass))
-#define TRACKER_IS_DBUS_SEARCH(object) (G_TYPE_CHECK_INSTANCE_TYPE ((object), TRACKER_TYPE_DBUS_SEARCH))
-#define TRACKER_IS_DBUS_SEARCH_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TRACKER_TYPE_DBUS_SEARCH))
-#define TRACKER_DBUS_SEARCH_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TRACKER_TYPE_DBUS_SEARCH, TrackerDBusSearchClass))
+#define TRACKER_TYPE_DBUS_TRACKER_SEARCH (tracker_dbus_tracker_search_get_type ())
+#define TRACKER_DBUS_TRACKER_SEARCH(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), TRACKER_TYPE_DBUS_TRACKER_SEARCH, TrackerDBusTrackerSearch))
+#define TRACKER_DBUS_TRACKER_SEARCH_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TRACKER_TYPE_DBUS_TRACKER_SEARCH, TrackerDBusTrackerSearchClass))
+#define TRACKER_IS_DBUS_TRACKER_SEARCH(object) (G_TYPE_CHECK_INSTANCE_TYPE ((object), TRACKER_TYPE_DBUS_TRACKER_SEARCH))
+#define TRACKER_IS_DBUS_TRACKER_SEARCH_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TRACKER_TYPE_DBUS_TRACKER_SEARCH))
+#define TRACKER_DBUS_TRACKER_SEARCH_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TRACKER_TYPE_DBUS_TRACKER_SEARCH, TrackerDBusTrackerSearchClass))
-typedef struct TrackerDBusSearch TrackerDBusSearch;
-typedef struct TrackerDBusSearchClass TrackerDBusSearchClass;
+typedef struct TrackerDBusTrackerSearch TrackerDBusTrackerSearch;
+typedef struct TrackerDBusTrackerSearchClass TrackerDBusTrackerSearchClass;
-struct TrackerDBusSearch {
+struct TrackerDBusTrackerSearch {
GObject parent;
};
-struct TrackerDBusSearchClass {
+struct TrackerDBusTrackerSearchClass {
GObjectClass parent;
};
-GType tracker_dbus_search_get_type (void);
+GType tracker_dbus_tracker_search_get_type (void);
-TrackerDBusSearch *
- tracker_dbus_search_new (DBConnection *db_con);
-void tracker_dbus_search_set_db_connection (TrackerDBusSearch *object,
+TrackerDBusTrackerSearch *
+ tracker_dbus_tracker_search_new (DBConnection *db_con);
+void tracker_dbus_tracker_search_set_db_connection (TrackerDBusTrackerSearch *object,
DBConnection *db_con);
-void tracker_dbus_search_set_file_index (TrackerDBusSearch *object,
+void tracker_dbus_tracker_search_set_file_index (TrackerDBusTrackerSearch *object,
Indexer *file_index);
-void tracker_dbus_search_set_email_index (TrackerDBusSearch *object,
+void tracker_dbus_tracker_search_set_email_index (TrackerDBusTrackerSearch *object,
Indexer *email_index);
-gboolean tracker_dbus_search_get_hit_count (TrackerDBusSearch *object,
+gboolean tracker_dbus_tracker_search_get_hit_count (TrackerDBusTrackerSearch *object,
const gchar *service,
const gchar *search_text,
gint *result,
GError **error);
-gboolean tracker_dbus_search_get_hit_count_all (TrackerDBusSearch *object,
+gboolean tracker_dbus_tracker_search_get_hit_count_all (TrackerDBusTrackerSearch *object,
const gchar *search_text,
GPtrArray **values,
GError **error);
-gboolean tracker_dbus_search_text (TrackerDBusSearch *object,
+gboolean tracker_dbus_tracker_search_text (TrackerDBusTrackerSearch *object,
gint live_query_id,
const gchar *service,
const gchar *search_text,
@@ -80,7 +80,7 @@
gint max_hits,
gchar ***values,
GError **error);
-gboolean tracker_dbus_search_text_detailed (TrackerDBusSearch *object,
+gboolean tracker_dbus_tracker_search_text_detailed (TrackerDBusTrackerSearch *object,
gint live_query_id,
const gchar *service,
const gchar *search_text,
@@ -88,13 +88,13 @@
gint max_hits,
GPtrArray **values,
GError **error);
-gboolean tracker_dbus_search_get_snippet (TrackerDBusSearch *object,
+gboolean tracker_dbus_tracker_search_get_snippet (TrackerDBusTrackerSearch *object,
const gchar *service,
const gchar *id,
const gchar *search_text,
gchar **result,
GError **error);
-gboolean tracker_dbus_search_files_by_text (TrackerDBusSearch *object,
+gboolean tracker_dbus_tracker_search_files_by_text (TrackerDBusTrackerSearch *object,
gint live_query_id,
const gchar *search_text,
gint offset,
@@ -102,7 +102,7 @@
gboolean group_results,
GHashTable **values,
GError **error);
-gboolean tracker_dbus_search_metadata (TrackerDBusSearch *object,
+gboolean tracker_dbus_tracker_search_metadata (TrackerDBusTrackerSearch *object,
const gchar *service,
const gchar *field,
const gchar *search_text,
@@ -110,13 +110,13 @@
gint max_hits,
gchar ***values,
GError **error);
-gboolean tracker_dbus_search_matching_fields (TrackerDBusSearch *object,
+gboolean tracker_dbus_tracker_search_matching_fields (TrackerDBusTrackerSearch *object,
const gchar *service,
const gchar *id,
const gchar *search_text,
GHashTable **values,
GError **error);
-gboolean tracker_dbus_search_query (TrackerDBusSearch *object,
+gboolean tracker_dbus_tracker_search_query (TrackerDBusTrackerSearch *object,
gint live_query_id,
const gchar *service,
gchar **fields,
@@ -128,7 +128,7 @@
gint max_hits,
GPtrArray **values,
GError **error);
-gboolean tracker_dbus_search_suggest (TrackerDBusSearch *object,
+gboolean tracker_dbus_tracker_search_suggest (TrackerDBusTrackerSearch *object,
const gchar *search_text,
gint max_dist,
gchar **value,
@@ -136,4 +136,4 @@
G_END_DECLS
-#endif /* __TRACKER_DBUS_SEARCH_H__ */
+#endif /* __TRACKER_DBUS_TRACKER_SEARCH_H__ */
Copied: branches/indexer-split/src/trackerd/tracker-dbus-xesam-search.c (from r1317, /branches/indexer-split/src/trackerd/tracker-xesam-search.c)
==============================================================================
--- /branches/indexer-split/src/trackerd/tracker-xesam-search.c (original)
+++ branches/indexer-split/src/trackerd/tracker-dbus-xesam-search.c Mon Apr 28 15:04:11 2008
@@ -27,10 +27,10 @@
#include "tracker-dbus.h"
#include "tracker-status.h"
-#define TRACKER_XESAM_SEARCH_C
-#include "tracker-xesam-search.h"
+#define TRACKER_DBUS_XESAM_SEARCH_C
+#include "tracker-dbus-xesam-search.h"
#include "tracker-xesam.h"
-#undef TRACER_XESAM_SEARCH_C
+#undef TRACER_DBUS_XESAM_SEARCH_C
#include "tracker-rdf-query.h"
#include "tracker-query-tree.h"
@@ -40,22 +40,22 @@
guint xesam_signals[XESAM_LAST_SIGNAL] = {0};
-G_DEFINE_TYPE(TrackerXesamSearch, tracker_xesam_search, G_TYPE_OBJECT)
+G_DEFINE_TYPE(TrackerDBusXesamSearch, tracker_dbus_xesam_search, G_TYPE_OBJECT)
static void
-xesam_search_finalize (GObject *object)
+dbus_xesam_search_finalize (GObject *object)
{
- G_OBJECT_CLASS (tracker_xesam_search_parent_class)->finalize (object);
+ G_OBJECT_CLASS (tracker_dbus_xesam_search_parent_class)->finalize (object);
}
static void
-tracker_xesam_search_class_init (TrackerXesamSearchClass *klass)
+tracker_dbus_xesam_search_class_init (TrackerDBusXesamSearchClass *klass)
{
GObjectClass *object_class;
object_class = G_OBJECT_CLASS (klass);
- object_class->finalize = xesam_search_finalize;
+ object_class->finalize = dbus_xesam_search_finalize;
xesam_signals[XESAM_HITS_ADDED] =
g_signal_new ("hits-added",
@@ -119,20 +119,20 @@
}
static void
-tracker_xesam_search_init (TrackerXesamSearch *object)
+tracker_dbus_xesam_search_init (TrackerDBusXesamSearch *object)
{
}
-TrackerXesamSearch *
-tracker_xesam_search_new (void)
+TrackerDBusXesamSearch *
+tracker_dbus_xesam_search_new (void)
{
- return g_object_new (TRACKER_TYPE_XESAM_SEARCH, NULL);
+ return g_object_new (TRACKER_TYPE_DBUS_XESAM_SEARCH, NULL);
}
static void
-tracker_xesam_search_close_session_interal (const gchar *session_id,
+tracker_dbus_xesam_search_close_session_interal (const gchar *session_id,
GError **error)
{
TrackerXesamSession *session = tracker_xesam_get_session (session_id, error);
@@ -160,11 +160,11 @@
}
void
-tracker_xesam_search_name_owner_changed (DBusGProxy *proxy,
+tracker_dbus_xesam_search_name_owner_changed (DBusGProxy *proxy,
const char *name,
const char *prev_owner,
const char *new_owner,
- TrackerXesamSearch *self)
+ TrackerDBusXesamSearch *self)
{
if (sessions) {
GList *my_sessions = g_hash_table_lookup (sessions, prev_owner);
@@ -172,7 +172,7 @@
GList *copy = my_sessions;
while (copy) {
gchar *session_id = copy->data;
- tracker_xesam_search_close_session_interal (session_id, NULL);
+ tracker_dbus_xesam_search_close_session_interal (session_id, NULL);
copy = g_list_next (copy);
}
my_sessions_cleanup (my_sessions);
@@ -187,7 +187,7 @@
void
-tracker_xesam_search_new_session (TrackerXesamSearch *object, DBusGMethodInvocation *context)
+tracker_dbus_xesam_search_new_session (TrackerDBusXesamSearch *object, DBusGMethodInvocation *context)
{
gchar *session_id = NULL;
guint request_id = tracker_dbus_get_next_request_id ();
@@ -234,7 +234,7 @@
void
-tracker_xesam_search_close_session (TrackerXesamSearch *object,
+tracker_dbus_xesam_search_close_session (TrackerDBusXesamSearch *object,
const gchar *session_id,
DBusGMethodInvocation *context)
{
@@ -242,7 +242,7 @@
GError *error = NULL;
gchar *key = dbus_g_method_get_sender (context);
- tracker_xesam_search_close_session_interal (session_id, &error);
+ tracker_dbus_xesam_search_close_session_interal (session_id, &error);
if (error) {
dbus_g_method_return_error (context, error);
@@ -276,7 +276,7 @@
void
-tracker_xesam_search_set_property (TrackerXesamSearch *object,
+tracker_dbus_xesam_search_set_property (TrackerDBusXesamSearch *object,
const gchar *session_id,
const gchar *prop,
GValue *val,
@@ -309,7 +309,7 @@
}
void
-tracker_xesam_search_get_property (TrackerXesamSearch *object,
+tracker_dbus_xesam_search_get_property (TrackerDBusXesamSearch *object,
const gchar *session_id,
const gchar *prop,
DBusGMethodInvocation *context)
@@ -343,7 +343,7 @@
void
-tracker_xesam_search_new_search (TrackerXesamSearch *object,
+tracker_dbus_xesam_search_new_search (TrackerDBusXesamSearch *object,
const gchar *session_id,
const gchar *query_xml,
DBusGMethodInvocation *context)
@@ -379,7 +379,7 @@
}
void
-tracker_xesam_search_start_search (TrackerXesamSearch *object,
+tracker_dbus_xesam_search_start_search (TrackerDBusXesamSearch *object,
const gchar *search_id,
DBusGMethodInvocation *context)
{
@@ -406,7 +406,7 @@
}
void
-tracker_xesam_search_get_hit_count (TrackerXesamSearch *object,
+tracker_dbus_xesam_search_get_hit_count (TrackerDBusXesamSearch *object,
const gchar *search_id,
DBusGMethodInvocation *context)
{
@@ -454,7 +454,7 @@
}
void
-tracker_xesam_search_get_hits (TrackerXesamSearch *object,
+tracker_dbus_xesam_search_get_hits (TrackerDBusXesamSearch *object,
const gchar *search_id,
guint count,
DBusGMethodInvocation *context)
@@ -485,7 +485,7 @@
}
void
-tracker_xesam_search_get_hit_data (TrackerXesamSearch *object,
+tracker_dbus_xesam_search_get_hit_data (TrackerDBusXesamSearch *object,
const gchar *search_id,
GArray *hit_ids, /* not sure */
GStrv fields,
@@ -519,7 +519,7 @@
}
void
-tracker_xesam_search_close_search (TrackerXesamSearch *object,
+tracker_dbus_xesam_search_close_search (TrackerDBusXesamSearch *object,
const gchar *search_id,
DBusGMethodInvocation *context)
{
@@ -547,7 +547,7 @@
}
void
-tracker_xesam_search_get_state (TrackerXesamSearch *object,
+tracker_dbus_xesam_search_get_state (TrackerDBusXesamSearch *object,
DBusGMethodInvocation *context)
{
guint request_id = tracker_dbus_get_next_request_id ();
@@ -564,8 +564,8 @@
}
/**
- * tracker_xesam_search_emit_state_changed:
- * @self: A #TrackerXesamSearch
+ * tracker_dbus_xesam_search_emit_state_changed:
+ * @self: A #TrackerDBusXesamSearch
* @state_info: (in): an array of strings that contain the state
*
* Emits the @state-changed signal on the DBus proxy for Xesam.
@@ -580,7 +580,7 @@
* interface.
**/
void
-tracker_xesam_search_emit_state_changed (TrackerXesamSearch *self, GStrv state_info)
+tracker_dbus_xesam_search_emit_state_changed (TrackerDBusXesamSearch *self, GStrv state_info)
{
g_signal_emit (self, xesam_signals[XESAM_STATE_CHANGED], 0, state_info);
}
Copied: branches/indexer-split/src/trackerd/tracker-dbus-xesam-search.h (from r1317, /branches/indexer-split/src/trackerd/tracker-xesam-search.h)
==============================================================================
--- /branches/indexer-split/src/trackerd/tracker-xesam-search.h (original)
+++ branches/indexer-split/src/trackerd/tracker-dbus-xesam-search.h Mon Apr 28 15:04:11 2008
@@ -19,8 +19,8 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef __TRACKER_XESAM_SEARCH_H__
-#define __TRACKER_XESAM_SEARCH_H__
+#ifndef __TRACKER_DBUS_XESAM_SEARCH_H__
+#define __TRACKER_DBUS_XESAM_SEARCH_H__
#include <dbus/dbus-glib.h>
#include <dbus/dbus-glib-bindings.h>
@@ -29,28 +29,28 @@
#include "tracker-db-sqlite.h"
#include "tracker-indexer.h"
-#define TRACKER_XESAM_SEARCH_SERVICE "org.freedesktop.xesam"
-#define TRACKER_XESAM_SEARCH_PATH "/org/freedesktop/xesam/Search"
-#define TRACKER_XESAM_SEARCH_INTERFACE "org.freedesktop.xesam.Search"
+#define TRACKER_DBUS_XESAM_SEARCH_SERVICE "org.freedesktop.xesam"
+#define TRACKER_DBUS_XESAM_SEARCH_PATH "/org/freedesktop/xesam/Search"
+#define TRACKER_DBUS_XESAM_SEARCH_INTERFACE "org.freedesktop.xesam.Search"
G_BEGIN_DECLS
-#define TRACKER_TYPE_XESAM_SEARCH (tracker_xesam_search_get_type ())
-#define TRACKER_XESAM_SEARCH(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), TRACKER_TYPE_XESAM_SEARCH, TrackerXesamSearch))
-#define TRACKER_XESAM_SEARCH_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TRACKER_TYPE_XESAM_SEARCH, TrackerXesamSearchClass))
-#define TRACKER_IS_XESAM_SEARCH(object) (G_TYPE_CHECK_INSTANCE_TYPE ((object), TRACKER_TYPE_XESAM_SEARCH))
-#define TRACKER_IS_XESAM_SEARCH_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TRACKER_TYPE_XESAM_SEARCH))
-#define TRACKER_XESAM_SEARCH_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TRACKER_TYPE_XESAM_SEARCH, TrackerXesamSearchClass))
+#define TRACKER_TYPE_DBUS_XESAM_SEARCH (tracker_dbus_xesam_search_get_type ())
+#define TRACKER_DBUS_XESAM_SEARCH(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), TRACKER_TYPE_DBUS_XESAM_SEARCH, TrackerDBusXesamSearch))
+#define TRACKER_DBUS_XESAM_SEARCH_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TRACKER_TYPE_DBUS_XESAM_SEARCH, TrackerDBusXesamSearchClass))
+#define TRACKER_IS_DBUS_XESAM_SEARCH(object) (G_TYPE_CHECK_INSTANCE_TYPE ((object), TRACKER_TYPE_DBUS_XESAM_SEARCH))
+#define TRACKER_IS_DBUS_XESAM_SEARCH_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TRACKER_TYPE_DBUS_XESAM_SEARCH))
+#define TRACKER_DBUS_XESAM_SEARCH_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TRACKER_TYPE_DBUS_XESAM_SEARCH, TrackerDBusXesamSearchClass))
-typedef struct TrackerXesamSearch TrackerXesamSearch;
-typedef struct TrackerXesamSearchClass TrackerXesamSearchClass;
+typedef struct TrackerDBusXesamSearch TrackerDBusXesamSearch;
+typedef struct TrackerDBusXesamSearchClass TrackerDBusXesamSearchClass;
-struct TrackerXesamSearch {
+struct TrackerDBusXesamSearch {
GObject parent;
};
-struct TrackerXesamSearchClass {
+struct TrackerDBusXesamSearchClass {
GObjectClass parent;
};
@@ -63,64 +63,64 @@
XESAM_LAST_SIGNAL
};
-#ifndef TRACKER_XESAM_SEARCH_C
+#ifndef TRACKER_DBUS_XESAM_SEARCH_C
extern guint *xesam_signals;
#endif
-GType tracker_xesam_search_get_type (void);
+GType tracker_dbus_xesam_search_get_type (void);
-TrackerXesamSearch *
- tracker_xesam_search_new (void);
+TrackerDBusXesamSearch *
+ tracker_dbus_xesam_search_new (void);
-void tracker_xesam_search_new_session (TrackerXesamSearch *object,
+void tracker_dbus_xesam_search_new_session (TrackerDBusXesamSearch *object,
DBusGMethodInvocation *context);
-void tracker_xesam_search_set_property (TrackerXesamSearch *object,
+void tracker_dbus_xesam_search_set_property (TrackerDBusXesamSearch *object,
const gchar *session_id,
const gchar *prop,
GValue *val, /* not sure */
DBusGMethodInvocation *context);
-void tracker_xesam_search_get_property (TrackerXesamSearch *object,
+void tracker_dbus_xesam_search_get_property (TrackerDBusXesamSearch *object,
const gchar *session_id,
const gchar *prop,
DBusGMethodInvocation *context);
-void tracker_xesam_search_close_session (TrackerXesamSearch *object,
+void tracker_dbus_xesam_search_close_session (TrackerDBusXesamSearch *object,
const gchar *session_id,
DBusGMethodInvocation *context);
-void tracker_xesam_search_new_search (TrackerXesamSearch *object,
+void tracker_dbus_xesam_search_new_search (TrackerDBusXesamSearch *object,
const gchar *session_id,
const gchar *query_xml,
DBusGMethodInvocation *context);
-void tracker_xesam_search_start_search (TrackerXesamSearch *object,
+void tracker_dbus_xesam_search_start_search (TrackerDBusXesamSearch *object,
const gchar *search_id,
DBusGMethodInvocation *context);
-void tracker_xesam_search_get_hit_count (TrackerXesamSearch *object,
+void tracker_dbus_xesam_search_get_hit_count (TrackerDBusXesamSearch *object,
const gchar *search_id,
DBusGMethodInvocation *context);
-void tracker_xesam_search_get_hits (TrackerXesamSearch *object,
+void tracker_dbus_xesam_search_get_hits (TrackerDBusXesamSearch *object,
const gchar *search_id,
guint count,
DBusGMethodInvocation *context);
-void tracker_xesam_search_get_hit_data (TrackerXesamSearch *object,
+void tracker_dbus_xesam_search_get_hit_data (TrackerDBusXesamSearch *object,
const gchar *search_id,
GArray *hit_ids, /* not sure */
GStrv fields,
DBusGMethodInvocation *context);
-void tracker_xesam_search_close_search (TrackerXesamSearch *object,
+void tracker_dbus_xesam_search_close_search (TrackerDBusXesamSearch *object,
const gchar *search_id,
DBusGMethodInvocation *context);
-void tracker_xesam_search_get_state (TrackerXesamSearch *object,
+void tracker_dbus_xesam_search_get_state (TrackerDBusXesamSearch *object,
DBusGMethodInvocation *context);
-void tracker_xesam_search_emit_state_changed (TrackerXesamSearch *self, GStrv state_info);
+void tracker_dbus_xesam_search_emit_state_changed (TrackerDBusXesamSearch *self, GStrv state_info);
-void tracker_xesam_search_name_owner_changed (DBusGProxy *proxy,
+void tracker_dbus_xesam_search_name_owner_changed (DBusGProxy *proxy,
const char *name,
const char *prev_owner,
const char *new_owner,
- TrackerXesamSearch *self);
+ TrackerDBusXesamSearch *self);
G_END_DECLS
-#endif /* __TRACKER_XESAM_SEARCH_H__ */
+#endif /* __TRACKER_DBUS_XESAM_SEARCH_H__ */
Modified: branches/indexer-split/src/trackerd/tracker-dbus.c
==============================================================================
--- branches/indexer-split/src/trackerd/tracker-dbus.c (original)
+++ branches/indexer-split/src/trackerd/tracker-dbus.c Mon Apr 28 15:04:11 2008
@@ -28,18 +28,18 @@
#include "tracker-db-sqlite.h"
#include "tracker-dbus.h"
-#include "tracker-dbus-daemon.h"
-#include "tracker-dbus-daemon-glue.h"
-#include "tracker-dbus-files.h"
-#include "tracker-dbus-files-glue.h"
-#include "tracker-dbus-keywords.h"
-#include "tracker-dbus-keywords-glue.h"
-#include "tracker-dbus-metadata.h"
-#include "tracker-dbus-metadata-glue.h"
-#include "tracker-dbus-search.h"
-#include "tracker-dbus-search-glue.h"
-#include "tracker-xesam-search.h"
-#include "tracker-xesam-search-glue.h"
+#include "tracker-dbus-tracker-daemon.h"
+#include "tracker-dbus-tracker-daemon-glue.h"
+#include "tracker-dbus-tracker-files.h"
+#include "tracker-dbus-tracker-files-glue.h"
+#include "tracker-dbus-tracker-keywords.h"
+#include "tracker-dbus-tracker-keywords-glue.h"
+#include "tracker-dbus-tracker-metadata.h"
+#include "tracker-dbus-tracker-metadata-glue.h"
+#include "tracker-dbus-tracker-search.h"
+#include "tracker-dbus-tracker-search-glue.h"
+#include "tracker-dbus-xesam-search.h"
+#include "tracker-dbus-xesam-search-glue.h"
#include "tracker-utils.h"
#include "tracker-watch.h"
@@ -159,16 +159,16 @@
DBUS_INTERFACE_DBUS);
/* Set up the main tracker service */
- if (!dbus_register_service (proxy, TRACKER_DBUS_DAEMON_SERVICE)) {
+ if (!dbus_register_service (proxy, TRACKER_DBUS_TRACKER_DAEMON_SERVICE)) {
return FALSE;
}
/* Add org.freedesktop.Tracker */
if (!(object = dbus_register_object (connection,
proxy,
- TRACKER_TYPE_DBUS_DAEMON,
- &dbus_glib_tracker_dbus_daemon_object_info,
- TRACKER_DBUS_DAEMON_PATH))) {
+ TRACKER_TYPE_DBUS_TRACKER_DAEMON,
+ &dbus_glib_tracker_dbus_tracker_daemon_object_info,
+ TRACKER_DBUS_TRACKER_DAEMON_PATH))) {
return FALSE;
}
@@ -180,9 +180,9 @@
/* Add org.freedesktop.Tracker.Files */
if (!(object = dbus_register_object (connection,
proxy,
- TRACKER_TYPE_DBUS_FILES,
- &dbus_glib_tracker_dbus_files_object_info,
- TRACKER_DBUS_FILES_PATH))) {
+ TRACKER_TYPE_DBUS_TRACKER_FILES,
+ &dbus_glib_tracker_dbus_tracker_files_object_info,
+ TRACKER_DBUS_TRACKER_FILES_PATH))) {
return FALSE;
}
@@ -192,9 +192,9 @@
/* Add org.freedesktop.Tracker.Keywords */
if (!(object = dbus_register_object (connection,
proxy,
- TRACKER_TYPE_DBUS_KEYWORDS,
- &dbus_glib_tracker_dbus_keywords_object_info,
- TRACKER_DBUS_KEYWORDS_PATH))) {
+ TRACKER_TYPE_DBUS_TRACKER_KEYWORDS,
+ &dbus_glib_tracker_dbus_tracker_keywords_object_info,
+ TRACKER_DBUS_TRACKER_KEYWORDS_PATH))) {
return FALSE;
}
@@ -204,9 +204,9 @@
/* Add org.freedesktop.Tracker.Metadata */
if (!(object = dbus_register_object (connection,
proxy,
- TRACKER_TYPE_DBUS_METADATA,
- &dbus_glib_tracker_dbus_metadata_object_info,
- TRACKER_DBUS_METADATA_PATH))) {
+ TRACKER_TYPE_DBUS_TRACKER_METADATA,
+ &dbus_glib_tracker_dbus_tracker_metadata_object_info,
+ TRACKER_DBUS_TRACKER_METADATA_PATH))) {
return FALSE;
}
@@ -216,9 +216,9 @@
/* Add org.freedesktop.Tracker.Search */
if (!(object = dbus_register_object (connection,
proxy,
- TRACKER_TYPE_DBUS_SEARCH,
- &dbus_glib_tracker_dbus_search_object_info,
- TRACKER_DBUS_SEARCH_PATH))) {
+ TRACKER_TYPE_DBUS_TRACKER_SEARCH,
+ &dbus_glib_tracker_dbus_tracker_search_object_info,
+ TRACKER_DBUS_TRACKER_SEARCH_PATH))) {
return FALSE;
}
@@ -231,9 +231,9 @@
/* Add org.freedesktop.xesam.Search */
if (!(object = dbus_register_object (connection,
proxy,
- TRACKER_TYPE_XESAM_SEARCH,
- &dbus_glib_tracker_xesam_search_object_info,
- TRACKER_XESAM_SEARCH_PATH))) {
+ TRACKER_TYPE_DBUS_XESAM_SEARCH,
+ &dbus_glib_tracker_dbus_xesam_search_object_info,
+ TRACKER_DBUS_XESAM_SEARCH_PATH))) {
return FALSE;
}
@@ -242,7 +242,7 @@
G_TYPE_STRING, G_TYPE_INVALID);
dbus_g_proxy_connect_signal (proxy, "NameOwnerChanged",
- G_CALLBACK (tracker_xesam_search_name_owner_changed),
+ G_CALLBACK (tracker_dbus_xesam_search_name_owner_changed),
g_object_ref (object),
name_owner_changed_done);
Modified: branches/indexer-split/src/trackerd/tracker-email-evolution.c
==============================================================================
--- branches/indexer-split/src/trackerd/tracker-email-evolution.c (original)
+++ branches/indexer-split/src/trackerd/tracker-email-evolution.c Mon Apr 28 15:04:11 2008
@@ -39,7 +39,7 @@
#include "tracker-db-email.h"
#include "tracker-cache.h"
#include "tracker-dbus.h"
-#include "tracker-dbus-daemon.h"
+#include "tracker-dbus-tracker-daemon.h"
#include "tracker-watch.h"
#include "tracker-status.h"
@@ -1279,7 +1279,7 @@
return;
}
- object = tracker_dbus_get_object (TRACKER_TYPE_DBUS_DAEMON);
+ object = tracker_dbus_get_object (TRACKER_TYPE_DBUS_TRACKER_DAEMON);
if (open_summary_file (summary_file_path, &summary)) {
SummaryFileHeader *header;
Modified: branches/indexer-split/src/trackerd/tracker-email-modest.c
==============================================================================
--- branches/indexer-split/src/trackerd/tracker-email-modest.c (original)
+++ branches/indexer-split/src/trackerd/tracker-email-modest.c Mon Apr 28 15:04:11 2008
@@ -38,7 +38,7 @@
#include "tracker-email-utils.h"
#include "tracker-db-email.h"
#include "tracker-dbus.h"
-#include "tracker-dbus-daemon.h"
+#include "tracker-dbus-tracker-daemon.h"
#include "tracker-cache.h"
#include "tracker-status.h"
#include "tracker-watch.h"
@@ -709,7 +709,7 @@
if (!tracker->is_running)
return;
- object = tracker_dbus_get_object (TRACKER_TYPE_DBUS_DAEMON);
+ object = tracker_dbus_get_object (TRACKER_TYPE_DBUS_TRACKER_DAEMON);
if (open_summary_file (summary_file_path, &summary)) {
SummaryFileHeader *header;
Modified: branches/indexer-split/src/trackerd/tracker-email-utils.c
==============================================================================
--- branches/indexer-split/src/trackerd/tracker-email-utils.c (original)
+++ branches/indexer-split/src/trackerd/tracker-email-utils.c Mon Apr 28 15:04:11 2008
@@ -38,7 +38,7 @@
#include "tracker-cache.h"
#include "tracker-db-email.h"
#include "tracker-dbus.h"
-#include "tracker-dbus-daemon.h"
+#include "tracker-dbus-tracker-daemon.h"
#include "tracker-email-utils.h"
#include "tracker-watch.h"
@@ -134,7 +134,7 @@
tracker->mbox_count++;
/* Signal progress */
- object = tracker_dbus_get_object (TRACKER_TYPE_DBUS_DAEMON);
+ object = tracker_dbus_get_object (TRACKER_TYPE_DBUS_TRACKER_DAEMON);
g_signal_emit_by_name (object,
"index-progress",
"Emails",
@@ -198,7 +198,7 @@
}
/* Signal progress */
- object = tracker_dbus_get_object (TRACKER_TYPE_DBUS_DAEMON);
+ object = tracker_dbus_get_object (TRACKER_TYPE_DBUS_TRACKER_DAEMON);
g_signal_emit_by_name (object,
"index-progress",
"Emails",
@@ -215,7 +215,7 @@
tracker->mbox_processed++;
/* Signal progress */
- object = tracker_dbus_get_object (TRACKER_TYPE_DBUS_DAEMON);
+ object = tracker_dbus_get_object (TRACKER_TYPE_DBUS_TRACKER_DAEMON);
g_signal_emit_by_name (object,
"index-progress",
"Emails",
Modified: branches/indexer-split/src/trackerd/tracker-indexer.c
==============================================================================
--- branches/indexer-split/src/trackerd/tracker-indexer.c (original)
+++ branches/indexer-split/src/trackerd/tracker-indexer.c Mon Apr 28 15:04:11 2008
@@ -54,7 +54,7 @@
#include "tracker-indexer.h"
#include "tracker-cache.h"
#include "tracker-dbus.h"
-#include "tracker-dbus-daemon.h"
+#include "tracker-dbus-tracker-daemon.h"
#include "tracker-hal.h"
#include "tracker-process-files.h"
#include "tracker-query-tree.h"
@@ -406,7 +406,7 @@
tracker->merge_processed = 0;
/* Signal progress */
- object = tracker_dbus_get_object (TRACKER_TYPE_DBUS_DAEMON);
+ object = tracker_dbus_get_object (TRACKER_TYPE_DBUS_TRACKER_DAEMON);
g_signal_emit_by_name (object,
"index-progress",
"Merging",
@@ -466,7 +466,7 @@
tracker->merge_processed = 1;
/* Signal progress */
- object = tracker_dbus_get_object (TRACKER_TYPE_DBUS_DAEMON);
+ object = tracker_dbus_get_object (TRACKER_TYPE_DBUS_TRACKER_DAEMON);
g_signal_emit_by_name (object,
"index-progress",
"Merging",
@@ -586,7 +586,7 @@
return;
}
- object = tracker_dbus_get_object (TRACKER_TYPE_DBUS_DAEMON);
+ object = tracker_dbus_get_object (TRACKER_TYPE_DBUS_TRACKER_DAEMON);
if (type == INDEX_TYPE_FILES) {
@@ -826,7 +826,7 @@
tracker->merge_processed++;
/* Signal progress */
- object = tracker_dbus_get_object (TRACKER_TYPE_DBUS_DAEMON);
+ object = tracker_dbus_get_object (TRACKER_TYPE_DBUS_TRACKER_DAEMON);
g_signal_emit_by_name (object,
"index-progress",
"Merging",
Modified: branches/indexer-split/src/trackerd/tracker-process-files.c
==============================================================================
--- branches/indexer-split/src/trackerd/tracker-process-files.c (original)
+++ branches/indexer-split/src/trackerd/tracker-process-files.c Mon Apr 28 15:04:11 2008
@@ -40,7 +40,7 @@
#include "tracker-apps.h"
#include "tracker-db.h"
#include "tracker-dbus.h"
-#include "tracker-dbus-daemon.h"
+#include "tracker-dbus-tracker-daemon.h"
#include "tracker-cache.h"
#include "tracker-email.h"
#include "tracker-hal.h"
@@ -768,7 +768,7 @@
tracker_log ("Starting file indexing...");
db_con = tracker->index_db;
- object = tracker_dbus_get_object (TRACKER_TYPE_DBUS_DAEMON);
+ object = tracker_dbus_get_object (TRACKER_TYPE_DBUS_TRACKER_DAEMON);
tracker_db_end_index_transaction (db_con);
@@ -1037,7 +1037,7 @@
tracker->index_status = INDEX_EMAILS;
/* Signal progress */
- daemon = tracker_dbus_get_object (TRACKER_TYPE_DBUS_DAEMON);
+ daemon = tracker_dbus_get_object (TRACKER_TYPE_DBUS_TRACKER_DAEMON);
g_signal_emit_by_name (daemon, "index-progress",
"Emails",
"",
@@ -1080,7 +1080,7 @@
GObject *object;
db_con = tracker->index_db;
- object = tracker_dbus_get_object (TRACKER_TYPE_DBUS_DAEMON);
+ object = tracker_dbus_get_object (TRACKER_TYPE_DBUS_TRACKER_DAEMON);
/* Check dir_queue in case there are
* directories waiting to be indexed.
@@ -1492,7 +1492,7 @@
process_block_signals ();
- object = tracker_dbus_get_object (TRACKER_TYPE_DBUS_DAEMON);
+ object = tracker_dbus_get_object (TRACKER_TYPE_DBUS_TRACKER_DAEMON);
tracker = (Tracker*) data;
@@ -1563,7 +1563,7 @@
tracker->index_status = INDEX_CONFIG;
- object = tracker_dbus_get_object (TRACKER_TYPE_DBUS_DAEMON);
+ object = tracker_dbus_get_object (TRACKER_TYPE_DBUS_TRACKER_DAEMON);
pushed_events = FALSE;
first_run = TRUE;
@@ -1696,7 +1696,7 @@
}
/* Signal progress */
- object = tracker_dbus_get_object (TRACKER_TYPE_DBUS_DAEMON);
+ object = tracker_dbus_get_object (TRACKER_TYPE_DBUS_TRACKER_DAEMON);
g_signal_emit_by_name (object,
"index-progress",
"Files",
Modified: branches/indexer-split/src/trackerd/tracker-status.c
==============================================================================
--- branches/indexer-split/src/trackerd/tracker-status.c (original)
+++ branches/indexer-split/src/trackerd/tracker-status.c Mon Apr 28 15:04:11 2008
@@ -21,7 +21,7 @@
#include "tracker-status.h"
#include "tracker-dbus.h"
-#include "tracker-dbus-daemon.h"
+#include "tracker-dbus-tracker-daemon.h"
static TrackerStatus status = TRACKER_STATUS_INITIALIZING;
@@ -130,7 +130,7 @@
return;
}
- object = tracker_dbus_get_object (TRACKER_TYPE_DBUS_DAEMON);
+ object = tracker_dbus_get_object (TRACKER_TYPE_DBUS_TRACKER_DAEMON);
g_signal_emit_by_name (object,
"index-state-change",
Modified: branches/indexer-split/src/trackerd/tracker-xesam-live-search.c
==============================================================================
--- branches/indexer-split/src/trackerd/tracker-xesam-live-search.c (original)
+++ branches/indexer-split/src/trackerd/tracker-xesam-live-search.c Mon Apr 28 15:04:11 2008
@@ -20,7 +20,7 @@
*/
#include "tracker-xesam-live-search.h"
-#include "tracker-xesam-search.h"
+#include "tracker-dbus-xesam-search.h"
#include "tracker-dbus.h"
#include "tracker-xesam.h"
@@ -70,7 +70,7 @@
void
tracker_xesam_live_search_emit_hits_added (TrackerXesamLiveSearch *self, guint count)
{
- TrackerXesamSearch *proxy = TRACKER_XESAM_SEARCH (tracker_dbus_get_object (TRACKER_TYPE_XESAM_SEARCH));
+ TrackerDBusXesamSearch *proxy = TRACKER_DBUS_XESAM_SEARCH (tracker_dbus_get_object (TRACKER_TYPE_DBUS_XESAM_SEARCH));
g_signal_emit (proxy, xesam_signals[XESAM_HITS_ADDED], 0,
tracker_xesam_live_search_get_id (self), count);
@@ -91,7 +91,7 @@
void
tracker_xesam_live_search_emit_hits_removed (TrackerXesamLiveSearch *self, GArray *hit_ids)
{
- TrackerXesamSearch *proxy = TRACKER_XESAM_SEARCH (tracker_dbus_get_object (TRACKER_TYPE_XESAM_SEARCH));
+ TrackerDBusXesamSearch *proxy = TRACKER_DBUS_XESAM_SEARCH (tracker_dbus_get_object (TRACKER_TYPE_DBUS_XESAM_SEARCH));
g_signal_emit (proxy, xesam_signals[XESAM_HITS_REMOVED], 0,
tracker_xesam_live_search_get_id (self), hit_ids);
@@ -112,7 +112,7 @@
void
tracker_xesam_live_search_emit_hits_modified (TrackerXesamLiveSearch *self, GArray *hit_ids)
{
- TrackerXesamSearch *proxy = TRACKER_XESAM_SEARCH (tracker_dbus_get_object (TRACKER_TYPE_XESAM_SEARCH));
+ TrackerDBusXesamSearch *proxy = TRACKER_DBUS_XESAM_SEARCH (tracker_dbus_get_object (TRACKER_TYPE_DBUS_XESAM_SEARCH));
g_signal_emit (proxy, xesam_signals[XESAM_HITS_MODIFIED], 0,
tracker_xesam_live_search_get_id (self), hit_ids);
@@ -133,7 +133,7 @@
void
tracker_xesam_live_search_emit_done (TrackerXesamLiveSearch *self)
{
- TrackerXesamSearch *proxy = TRACKER_XESAM_SEARCH (tracker_dbus_get_object (TRACKER_TYPE_XESAM_SEARCH));
+ TrackerDBusXesamSearch *proxy = TRACKER_DBUS_XESAM_SEARCH (tracker_dbus_get_object (TRACKER_TYPE_DBUS_XESAM_SEARCH));
g_signal_emit (proxy, xesam_signals[XESAM_SEARCH_DONE], 0,
tracker_xesam_live_search_get_id (self));
Modified: branches/indexer-split/src/trackerd/tracker-xesam-session.h
==============================================================================
--- branches/indexer-split/src/trackerd/tracker-xesam-session.h (original)
+++ branches/indexer-split/src/trackerd/tracker-xesam-session.h Mon Apr 28 15:04:11 2008
@@ -28,7 +28,7 @@
#include <string.h>
#include "tracker-xesam-live-search.h"
-#include "tracker-xesam-search.h"
+#include "tracker-dbus-xesam-search.h"
G_BEGIN_DECLS
Modified: branches/indexer-split/src/trackerd/tracker-xesam.c
==============================================================================
--- branches/indexer-split/src/trackerd/tracker-xesam.c (original)
+++ branches/indexer-split/src/trackerd/tracker-xesam.c Mon Apr 28 15:04:11 2008
@@ -32,7 +32,7 @@
}
TrackerXesamSession *
-tracker_xesam_create_session (TrackerXesamSearch *dbus_proxy, gchar **session_id, GError **error)
+tracker_xesam_create_session (TrackerDBusXesamSearch *dbus_proxy, gchar **session_id, GError **error)
{
TrackerXesamSession *session;
Modified: branches/indexer-split/src/trackerd/tracker-xesam.h
==============================================================================
--- branches/indexer-split/src/trackerd/tracker-xesam.h (original)
+++ branches/indexer-split/src/trackerd/tracker-xesam.h Mon Apr 28 15:04:11 2008
@@ -29,7 +29,7 @@
TrackerXesamSession* tracker_xesam_get_session (const gchar *session_id, GError **error);
TrackerXesamSession* tracker_xesam_get_session_for_search (const gchar *search_id, TrackerXesamLiveSearch **search_in, GError **error);
TrackerXesamLiveSearch* tracker_xesam_get_live_search (const gchar *search_id, GError **error);
-TrackerXesamSession* tracker_xesam_create_session (TrackerXesamSearch *dbus_proxy, gchar **session_id, GError **error);
+TrackerXesamSession* tracker_xesam_create_session (TrackerDBusXesamSearch *dbus_proxy, gchar **session_id, GError **error);
void tracker_xesam_close_session (const gchar *session_id, GError **error);
typedef enum {
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
