tracker r1283 - in branches/indexer-split: . src/libtracker

[mr svn gnome org]

Author: mr
Date: Mon Apr 21 13:53:01 2008
New Revision: 1283
URL: http://svn.gnome.org/viewvc/tracker?rev=1283&view=rev

Log:
	* src/libtracker/tracker.[ch]: Fixed some left over issues from
	the DBus patch which were caused by left over cruft in
	$prefix/include.


Modified:
   branches/indexer-split/ChangeLog
   branches/indexer-split/src/libtracker/tracker.c
   branches/indexer-split/src/libtracker/tracker.h

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 21 13:53:01 2008
@@ -17,7 +17,6 @@
  * Boston, MA  02110-1301, USA.
  */
 
-#include "tracker.h"
 #include <string.h>
 
 #include "tracker-dbus-daemon-glue.h"
@@ -26,6 +25,8 @@
 #include "tracker-dbus-metadata-glue.h"
 #include "tracker-dbus-search-glue.h"
 
+#include "tracker.h"
+
 #define TRACKER_SERVICE                 "org.freedesktop.Tracker"
 #define TRACKER_OBJECT			"/org/freedesktop/Tracker"
 #define TRACKER_INTERFACE		"org.freedesktop.Tracker"
@@ -494,7 +495,7 @@
 {
 	char **array = NULL;
 
-	if (!org_freedesktop_Tracker_Metadata_get_writeable_types  (client->proxy_metadata, class, &array, &*error)) {
+	if (!org_freedesktop_Tracker_Metadata_get_writable_types  (client->proxy_metadata, class, &array, &*error)) {
 		return NULL;
 	}
 
@@ -834,49 +835,6 @@
 	
 }
 
-
-char **
-tracker_search_metadata_by_text_and_mime (TrackerClient *client, const char *query, const char **mimes, GError **error)
-{
-	char **strs;
-
-	if (!org_freedesktop_Tracker_Files_search_by_text_and_mime  (client->proxy_files, query,(const char **) mimes, &strs, &*error)) {
-		return NULL;
-	}
-	return strs;
-
-}
-
-
-char **
-tracker_search_metadata_by_text_and_mime_and_location (TrackerClient *client, const char *query, const char **mimes, const char *location, GError **error)
-{
-	char **strs;
-
-	if (!org_freedesktop_Tracker_Files_search_by_text_and_mime_and_location (client->proxy_files, query, (const char **)mimes, location, &strs, &*error)) {
-		return NULL;
-	}
-	return strs;
-
-}
-
-
-
-char **
-tracker_search_metadata_by_text_and_location (TrackerClient *client, const char *query, const char *location, GError **error)
-{
-	char **strs;
-
-	if (!org_freedesktop_Tracker_Files_search_by_text_and_location (client->proxy_files, query, location, &strs, &*error)) {
-		return NULL;
-	}
-	return strs;
-
-}
-
-
-
-
 /* asynchronous calls */
 
 
@@ -1083,7 +1041,7 @@
 	callback_struct->data = user_data;
 
 
-	client->last_pending_call = org_freedesktop_Tracker_Metadata_get_writeable_types_async  (client->proxy_metadata, class, tracker_array_reply, callback_struct);
+	client->last_pending_call = org_freedesktop_Tracker_Metadata_get_writable_types_async  (client->proxy_metadata, class, tracker_array_reply, callback_struct);
 
 }
 
@@ -1500,47 +1458,4 @@
 }
 
 
-void
-tracker_search_metadata_by_text_and_mime_async (TrackerClient *client, const char *query, const char **mimes, TrackerArrayReply callback, gpointer user_data)
-{
-	ArrayCallBackStruct *callback_struct;
-
-	callback_struct = g_new (ArrayCallBackStruct, 1);
-	callback_struct->callback = callback;
-	callback_struct->data = user_data;	
-
-	client->last_pending_call = org_freedesktop_Tracker_Files_search_by_text_and_mime_async  (client->proxy_files, query,(const char **) mimes,  tracker_array_reply, callback_struct);
-	
-}
-
-
-void
-tracker_search_metadata_by_text_and_mime_and_location_async (TrackerClient *client, const char *query, const char **mimes, const char *location, TrackerArrayReply callback, gpointer user_data)
-{
-	ArrayCallBackStruct *callback_struct;
-
-	callback_struct = g_new (ArrayCallBackStruct, 1);
-	callback_struct->callback = callback;
-	callback_struct->data = user_data;	
-
-	client->last_pending_call = org_freedesktop_Tracker_Files_search_by_text_and_mime_and_location_async (client->proxy_files, query, (const char **)mimes, location,  tracker_array_reply, callback_struct);
-	
-}
-
-
-
-void
-tracker_search_metadata_by_text_and_location_async (TrackerClient *client, const char *query, const char *location, TrackerArrayReply callback, gpointer user_data)
-{
-	ArrayCallBackStruct *callback_struct;
-
-	callback_struct = g_new (ArrayCallBackStruct, 1);
-	callback_struct->callback = callback;
-	callback_struct->data = user_data;	
-
-	client->last_pending_call = org_freedesktop_Tracker_Files_search_by_text_and_location_async (client->proxy_files, query, location,  tracker_array_reply, callback_struct);
-	
-}
-
-
 

Modified: branches/indexer-split/src/libtracker/tracker.h
==============================================================================
--- branches/indexer-split/src/libtracker/tracker.h	(original)
+++ branches/indexer-split/src/libtracker/tracker.h	Mon Apr 21 13:53:01 2008
@@ -20,10 +20,12 @@
 #ifndef TRACKER_H
 #define TRACKER_H
 
-#include "tracker-client.h"
-
 G_BEGIN_DECLS
 
+#include <dbus/dbus.h> 
+#include <dbus/dbus-glib-lowlevel.h> 
+#include <dbus/dbus-glib.h> 
+
 typedef void (*TrackerArrayReply) (char **result, GError *error, gpointer user_data);
 typedef void (*TrackerHashTableReply) (GHashTable *result, GError *error, gpointer user_data);
 typedef void (*TrackerGPtrArrayReply) (GPtrArray *result, GError *error, gpointer user_data);