tracker r1304 - branches/xesam-support/src/trackerd

[pvanhoof svn gnome org]

Author: pvanhoof
Date: Thu Apr 24 12:00:59 2008
New Revision: 1304
URL: http://svn.gnome.org/viewvc/tracker?rev=1304&view=rev

Log:
Fixed some macros that didnt survive the type renaming

Modified:
   branches/xesam-support/src/trackerd/tracker-xesam-live-search.c
   branches/xesam-support/src/trackerd/tracker-xesam-live-search.h
   branches/xesam-support/src/trackerd/tracker-xesam-session.c
   branches/xesam-support/src/trackerd/tracker-xesam-session.h

Modified: branches/xesam-support/src/trackerd/tracker-xesam-live-search.c
==============================================================================
--- branches/xesam-support/src/trackerd/tracker-xesam-live-search.c	(original)
+++ branches/xesam-support/src/trackerd/tracker-xesam-live-search.c	Thu Apr 24 12:00:59 2008
@@ -358,7 +358,7 @@
 tracker_xesam_live_search_new (const gchar *query_xml) 
 {
 	TrackerXesamLiveSearch * self;
-	self = g_object_newv (TRACKER_TYPE_SEARCH, 0, NULL);
+	self = g_object_newv (TRACKER_TYPE_XESAM_LIVE_SEARCH, 0, NULL);
 	return self;
 }
 

Modified: branches/xesam-support/src/trackerd/tracker-xesam-live-search.h
==============================================================================
--- branches/xesam-support/src/trackerd/tracker-xesam-live-search.h	(original)
+++ branches/xesam-support/src/trackerd/tracker-xesam-live-search.h	Thu Apr 24 12:00:59 2008
@@ -28,12 +28,12 @@
 G_BEGIN_DECLS
 
 
-#define TRACKER_TYPE_SEARCH (tracker_xesam_live_search_get_type ())
-#define TRACKER_XESAM_LIVE_SEARCH(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TRACKER_TYPE_SEARCH, TrackerXesamLiveSearch))
-#define TRACKER_XESAM_LIVE_SEARCH_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TRACKER_TYPE_SEARCH, TrackerXesamLiveSearchClass))
-#define TRACKER_IS_SEARCH(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TRACKER_TYPE_SEARCH))
-#define TRACKER_IS_SEARCH_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TRACKER_TYPE_SEARCH))
-#define TRACKER_XESAM_LIVE_SEARCH_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TRACKER_TYPE_SEARCH, TrackerXesamLiveSearchClass))
+#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))
+#define TRACKER_IS_XESAM_LIVE_SEARCH(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TRACKER_TYPE_XESAM_LIVE_SEARCH))
+#define TRACKER_IS_XESAM_LIVE_SEARCH_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TRACKER_TYPE_XESAM_LIVE_SEARCH))
+#define TRACKER_XESAM_LIVE_SEARCH_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TRACKER_TYPE_XESAM_LIVE_SEARCH, TrackerXesamLiveSearchClass))
 
 typedef struct _TrackerXesamLiveSearch TrackerXesamLiveSearch;
 typedef struct _TrackerXesamLiveSearchClass TrackerXesamLiveSearchClass;

Modified: branches/xesam-support/src/trackerd/tracker-xesam-session.c
==============================================================================
--- branches/xesam-support/src/trackerd/tracker-xesam-session.c	(original)
+++ branches/xesam-support/src/trackerd/tracker-xesam-session.c	Thu Apr 24 12:00:59 2008
@@ -140,7 +140,6 @@
 void 
 tracker_xesam_session_set_property (TrackerXesamSession *self, const gchar *prop, const gchar *val, gchar **new_val, GError **error) 
 {
-	g_return_if_fail (TRACKER_IS_SESSION (self));
 	if (new_val)
 		*new_val = g_strdup (val);
 }
@@ -162,7 +161,6 @@
 void
 tracker_xesam_session_get_property (TrackerXesamSession *self, const gchar *prop, gchar **value, GError **error) 
 {
-	g_return_if_fail (TRACKER_IS_SESSION (self));
 	if (value)
 		*value = g_strdup ("");
 	return;
@@ -192,8 +190,6 @@
 	TrackerXesamLiveSearch *search;
 	TrackerXesamSessionPriv *priv = self->priv;
 
-	g_return_val_if_fail (TRACKER_IS_SESSION (self), NULL);
-
 	// todo: parse the query and pass the parsed query or error
 
 	search = tracker_xesam_live_search_new (query_xml);
@@ -240,7 +236,7 @@
 TrackerXesamSession* 
 tracker_xesam_session_new (void) 
 {
-	return g_object_newv (TRACKER_TYPE_SESSION, 0, NULL);
+	return g_object_newv (TRACKER_TYPE_XESAM_SESSION, 0, NULL);
 }
 
 

Modified: branches/xesam-support/src/trackerd/tracker-xesam-session.h
==============================================================================
--- branches/xesam-support/src/trackerd/tracker-xesam-session.h	(original)
+++ branches/xesam-support/src/trackerd/tracker-xesam-session.h	Thu Apr 24 12:00:59 2008
@@ -33,12 +33,12 @@
 G_BEGIN_DECLS
 
 
-#define TRACKER_TYPE_SESSION (tracker_xesam_session_get_type ())
-#define TRACKER_XESAM_SESSION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TRACKER_TYPE_SESSION, TrackerXesamSession))
-#define TRACKER_XESAM_SESSION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TRACKER_TYPE_SESSION, TrackerXesamSessionClass))
-#define TRACKER_IS_SESSION(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TRACKER_TYPE_SESSION))
-#define TRACKER_IS_SESSION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TRACKER_TYPE_SESSION))
-#define TRACKER_XESAM_SESSION_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TRACKER_TYPE_SESSION, TrackerXesamSessionClass))
+#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))
+#define TRACKER_IS_XESAM_SESSION(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TRACKER_TYPE_XESAM_SESSION))
+#define TRACKER_IS_XESAM_SESSION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TRACKER_TYPE_XESAM_SESSION))
+#define TRACKER_XESAM_SESSION_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TRACKER_TYPE_XESAM_SESSION, TrackerXesamSessionClass))
 
 typedef struct _TrackerXesamSession TrackerXesamSession;
 typedef struct _TrackerXesamSessionClass TrackerXesamSessionClass;