tracker r1324 - in branches/indexer-split: . data src/trackerd
- From: mr svn gnome org
- To: svn-commits-list gnome org
- Subject: tracker r1324 - in branches/indexer-split: . data src/trackerd
- Date: Tue, 29 Apr 2008 10:09:56 +0100 (BST)
Author: mr
Date: Tue Apr 29 09:09:56 2008
New Revision: 1324
URL: http://svn.gnome.org/viewvc/tracker?rev=1324&view=rev
Log:
* data/Makefile.am:
* data/tracker-xesam-search.xml: Renamed to
tracker-dbus-xesam.xml.
Added:
branches/indexer-split/data/tracker-dbus-xesam.xml
- copied unchanged from r1323, /branches/indexer-split/data/tracker-xesam-search.xml
Removed:
branches/indexer-split/data/tracker-xesam-search.xml
Modified:
branches/indexer-split/ChangeLog
branches/indexer-split/data/Makefile.am
branches/indexer-split/src/trackerd/tracker-xesam-live-search.c
branches/indexer-split/src/trackerd/tracker-xesam-live-search.h
branches/indexer-split/src/trackerd/tracker-xesam-search.c
branches/indexer-split/src/trackerd/tracker-xesam-search.h
branches/indexer-split/src/trackerd/tracker-xesam-session.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 Tue Apr 29 09:09:56 2008
@@ -8,18 +8,18 @@
tracker-dbus-keywords.xml \
tracker-dbus-metadata.xml \
tracker-dbus-search.xml \
- tracker-xesam-search.xml \
- sqlite-tracker.sql \
- sqlite-cache.sql \
- sqlite-email.sql \
- sqlite-service-stored-procs.sql \
- sqlite-service-triggers.sql \
- sqlite-tracker-triggers.sql \
- sqlite-user-data.sql \
- sqlite-stored-procs.sql \
- sqlite-service.sql \
- sqlite-service-types.sql \
- sqlite-metadata.sql
+ tracker-dbus-xesam.xml \
+ sqlite-tracker.sql \
+ sqlite-cache.sql \
+ sqlite-email.sql \
+ sqlite-service-stored-procs.sql \
+ sqlite-service-triggers.sql \
+ sqlite-tracker-triggers.sql \
+ sqlite-user-data.sql \
+ sqlite-stored-procs.sql \
+ sqlite-service.sql \
+ sqlite-service-types.sql \
+ sqlite-metadata.sql
servicedir = $(DBUS_SERVICES_DIR)
service_in_files = tracker.service.in
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 Tue Apr 29 09:09:56 2008
@@ -41,16 +41,15 @@
}
static void
-tracker_xesam_live_search_class_init (TrackerXesamLiveSearchClass * klass)
+tracker_xesam_live_search_class_init (TrackerXesamLiveSearchClass *klass)
{
GObjectClass *object_class;
object_class = G_OBJECT_CLASS (klass);
object_class->finalize = tracker_xesam_live_search_finalize;
}
-
static void
-tracker_xesam_live_search_init (TrackerXesamLiveSearch * self)
+tracker_xesam_live_search_init (TrackerXesamLiveSearch *self)
{
TrackerXesamLiveSearchPriv *priv = self->priv;
priv->search_id = NULL;
@@ -58,8 +57,6 @@
priv->closed = FALSE;
}
-
-
/**
* tracker_xesam_live_search_emit_hits_added:
* @self: A #TrackerXesamLiveSearch
@@ -68,7 +65,8 @@
* Emits the @hits-added signal on the DBus proxy for Xesam
**/
void
-tracker_xesam_live_search_emit_hits_added (TrackerXesamLiveSearch *self, guint count)
+tracker_xesam_live_search_emit_hits_added (TrackerXesamLiveSearch *self,
+ guint count)
{
TrackerXesamSearch *proxy = TRACKER_XESAM_SEARCH (tracker_dbus_get_object (TRACKER_TYPE_XESAM_SEARCH));
@@ -76,7 +74,6 @@
tracker_xesam_live_search_get_id (self), count);
}
-
/**
* tracker_xesam_live_search_emit_hits_removed:
* @self: A #TrackerXesamLiveSearch
@@ -89,7 +86,8 @@
* on any of the given hit ids should return unset fields.
**/
void
-tracker_xesam_live_search_emit_hits_removed (TrackerXesamLiveSearch *self, GArray *hit_ids)
+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));
@@ -97,7 +95,6 @@
tracker_xesam_live_search_get_id (self), hit_ids);
}
-
/**
* tracker_xesam_live_search_emit_hits_modified:
* @selfs: A #TrackerXesamLiveSearch
@@ -110,7 +107,8 @@
* They can have been moved in which case their uri will have changed.
**/
void
-tracker_xesam_live_search_emit_hits_modified (TrackerXesamLiveSearch *self, GArray *hit_ids)
+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));
@@ -118,7 +116,6 @@
tracker_xesam_live_search_get_id (self), hit_ids);
}
-
/**
* tracker_xesam_live_search_emit_done:
* @self: A #TrackerXesamLiveSearch
@@ -147,7 +144,8 @@
* Close @self. An error will be thrown if @self was already closed.
**/
void
-tracker_xesam_live_search_close (TrackerXesamLiveSearch *self, GError **error)
+tracker_xesam_live_search_close (TrackerXesamLiveSearch *self,
+ GError **error)
{
TrackerXesamLiveSearchPriv *priv = self->priv;
if (priv->closed)
@@ -159,7 +157,6 @@
// todo
}
-
/**
* tracker_xesam_live_search_get_hit_count:
* @self: a #TrackerXesamLiveSearch
@@ -172,7 +169,9 @@
* @tracker_xesam_live_search_activate yet.
**/
void
-tracker_xesam_live_search_get_hit_count (TrackerXesamLiveSearch *self, guint *count, GError **error)
+tracker_xesam_live_search_get_hit_count (TrackerXesamLiveSearch *self,
+ guint *count,
+ GError **error)
{
TrackerXesamLiveSearchPriv *priv = self->priv;
@@ -186,11 +185,10 @@
*count = 0;
}
-
static void
-get_hit_data (TrackerXesamLiveSearch *self, GPtrArray **hit_data)
+get_hit_data (TrackerXesamLiveSearch *self,
+ GPtrArray **hit_data)
{
-
/**
* Retrieving Hits
* The return value of GetHits and GetHitData is a sorted array of hits. A hit
@@ -230,7 +228,10 @@
* @tracker_xesam_live_search_activate yet.
**/
void
-tracker_xesam_live_search_get_hits (TrackerXesamLiveSearch *self, guint count, GPtrArray **hits, GError **error)
+tracker_xesam_live_search_get_hits (TrackerXesamLiveSearch *self,
+ guint count,
+ GPtrArray **hits,
+ GError **error)
{
TrackerXesamLiveSearchPriv *priv = self->priv;
@@ -242,8 +243,6 @@
g_set_error (error, TRACKER_XESAM_ERROR,
TRACKER_XESAM_ERROR_SEARCH_NOT_ACTIVE,
"Search is not active yet");
-
-
}
/**
@@ -274,7 +273,11 @@
* will not result in an error, but return only unset fields.
**/
void
-tracker_xesam_live_search_get_hit_data (TrackerXesamLiveSearch *self, GArray *hit_ids, GStrv fields, GPtrArray **hit_data, GError **error)
+tracker_xesam_live_search_get_hit_data (TrackerXesamLiveSearch *self,
+ GArray *hit_ids,
+ GStrv fields,
+ GPtrArray **hit_data,
+ GError **error)
{
TrackerXesamLiveSearchPriv *priv = self->priv;
@@ -315,7 +318,8 @@
* An error will be thrown if @self is closed.
**/
void
-tracker_xesam_live_search_activate (TrackerXesamLiveSearch *self, GError **error)
+tracker_xesam_live_search_activate (TrackerXesamLiveSearch *self,
+ GError **error)
{
TrackerXesamLiveSearchPriv *priv = self->priv;
@@ -329,7 +333,6 @@
// todo
}
-
/**
* tracker_xesam_live_search_get_query:
* @self: a #TrackerXesamLiveSearch
@@ -349,7 +352,6 @@
return "WHERE 1=1";
}
-
/**
* tracker_xesam_live_search_set_id:
* @self: A #TrackerXesamLiveSearch
@@ -358,7 +360,8 @@
* Set a read-only unique ID string for @self.
**/
void
-tracker_xesam_live_search_set_id (TrackerXesamLiveSearch *self, const gchar *search_id)
+tracker_xesam_live_search_set_id (TrackerXesamLiveSearch *self,
+ const gchar *search_id)
{
TrackerXesamLiveSearchPriv *priv = self->priv;
Modified: branches/indexer-split/src/trackerd/tracker-xesam-live-search.h
==============================================================================
--- branches/indexer-split/src/trackerd/tracker-xesam-live-search.h (original)
+++ branches/indexer-split/src/trackerd/tracker-xesam-live-search.h Tue Apr 29 09:09:56 2008
@@ -1,8 +1,4 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-#ifndef _TRACKER_XESAM_LIVE_SEARCH_H_
-#define _TRACKER_XESAM_LIVE_SEARCH_H_
-
/*
* Copyright (C) 2008, Nokia
*
@@ -22,12 +18,14 @@
* Boston, MA 02110-1301, USA.
*/
+#ifndef _TRACKER_XESAM_LIVE_SEARCH_H_
+#define _TRACKER_XESAM_LIVE_SEARCH_H_
+
#include <glib.h>
#include <glib-object.h>
G_BEGIN_DECLS
-
#define TRACKER_TYPE_XESAM_LIVE_SEARCH (tracker_xesam_live_search_get_type ())
#define TRACKER_XESAM_LIVE_SEARCH(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TRACKER_TYPE_XESAM_LIVE_SEARCH, TrackerXesamLiveSearch))
#define TRACKER_XESAM_LIVE_SEARCH_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TRACKER_TYPE_XESAM_LIVE_SEARCH, TrackerXesamLiveSearchClass))
@@ -47,23 +45,37 @@
GObjectClass parent_class;
};
-TrackerXesamLiveSearch* tracker_xesam_live_search_new (const gchar *query_xml);
-GType tracker_xesam_live_search_get_type (void);
-
-void tracker_xesam_live_search_set_id (TrackerXesamLiveSearch *self, const gchar *search_id);
-const gchar* tracker_xesam_live_search_get_id (TrackerXesamLiveSearch *self);
-const gchar* tracker_xesam_live_search_get_query (TrackerXesamLiveSearch *self);
-void tracker_xesam_live_search_activate (TrackerXesamLiveSearch *self, GError **error);
-gboolean tracker_xesam_live_search_is_active (TrackerXesamLiveSearch *self);
-void tracker_xesam_live_search_get_hit_data (TrackerXesamLiveSearch *self, GArray *hit_ids, GStrv fields, GPtrArray **hit_data, GError **error);
-void tracker_xesam_live_search_get_hits (TrackerXesamLiveSearch *self, guint count, GPtrArray **hits, GError **error);
-void tracker_xesam_live_search_get_hit_count (TrackerXesamLiveSearch *self, guint *count, GError **error);
-void tracker_xesam_live_search_close (TrackerXesamLiveSearch *self, GError **error);
-
-void tracker_xesam_live_search_emit_hits_added (TrackerXesamLiveSearch *self, guint count);
-void tracker_xesam_live_search_emit_hits_removed (TrackerXesamLiveSearch *self, GArray *hit_ids);
-void tracker_xesam_live_search_emit_hits_modified (TrackerXesamLiveSearch *self, GArray *hit_ids);
-void tracker_xesam_live_search_emit_done (TrackerXesamLiveSearch *self);
+TrackerXesamLiveSearch *
+ tracker_xesam_live_search_new (const gchar *query_xml);
+GType tracker_xesam_live_search_get_type (void);
+void tracker_xesam_live_search_set_id (TrackerXesamLiveSearch *self,
+ const gchar *search_id);
+const gchar* tracker_xesam_live_search_get_id (TrackerXesamLiveSearch *self);
+const gchar* tracker_xesam_live_search_get_query (TrackerXesamLiveSearch *self);
+void tracker_xesam_live_search_activate (TrackerXesamLiveSearch *self,
+ GError **error);
+gboolean tracker_xesam_live_search_is_active (TrackerXesamLiveSearch *self);
+void tracker_xesam_live_search_get_hit_data (TrackerXesamLiveSearch *self,
+ GArray *hit_ids,
+ GStrv fields,
+ GPtrArray **hit_data,
+ GError **error);
+void tracker_xesam_live_search_get_hits (TrackerXesamLiveSearch *self,
+ guint count,
+ GPtrArray **hits,
+ GError **error);
+void tracker_xesam_live_search_get_hit_count (TrackerXesamLiveSearch *self,
+ guint *count,
+ GError **error);
+void tracker_xesam_live_search_close (TrackerXesamLiveSearch *self,
+ GError **error);
+void tracker_xesam_live_search_emit_hits_added (TrackerXesamLiveSearch *self,
+ guint count);
+void tracker_xesam_live_search_emit_hits_removed (TrackerXesamLiveSearch *self,
+ GArray *hit_ids);
+void tracker_xesam_live_search_emit_hits_modified (TrackerXesamLiveSearch *self,
+ GArray *hit_ids);
+void tracker_xesam_live_search_emit_done (TrackerXesamLiveSearch *self);
G_END_DECLS
Modified: 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-xesam-search.c Tue Apr 29 09:09:56 2008
@@ -19,7 +19,6 @@
* Boston, MA 02110-1301, USA.
*/
-
#include <libtracker-common/tracker-log.h>
#include <libtracker-common/tracker-config.h>
#include <libtracker-common/tracker-utils.h>
@@ -115,7 +114,6 @@
G_TYPE_NONE,
1,
G_TYPE_STRV);
-
}
static void
@@ -123,14 +121,12 @@
{
}
-
TrackerXesamSearch *
tracker_xesam_search_new (void)
{
return g_object_new (TRACKER_TYPE_XESAM_SEARCH, NULL);
}
-
static void
tracker_xesam_search_close_session_interal (const gchar *session_id,
GError **error)
@@ -184,10 +180,9 @@
/*
* Functions
*/
-
-
void
-tracker_xesam_search_new_session (TrackerXesamSearch *object, DBusGMethodInvocation *context)
+tracker_xesam_search_new_session (TrackerXesamSearch *object,
+ DBusGMethodInvocation *context)
{
gchar *session_id = NULL;
guint request_id = tracker_dbus_get_next_request_id ();
@@ -207,7 +202,6 @@
tracker_xesam_create_session (object, &session_id, &error);
-
if (error) {
dbus_g_method_return_error (context, error);
g_error_free (error);
@@ -232,10 +226,9 @@
tracker_dbus_request_success (request_id);
}
-
void
-tracker_xesam_search_close_session (TrackerXesamSearch *object,
- const gchar *session_id,
+tracker_xesam_search_close_session (TrackerXesamSearch *object,
+ const gchar *session_id,
DBusGMethodInvocation *context)
{
guint request_id = tracker_dbus_get_next_request_id ();
@@ -248,7 +241,6 @@
dbus_g_method_return_error (context, error);
g_error_free (error);
} else {
-
if (sessions) {
GList *my_sessions = g_hash_table_lookup (sessions, key);
if (my_sessions) {
@@ -274,13 +266,12 @@
tracker_dbus_request_success (request_id);
}
-
void
-tracker_xesam_search_set_property (TrackerXesamSearch *object,
- const gchar *session_id,
- const gchar *prop,
- GValue *val,
- DBusGMethodInvocation *context)
+tracker_xesam_search_set_property (TrackerXesamSearch *object,
+ const gchar *session_id,
+ const gchar *prop,
+ GValue *val,
+ DBusGMethodInvocation *context)
{
guint request_id = tracker_dbus_get_next_request_id ();
GError *error = NULL;
@@ -305,13 +296,12 @@
}
tracker_dbus_request_success (request_id);
-
}
void
-tracker_xesam_search_get_property (TrackerXesamSearch *object,
- const gchar *session_id,
- const gchar *prop,
+tracker_xesam_search_get_property (TrackerXesamSearch *object,
+ const gchar *session_id,
+ const gchar *prop,
DBusGMethodInvocation *context)
{
guint request_id = tracker_dbus_get_next_request_id ();
@@ -343,9 +333,9 @@
void
-tracker_xesam_search_new_search (TrackerXesamSearch *object,
- const gchar *session_id,
- const gchar *query_xml,
+tracker_xesam_search_new_search (TrackerXesamSearch *object,
+ const gchar *session_id,
+ const gchar *query_xml,
DBusGMethodInvocation *context)
{
guint request_id = tracker_dbus_get_next_request_id ();
@@ -375,12 +365,11 @@
}
tracker_dbus_request_success (request_id);
-
}
void
-tracker_xesam_search_start_search (TrackerXesamSearch *object,
- const gchar *search_id,
+tracker_xesam_search_start_search (TrackerXesamSearch *object,
+ const gchar *search_id,
DBusGMethodInvocation *context)
{
guint request_id = tracker_dbus_get_next_request_id ();
@@ -432,17 +421,18 @@
}
tracker_dbus_request_success (request_id);
-
}
inline static void
-unsetvalue (gpointer data, gpointer user_data)
+unsetvalue (gpointer data,
+ gpointer user_data)
{
g_value_unset (data);
}
inline static void
-foreach_hits_data (gpointer hits_data, gpointer user_data)
+foreach_hits_data (gpointer hits_data,
+ gpointer user_data)
{
g_ptr_array_foreach ((GPtrArray *) hits_data, unsetvalue, NULL);
}
@@ -454,9 +444,9 @@
}
void
-tracker_xesam_search_get_hits (TrackerXesamSearch *object,
- const gchar *search_id,
- guint count,
+tracker_xesam_search_get_hits (TrackerXesamSearch *object,
+ const gchar *search_id,
+ guint count,
DBusGMethodInvocation *context)
{
guint request_id = tracker_dbus_get_next_request_id ();
@@ -485,10 +475,10 @@
}
void
-tracker_xesam_search_get_hit_data (TrackerXesamSearch *object,
- const gchar *search_id,
- GArray *hit_ids, /* not sure */
- GStrv fields,
+tracker_xesam_search_get_hit_data (TrackerXesamSearch *object,
+ const gchar *search_id,
+ GArray *hit_ids, /* not sure */
+ GStrv fields,
DBusGMethodInvocation *context)
{
guint request_id = tracker_dbus_get_next_request_id ();
@@ -515,12 +505,11 @@
}
tracker_dbus_request_success (request_id);
-
}
void
-tracker_xesam_search_close_search (TrackerXesamSearch *object,
- const gchar *search_id,
+tracker_xesam_search_close_search (TrackerXesamSearch *object,
+ const gchar *search_id,
DBusGMethodInvocation *context)
{
guint request_id = tracker_dbus_get_next_request_id ();
@@ -543,11 +532,10 @@
}
tracker_dbus_request_success (request_id);
-
}
void
-tracker_xesam_search_get_state (TrackerXesamSearch *object,
+tracker_xesam_search_get_state (TrackerXesamSearch *object,
DBusGMethodInvocation *context)
{
guint request_id = tracker_dbus_get_next_request_id ();
@@ -580,7 +568,8 @@
* interface.
**/
void
-tracker_xesam_search_emit_state_changed (TrackerXesamSearch *self, GStrv state_info)
+tracker_xesam_search_emit_state_changed (TrackerXesamSearch *self,
+ GStrv state_info)
{
g_signal_emit (self, xesam_signals[XESAM_STATE_CHANGED], 0, state_info);
}
Modified: 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-xesam-search.h Tue Apr 29 09:09:56 2008
@@ -67,59 +67,54 @@
extern guint *xesam_signals;
#endif
-GType tracker_xesam_search_get_type (void);
-
+GType tracker_xesam_search_get_type (void);
TrackerXesamSearch *
- tracker_xesam_search_new (void);
-
-
-void tracker_xesam_search_new_session (TrackerXesamSearch *object,
- DBusGMethodInvocation *context);
-void tracker_xesam_search_set_property (TrackerXesamSearch *object,
- const gchar *session_id,
- const gchar *prop,
- GValue *val, /* not sure */
- DBusGMethodInvocation *context);
-void tracker_xesam_search_get_property (TrackerXesamSearch *object,
- const gchar *session_id,
- const gchar *prop,
- DBusGMethodInvocation *context);
-void tracker_xesam_search_close_session (TrackerXesamSearch *object,
- const gchar *session_id,
- DBusGMethodInvocation *context);
-void tracker_xesam_search_new_search (TrackerXesamSearch *object,
- const gchar *session_id,
- const gchar *query_xml,
- DBusGMethodInvocation *context);
-void tracker_xesam_search_start_search (TrackerXesamSearch *object,
- const gchar *search_id,
- DBusGMethodInvocation *context);
-void tracker_xesam_search_get_hit_count (TrackerXesamSearch *object,
- const gchar *search_id,
- DBusGMethodInvocation *context);
-void tracker_xesam_search_get_hits (TrackerXesamSearch *object,
- const gchar *search_id,
- guint count,
- DBusGMethodInvocation *context);
-void tracker_xesam_search_get_hit_data (TrackerXesamSearch *object,
- const gchar *search_id,
- GArray *hit_ids, /* not sure */
- GStrv fields,
- DBusGMethodInvocation *context);
-void tracker_xesam_search_close_search (TrackerXesamSearch *object,
- const gchar *search_id,
- DBusGMethodInvocation *context);
-void tracker_xesam_search_get_state (TrackerXesamSearch *object,
- DBusGMethodInvocation *context);
-
-
-void tracker_xesam_search_emit_state_changed (TrackerXesamSearch *self, GStrv state_info);
-
-void tracker_xesam_search_name_owner_changed (DBusGProxy *proxy,
- const char *name,
- const char *prev_owner,
- const char *new_owner,
- TrackerXesamSearch *self);
+ tracker_xesam_search_new (void);
+void tracker_xesam_search_new_session (TrackerXesamSearch *object,
+ DBusGMethodInvocation *context);
+void tracker_xesam_search_set_property (TrackerXesamSearch *object,
+ const gchar *session_id,
+ const gchar *prop,
+ GValue *val,
+ DBusGMethodInvocation *context);
+void tracker_xesam_search_get_property (TrackerXesamSearch *object,
+ const gchar *session_id,
+ const gchar *prop,
+ DBusGMethodInvocation *context);
+void tracker_xesam_search_close_session (TrackerXesamSearch *object,
+ const gchar *session_id,
+ DBusGMethodInvocation *context);
+void tracker_xesam_search_new_search (TrackerXesamSearch *object,
+ const gchar *session_id,
+ const gchar *query_xml,
+ DBusGMethodInvocation *context);
+void tracker_xesam_search_start_search (TrackerXesamSearch *object,
+ const gchar *search_id,
+ DBusGMethodInvocation *context);
+void tracker_xesam_search_get_hit_count (TrackerXesamSearch *object,
+ const gchar *search_id,
+ DBusGMethodInvocation *context);
+void tracker_xesam_search_get_hits (TrackerXesamSearch *object,
+ const gchar *search_id,
+ guint count,
+ DBusGMethodInvocation *context);
+void tracker_xesam_search_get_hit_data (TrackerXesamSearch *object,
+ const gchar *search_id,
+ GArray *hit_ids,
+ GStrv fields,
+ DBusGMethodInvocation *context);
+void tracker_xesam_search_close_search (TrackerXesamSearch *object,
+ const gchar *search_id,
+ DBusGMethodInvocation *context);
+void tracker_xesam_search_get_state (TrackerXesamSearch *object,
+ DBusGMethodInvocation *context);
+void tracker_xesam_search_emit_state_changed (TrackerXesamSearch *self,
+ GStrv state_info);
+void tracker_xesam_search_name_owner_changed (DBusGProxy *proxy,
+ const char *name,
+ const char *prev_owner,
+ const char *new_owner,
+ TrackerXesamSearch *self);
G_END_DECLS
Modified: branches/indexer-split/src/trackerd/tracker-xesam-session.c
==============================================================================
--- branches/indexer-split/src/trackerd/tracker-xesam-session.c (original)
+++ branches/indexer-split/src/trackerd/tracker-xesam-session.c Tue Apr 29 09:09:56 2008
@@ -1,5 +1,4 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
/*
* Copyright (C) 2008, Nokia
* Authors: Philip Van Hoof (pvanhoof gnome org)
@@ -27,7 +26,6 @@
gchar *session_id;
};
-
G_DEFINE_TYPE(TrackerXesamSession, tracker_xesam_session, G_TYPE_OBJECT)
static void
@@ -41,7 +39,6 @@
(GDestroyNotify) g_object_unref);
}
-
static void
tracker_xesam_session_finalize (GObject *object)
{
@@ -53,7 +50,7 @@
}
static void
-tracker_xesam_session_class_init (TrackerXesamSessionClass * klass)
+tracker_xesam_session_class_init (TrackerXesamSessionClass *klass)
{
GObjectClass *object_class;
object_class = G_OBJECT_CLASS (klass);
@@ -68,7 +65,8 @@
* Set a read-only unique ID string for @self.
**/
void
-tracker_xesam_session_set_id (TrackerXesamSession *self, const gchar *session_id)
+tracker_xesam_session_set_id (TrackerXesamSession *self,
+ const gchar *session_id)
{
TrackerXesamSessionPriv *priv = self->priv;
@@ -93,8 +91,6 @@
return (const gchar*) priv->session_id;
}
-
-
/**
* tracker_xesam_session_get_searches:
* @self: A #TrackerXesamSession
@@ -112,8 +108,6 @@
return g_hash_table_get_values (priv->searches);
}
-
-
/**
* tracker_xesam_session_set_property:
* @self: A #TrackerXesamSession
@@ -141,13 +135,15 @@
* is invalid.
**/
void
-tracker_xesam_session_set_property (TrackerXesamSession *self, const gchar *prop, const GValue *val, GValue **new_val, GError **error)
+tracker_xesam_session_set_property (TrackerXesamSession *self,
+ const gchar *prop,
+ const GValue *val,
+ GValue **new_val,
+ GError **error)
{
// todo
}
-
-
/**
* tracker_xesam_session_get_property:
* @self: A #TrackerXesamSession
@@ -161,15 +157,16 @@
* prop is not a valid session property.
**/
void
-tracker_xesam_session_get_property (TrackerXesamSession *self, const gchar *prop, GValue **value, GError **error)
+tracker_xesam_session_get_property (TrackerXesamSession *self,
+ const gchar *prop,
+ GValue **value,
+ GError **error)
{
// todo
return;
}
-
-
/**
* tracker_xesam_session_create_search:
* @self: A #TrackerXesamSession
@@ -187,7 +184,10 @@
* @returns: (caller-owns): a new non-activated #TrackerXesamLiveSearch
**/
TrackerXesamLiveSearch*
-tracker_xesam_session_create_search (TrackerXesamSession *self, const gchar *query_xml, gchar **search_id, GError **error)
+tracker_xesam_session_create_search (TrackerXesamSession *self,
+ const gchar *query_xml,
+ gchar **search_id,
+ GError **error)
{
TrackerXesamLiveSearch *search;
TrackerXesamSessionPriv *priv = self->priv;
@@ -207,7 +207,6 @@
return search;
}
-
/**
* tracker_xesam_session_get_search:
* @self: A #TrackerXesamSession
@@ -219,7 +218,9 @@
* @returns: (null-ok) (caller-owns): a #TrackerXesamLiveSearch or NULL
**/
TrackerXesamLiveSearch*
-tracker_xesam_session_get_search (TrackerXesamSession *self, const gchar *search_id, GError **error)
+tracker_xesam_session_get_search (TrackerXesamSession *self,
+ const gchar *search_id,
+ GError **error)
{
TrackerXesamSessionPriv *priv = self->priv;
TrackerXesamLiveSearch *search = g_hash_table_lookup (priv->searches, search_id);
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 Tue Apr 29 09:09:56 2008
@@ -1,7 +1,4 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-#ifndef _TRACKER_XESAM_SESSION_H_
-#define _TRACKER_XESAM_SESSION_H_
-
/*
* Copyright (C) 2008, Nokia
* Authors: Philip Van Hoof (pvanhoof gnome org)
@@ -22,6 +19,9 @@
* Boston, MA 02110-1301, USA.
*/
+#ifndef _TRACKER_XESAM_SESSION_H_
+#define _TRACKER_XESAM_SESSION_H_
+
#include <glib.h>
#include <glib-object.h>
#include <stdlib.h>
@@ -32,7 +32,6 @@
G_BEGIN_DECLS
-
#define TRACKER_TYPE_XESAM_SESSION (tracker_xesam_session_get_type ())
#define TRACKER_XESAM_SESSION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TRACKER_TYPE_XESAM_SESSION, TrackerXesamSession))
#define TRACKER_XESAM_SESSION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TRACKER_TYPE_XESAM_SESSION, TrackerXesamSessionClass))
@@ -53,17 +52,28 @@
GObjectClass parent_class;
};
-void tracker_xesam_session_set_property (TrackerXesamSession *self, const gchar *prop, const GValue *val, GValue **new_val, GError **error);
-void tracker_xesam_session_get_property (TrackerXesamSession *self, const gchar *prop, GValue **value, GError **error);
-TrackerXesamLiveSearch* tracker_xesam_session_create_search (TrackerXesamSession *self, const gchar *query_xml , gchar **search_id, GError **error);
-TrackerXesamLiveSearch* tracker_xesam_session_get_search (TrackerXesamSession *self, const gchar *search_id, GError **error);
-GList *tracker_xesam_session_get_searches (TrackerXesamSession *self);
-void tracker_xesam_session_set_id (TrackerXesamSession *self, const gchar *session_id);
-const gchar* tracker_xesam_session_get_id (TrackerXesamSession *self);
-
-TrackerXesamSession* tracker_xesam_session_new (void);
-GType tracker_xesam_session_get_type (void);
-
+void tracker_xesam_session_set_property (TrackerXesamSession *self,
+ const gchar *prop,
+ const GValue *val,
+ GValue **new_val,
+ GError **error);
+void tracker_xesam_session_get_property (TrackerXesamSession *self,
+ const gchar *prop,
+ GValue **value,
+ GError **error);
+TrackerXesamLiveSearch* tracker_xesam_session_create_search (TrackerXesamSession *self,
+ const gchar *query_xml,
+ gchar **search_id,
+ GError **error);
+TrackerXesamLiveSearch* tracker_xesam_session_get_search (TrackerXesamSession *self,
+ const gchar *search_id,
+ GError **error);
+GList * tracker_xesam_session_get_searches (TrackerXesamSession *self);
+void tracker_xesam_session_set_id (TrackerXesamSession *self,
+ const gchar *session_id);
+const gchar* tracker_xesam_session_get_id (TrackerXesamSession *self);
+TrackerXesamSession* tracker_xesam_session_new (void);
+GType tracker_xesam_session_get_type (void);
G_END_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 Tue Apr 29 09:09:56 2008
@@ -1,3 +1,4 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/*
* Copyright (C) 2008, Nokia
* Authors: Philip Van Hoof (pvanhoof gnome org)
@@ -20,7 +21,7 @@
#include "tracker-xesam.h"
-extern Tracker *tracker;
+extern Tracker *tracker;
void
tracker_xesam_init (void)
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 Tue Apr 29 09:09:56 2008
@@ -1,11 +1,4 @@
-#ifndef _TRACKER_XESAM_H_
-#define _TRACKER_XESAM_H_
-
-#include "tracker-utils.h"
-#include "tracker-dbus.h"
-#include "tracker-xesam-session.h"
-#include "tracker-xesam-live-search.h"
-
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/*
* Copyright (C) 2008, Nokia
* Authors: Philip Van Hoof (pvanhoof gnome org)
@@ -26,11 +19,13 @@
* Boston, MA 02110-1301, USA.
*/
-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);
-void tracker_xesam_close_session (const gchar *session_id, GError **error);
+#ifndef _TRACKER_XESAM_H_
+#define _TRACKER_XESAM_H_
+
+#include "tracker-utils.h"
+#include "tracker-dbus.h"
+#include "tracker-xesam-session.h"
+#include "tracker-xesam-live-search.h"
typedef enum {
TRACKER_XESAM_ERROR = 1
@@ -43,7 +38,18 @@
TRACKER_XESAM_ERROR_SEARCH_NOT_ACTIVE = 4
} TrackerXesamError;
-
-void tracker_xesam_init (void);
+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);
+void tracker_xesam_close_session (const gchar *session_id,
+ GError **error);
+void tracker_xesam_init (void);
#endif
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
