tracker r1325 - in branches/indexer-split: . src/trackerd
- From: mr svn gnome org
- To: svn-commits-list gnome org
- Subject: tracker r1325 - in branches/indexer-split: . src/trackerd
- Date: Tue, 29 Apr 2008 11:01:03 +0100 (BST)
Author: mr
Date: Tue Apr 29 10:01:03 2008
New Revision: 1325
URL: http://svn.gnome.org/viewvc/tracker?rev=1325&view=rev
Log:
* src/trackerd/Makefile.am:
* src/trackerd/tracker-dbus-xesam.[ch]:
* src/trackerd/tracker-dbus.c:
* src/trackerd/tracker-xesam-live-search.c:
* src/trackerd/tracker-xesam-search.[ch]:
* src/trackerd/tracker-xesam-session.h:
* src/trackerd/tracker-xesam.[ch]: Renamed tracker-xesam-search to
tracker-dbus-xesam.
Added:
branches/indexer-split/src/trackerd/tracker-dbus-xesam.c
- copied, changed from r1324, /branches/indexer-split/src/trackerd/tracker-xesam-search.c
branches/indexer-split/src/trackerd/tracker-dbus-xesam.h
- copied, changed from r1324, /branches/indexer-split/src/trackerd/tracker-xesam-search.h
Removed:
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/src/trackerd/Makefile.am
branches/indexer-split/src/trackerd/tracker-dbus.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/src/trackerd/Makefile.am
==============================================================================
--- branches/indexer-split/src/trackerd/Makefile.am (original)
+++ branches/indexer-split/src/trackerd/Makefile.am Tue Apr 29 10:01:03 2008
@@ -107,8 +107,8 @@
tracker-dbus-metadata.h \
tracker-dbus-search.c \
tracker-dbus-search.h \
- tracker-xesam-search.c \
- tracker-xesam-search.h \
+ tracker-dbus-xesam.c \
+ tracker-dbus-xesam.h \
tracker-email.c \
tracker-email.h \
tracker-email-utils.c \
@@ -187,7 +187,7 @@
tracker-dbus-keywords-glue.h \
tracker-dbus-metadata-glue.h \
tracker-dbus-search-glue.h \
- tracker-xesam-search-glue.h
+ tracker-dbus-xesam-glue.h
%-glue.h: $(top_builddir)/data/%.xml
$(DBUSBINDINGTOOL) --mode=glib-server --output=$@ --prefix=$(subst -,_,$*) $^
Copied: branches/indexer-split/src/trackerd/tracker-dbus-xesam.c (from r1324, /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.c Tue Apr 29 10:01:03 2008
@@ -24,31 +24,37 @@
#include <libtracker-common/tracker-utils.h>
#include "tracker-dbus.h"
+#include "tracker-dbus-xesam.h"
#include "tracker-status.h"
-
-#define TRACKER_XESAM_SEARCH_C
-#include "tracker-xesam-search.h"
#include "tracker-xesam.h"
-#undef TRACER_XESAM_SEARCH_C
-
#include "tracker-rdf-query.h"
#include "tracker-query-tree.h"
#include "tracker-indexer.h"
#include "tracker-service-manager.h"
#include "tracker-marshal.h"
-guint xesam_signals[XESAM_LAST_SIGNAL] = {0};
+enum {
+ XESAM_HITS_ADDED,
+ XESAM_HITS_REMOVED,
+ XESAM_HITS_MODIFIED,
+ XESAM_SEARCH_DONE,
+ XESAM_STATE_CHANGED,
+ XESAM_LAST_SIGNAL
+};
+
+static GHashTable *sessions = NULL;
+static guint signals[XESAM_LAST_SIGNAL] = {0};
-G_DEFINE_TYPE(TrackerXesamSearch, tracker_xesam_search, G_TYPE_OBJECT)
+G_DEFINE_TYPE(TrackerDBusXesam, tracker_dbus_xesam, G_TYPE_OBJECT)
static void
xesam_search_finalize (GObject *object)
{
- G_OBJECT_CLASS (tracker_xesam_search_parent_class)->finalize (object);
+ G_OBJECT_CLASS (tracker_dbus_xesam_parent_class)->finalize (object);
}
static void
-tracker_xesam_search_class_init (TrackerXesamSearchClass *klass)
+tracker_dbus_xesam_class_init (TrackerDBusXesamClass *klass)
{
GObjectClass *object_class;
@@ -56,7 +62,7 @@
object_class->finalize = xesam_search_finalize;
- xesam_signals[XESAM_HITS_ADDED] =
+ signals[XESAM_HITS_ADDED] =
g_signal_new ("hits-added",
G_TYPE_FROM_CLASS (klass),
G_SIGNAL_RUN_LAST,
@@ -68,7 +74,7 @@
G_TYPE_STRING,
G_TYPE_UINT);
- xesam_signals[XESAM_HITS_REMOVED] =
+ signals[XESAM_HITS_REMOVED] =
g_signal_new ("hits-removed",
G_TYPE_FROM_CLASS (klass),
G_SIGNAL_RUN_LAST,
@@ -80,7 +86,7 @@
G_TYPE_STRING,
DBUS_TYPE_G_UINT_ARRAY);
- xesam_signals[XESAM_HITS_MODIFIED] =
+ signals[XESAM_HITS_MODIFIED] =
g_signal_new ("hits-modified",
G_TYPE_FROM_CLASS (klass),
G_SIGNAL_RUN_LAST,
@@ -92,7 +98,7 @@
G_TYPE_STRING,
DBUS_TYPE_G_UINT_ARRAY);
- xesam_signals[XESAM_SEARCH_DONE] =
+ signals[XESAM_SEARCH_DONE] =
g_signal_new ("search-done",
G_TYPE_FROM_CLASS (klass),
G_SIGNAL_RUN_LAST,
@@ -104,7 +110,7 @@
G_TYPE_STRING);
- xesam_signals[XESAM_STATE_CHANGED] =
+ signals[XESAM_STATE_CHANGED] =
g_signal_new ("state-changed",
G_TYPE_FROM_CLASS (klass),
G_SIGNAL_RUN_LAST,
@@ -117,19 +123,19 @@
}
static void
-tracker_xesam_search_init (TrackerXesamSearch *object)
+tracker_dbus_xesam_init (TrackerDBusXesam *object)
{
}
-TrackerXesamSearch *
-tracker_xesam_search_new (void)
+TrackerDBusXesam *
+tracker_dbus_xesam_new (void)
{
- return g_object_new (TRACKER_TYPE_XESAM_SEARCH, NULL);
+ return g_object_new (TRACKER_TYPE_DBUS_XESAM, NULL);
}
static void
-tracker_xesam_search_close_session_interal (const gchar *session_id,
- GError **error)
+tracker_dbus_xesam_close_session_interal (const gchar *session_id,
+ GError **error)
{
TrackerXesamSession *session = tracker_xesam_get_session (session_id, error);
if (session) {
@@ -146,8 +152,6 @@
}
}
-static GHashTable *sessions = NULL;
-
static void
my_sessions_cleanup (GList *data)
{
@@ -156,11 +160,11 @@
}
void
-tracker_xesam_search_name_owner_changed (DBusGProxy *proxy,
+tracker_dbus_xesam_name_owner_changed (DBusGProxy *proxy,
const char *name,
const char *prev_owner,
const char *new_owner,
- TrackerXesamSearch *self)
+ TrackerDBusXesam *self)
{
if (sessions) {
GList *my_sessions = g_hash_table_lookup (sessions, prev_owner);
@@ -168,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_close_session_interal (session_id, NULL);
copy = g_list_next (copy);
}
my_sessions_cleanup (my_sessions);
@@ -181,7 +185,7 @@
* Functions
*/
void
-tracker_xesam_search_new_session (TrackerXesamSearch *object,
+tracker_dbus_xesam_new_session (TrackerDBusXesam *object,
DBusGMethodInvocation *context)
{
gchar *session_id = NULL;
@@ -227,7 +231,7 @@
}
void
-tracker_xesam_search_close_session (TrackerXesamSearch *object,
+tracker_dbus_xesam_close_session (TrackerDBusXesam *object,
const gchar *session_id,
DBusGMethodInvocation *context)
{
@@ -235,7 +239,7 @@
GError *error = NULL;
gchar *key = dbus_g_method_get_sender (context);
- tracker_xesam_search_close_session_interal (session_id, &error);
+ tracker_dbus_xesam_close_session_interal (session_id, &error);
if (error) {
dbus_g_method_return_error (context, error);
@@ -267,7 +271,7 @@
}
void
-tracker_xesam_search_set_property (TrackerXesamSearch *object,
+tracker_dbus_xesam_set_property (TrackerDBusXesam *object,
const gchar *session_id,
const gchar *prop,
GValue *val,
@@ -299,7 +303,7 @@
}
void
-tracker_xesam_search_get_property (TrackerXesamSearch *object,
+tracker_dbus_xesam_get_property (TrackerDBusXesam *object,
const gchar *session_id,
const gchar *prop,
DBusGMethodInvocation *context)
@@ -333,7 +337,7 @@
void
-tracker_xesam_search_new_search (TrackerXesamSearch *object,
+tracker_dbus_xesam_new_search (TrackerDBusXesam *object,
const gchar *session_id,
const gchar *query_xml,
DBusGMethodInvocation *context)
@@ -368,7 +372,7 @@
}
void
-tracker_xesam_search_start_search (TrackerXesamSearch *object,
+tracker_dbus_xesam_start_search (TrackerDBusXesam *object,
const gchar *search_id,
DBusGMethodInvocation *context)
{
@@ -395,7 +399,7 @@
}
void
-tracker_xesam_search_get_hit_count (TrackerXesamSearch *object,
+tracker_dbus_xesam_get_hit_count (TrackerDBusXesam *object,
const gchar *search_id,
DBusGMethodInvocation *context)
{
@@ -444,7 +448,7 @@
}
void
-tracker_xesam_search_get_hits (TrackerXesamSearch *object,
+tracker_dbus_xesam_get_hits (TrackerDBusXesam *object,
const gchar *search_id,
guint count,
DBusGMethodInvocation *context)
@@ -475,7 +479,7 @@
}
void
-tracker_xesam_search_get_hit_data (TrackerXesamSearch *object,
+tracker_dbus_xesam_get_hit_data (TrackerDBusXesam *object,
const gchar *search_id,
GArray *hit_ids, /* not sure */
GStrv fields,
@@ -508,7 +512,7 @@
}
void
-tracker_xesam_search_close_search (TrackerXesamSearch *object,
+tracker_dbus_xesam_close_search (TrackerDBusXesam *object,
const gchar *search_id,
DBusGMethodInvocation *context)
{
@@ -535,7 +539,7 @@
}
void
-tracker_xesam_search_get_state (TrackerXesamSearch *object,
+tracker_dbus_xesam_get_state (TrackerDBusXesam *object,
DBusGMethodInvocation *context)
{
guint request_id = tracker_dbus_get_next_request_id ();
@@ -552,8 +556,8 @@
}
/**
- * tracker_xesam_search_emit_state_changed:
- * @self: A #TrackerXesamSearch
+ * tracker_dbus_xesam_emit_state_changed:
+ * @self: A #TrackerDBusXesam
* @state_info: (in): an array of strings that contain the state
*
* Emits the @state-changed signal on the DBus proxy for Xesam.
@@ -568,8 +572,8 @@
* interface.
**/
void
-tracker_xesam_search_emit_state_changed (TrackerXesamSearch *self,
- GStrv state_info)
+tracker_dbus_xesam_emit_state_changed (TrackerDBusXesam *self,
+ GStrv state_info)
{
- g_signal_emit (self, xesam_signals[XESAM_STATE_CHANGED], 0, state_info);
+ g_signal_emit (self, signals[XESAM_STATE_CHANGED], 0, state_info);
}
Copied: branches/indexer-split/src/trackerd/tracker-dbus-xesam.h (from r1324, /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.h Tue Apr 29 10:01:03 2008
@@ -19,8 +19,8 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef __TRACKER_XESAM_SEARCH_H__
-#define __TRACKER_XESAM_SEARCH_H__
+#ifndef __TRACKER_DBUS_XESAM_H__
+#define __TRACKER_DBUS_XESAM_H__
#include <dbus/dbus-glib.h>
#include <dbus/dbus-glib-bindings.h>
@@ -29,93 +29,80 @@
#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_SERVICE "org.freedesktop.xesam"
+#define TRACKER_DBUS_XESAM_PATH "/org/freedesktop/xesam/Search"
+#define TRACKER_DBUS_XESAM_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 (tracker_dbus_xesam_get_type ())
+#define TRACKER_DBUS_XESAM(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), TRACKER_TYPE_DBUS_XESAM, TrackerDBusXesam))
+#define TRACKER_DBUS_XESAM_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TRACKER_TYPE_DBUS_XESAM, TrackerDBusXesamClass))
+#define TRACKER_IS_XESAM_SEARCH(object) (G_TYPE_CHECK_INSTANCE_TYPE ((object), TRACKER_TYPE_DBUS_XESAM))
+#define TRACKER_IS_XESAM_SEARCH_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TRACKER_TYPE_DBUS_XESAM))
+#define TRACKER_DBUS_XESAM_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TRACKER_TYPE_DBUS_XESAM, TrackerDBusXesamClass))
-typedef struct TrackerXesamSearch TrackerXesamSearch;
-typedef struct TrackerXesamSearchClass TrackerXesamSearchClass;
+typedef struct TrackerDBusXesam TrackerDBusXesam;
+typedef struct TrackerDBusXesamClass TrackerDBusXesamClass;
-struct TrackerXesamSearch {
+struct TrackerDBusXesam {
GObject parent;
};
-struct TrackerXesamSearchClass {
+struct TrackerDBusXesamClass {
GObjectClass parent;
};
-enum {
- XESAM_HITS_ADDED,
- XESAM_HITS_REMOVED,
- XESAM_HITS_MODIFIED,
- XESAM_SEARCH_DONE,
- XESAM_STATE_CHANGED,
- XESAM_LAST_SIGNAL
-};
-
-#ifndef TRACKER_XESAM_SEARCH_C
-extern guint *xesam_signals;
-#endif
-
-GType tracker_xesam_search_get_type (void);
-TrackerXesamSearch *
- tracker_xesam_search_new (void);
-void tracker_xesam_search_new_session (TrackerXesamSearch *object,
+GType tracker_dbus_xesam_get_type (void);
+TrackerDBusXesam *
+ tracker_dbus_xesam_new (void);
+void tracker_dbus_xesam_new_session (TrackerDBusXesam *object,
DBusGMethodInvocation *context);
-void tracker_xesam_search_set_property (TrackerXesamSearch *object,
+void tracker_dbus_xesam_set_property (TrackerDBusXesam *object,
const gchar *session_id,
const gchar *prop,
GValue *val,
DBusGMethodInvocation *context);
-void tracker_xesam_search_get_property (TrackerXesamSearch *object,
+void tracker_dbus_xesam_get_property (TrackerDBusXesam *object,
const gchar *session_id,
const gchar *prop,
DBusGMethodInvocation *context);
-void tracker_xesam_search_close_session (TrackerXesamSearch *object,
+void tracker_dbus_xesam_close_session (TrackerDBusXesam *object,
const gchar *session_id,
DBusGMethodInvocation *context);
-void tracker_xesam_search_new_search (TrackerXesamSearch *object,
+void tracker_dbus_xesam_new_search (TrackerDBusXesam *object,
const gchar *session_id,
const gchar *query_xml,
DBusGMethodInvocation *context);
-void tracker_xesam_search_start_search (TrackerXesamSearch *object,
+void tracker_dbus_xesam_start_search (TrackerDBusXesam *object,
const gchar *search_id,
DBusGMethodInvocation *context);
-void tracker_xesam_search_get_hit_count (TrackerXesamSearch *object,
+void tracker_dbus_xesam_get_hit_count (TrackerDBusXesam *object,
const gchar *search_id,
DBusGMethodInvocation *context);
-void tracker_xesam_search_get_hits (TrackerXesamSearch *object,
+void tracker_dbus_xesam_get_hits (TrackerDBusXesam *object,
const gchar *search_id,
guint count,
DBusGMethodInvocation *context);
-void tracker_xesam_search_get_hit_data (TrackerXesamSearch *object,
+void tracker_dbus_xesam_get_hit_data (TrackerDBusXesam *object,
const gchar *search_id,
GArray *hit_ids,
GStrv fields,
DBusGMethodInvocation *context);
-void tracker_xesam_search_close_search (TrackerXesamSearch *object,
+void tracker_dbus_xesam_close_search (TrackerDBusXesam *object,
const gchar *search_id,
DBusGMethodInvocation *context);
-void tracker_xesam_search_get_state (TrackerXesamSearch *object,
+void tracker_dbus_xesam_get_state (TrackerDBusXesam *object,
DBusGMethodInvocation *context);
-void tracker_xesam_search_emit_state_changed (TrackerXesamSearch *self,
+void tracker_dbus_xesam_emit_state_changed (TrackerDBusXesam *self,
GStrv state_info);
-void tracker_xesam_search_name_owner_changed (DBusGProxy *proxy,
+void tracker_dbus_xesam_name_owner_changed (DBusGProxy *proxy,
const char *name,
const char *prev_owner,
const char *new_owner,
- TrackerXesamSearch *self);
+ TrackerDBusXesam *self);
G_END_DECLS
-#endif /* __TRACKER_XESAM_SEARCH_H__ */
+#endif /* __TRACKER_DBUS_XESAM_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 Tue Apr 29 10:01:03 2008
@@ -38,8 +38,8 @@
#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-xesam.h"
+#include "tracker-dbus-xesam-glue.h"
#include "tracker-utils.h"
#include "tracker-watch.h"
@@ -231,20 +231,20 @@
/* 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,
+ &dbus_glib_tracker_dbus_xesam_object_info,
+ TRACKER_DBUS_XESAM_PATH))) {
return FALSE;
}
dbus_g_proxy_add_signal (proxy, "NameOwnerChanged",
- G_TYPE_STRING, G_TYPE_STRING,
- G_TYPE_STRING, G_TYPE_INVALID);
-
+ G_TYPE_STRING, G_TYPE_STRING,
+ G_TYPE_STRING, G_TYPE_INVALID);
+
dbus_g_proxy_connect_signal (proxy, "NameOwnerChanged",
- G_CALLBACK (tracker_xesam_search_name_owner_changed),
- g_object_ref (object),
- name_owner_changed_done);
+ G_CALLBACK (tracker_dbus_xesam_name_owner_changed),
+ g_object_ref (object),
+ name_owner_changed_done);
objects = g_slist_prepend (objects, object);
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 10:01:03 2008
@@ -20,7 +20,7 @@
*/
#include "tracker-xesam-live-search.h"
-#include "tracker-xesam-search.h"
+#include "tracker-dbus-xesam.h"
#include "tracker-dbus.h"
#include "tracker-xesam.h"
@@ -68,10 +68,9 @@
tracker_xesam_live_search_emit_hits_added (TrackerXesamLiveSearch *self,
guint count)
{
- TrackerXesamSearch *proxy = TRACKER_XESAM_SEARCH (tracker_dbus_get_object (TRACKER_TYPE_XESAM_SEARCH));
+ TrackerDBusXesam *proxy = TRACKER_DBUS_XESAM (tracker_dbus_get_object (TRACKER_TYPE_DBUS_XESAM));
- g_signal_emit (proxy, xesam_signals[XESAM_HITS_ADDED], 0,
- tracker_xesam_live_search_get_id (self), count);
+ g_signal_emit_by_name (proxy, "hits-added", tracker_xesam_live_search_get_id (self), count);
}
/**
@@ -89,10 +88,9 @@
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));
+ TrackerDBusXesam *proxy = TRACKER_DBUS_XESAM (tracker_dbus_get_object (TRACKER_TYPE_DBUS_XESAM));
- g_signal_emit (proxy, xesam_signals[XESAM_HITS_REMOVED], 0,
- tracker_xesam_live_search_get_id (self), hit_ids);
+ g_signal_emit_by_name (proxy, "hits-removed", tracker_xesam_live_search_get_id (self), hit_ids);
}
/**
@@ -110,10 +108,9 @@
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));
+ TrackerDBusXesam *proxy = TRACKER_DBUS_XESAM (tracker_dbus_get_object (TRACKER_TYPE_DBUS_XESAM));
- g_signal_emit (proxy, xesam_signals[XESAM_HITS_MODIFIED], 0,
- tracker_xesam_live_search_get_id (self), hit_ids);
+ g_signal_emit_by_name (proxy, "hits-modified", tracker_xesam_live_search_get_id (self), hit_ids);
}
/**
@@ -130,10 +127,9 @@
void
tracker_xesam_live_search_emit_done (TrackerXesamLiveSearch *self)
{
- TrackerXesamSearch *proxy = TRACKER_XESAM_SEARCH (tracker_dbus_get_object (TRACKER_TYPE_XESAM_SEARCH));
+ TrackerDBusXesam *proxy = TRACKER_DBUS_XESAM (tracker_dbus_get_object (TRACKER_TYPE_DBUS_XESAM));
- g_signal_emit (proxy, xesam_signals[XESAM_SEARCH_DONE], 0,
- tracker_xesam_live_search_get_id (self));
+ g_signal_emit_by_name (proxy, "search-done", 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 Tue Apr 29 10:01:03 2008
@@ -28,7 +28,7 @@
#include <string.h>
#include "tracker-xesam-live-search.h"
-#include "tracker-xesam-search.h"
+#include "tracker-dbus-xesam.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 Tue Apr 29 10:01:03 2008
@@ -33,7 +33,9 @@
}
TrackerXesamSession *
-tracker_xesam_create_session (TrackerXesamSearch *dbus_proxy, gchar **session_id, GError **error)
+tracker_xesam_create_session (TrackerDBusXesam *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 Tue Apr 29 10:01:03 2008
@@ -45,7 +45,7 @@
GError **error);
TrackerXesamLiveSearch* tracker_xesam_get_live_search (const gchar *search_id,
GError **error);
-TrackerXesamSession* tracker_xesam_create_session (TrackerXesamSearch *dbus_proxy,
+TrackerXesamSession* tracker_xesam_create_session (TrackerDBusXesam *dbus_proxy,
gchar **session_id,
GError **error);
void tracker_xesam_close_session (const gchar *session_id,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
