Index: ChangeLog =================================================================== --- ChangeLog (revision 1962) +++ ChangeLog (working copy) @@ -1,3 +1,16 @@ +2008-07-31 Philip Van Hoof + + * src/libtracker/vala: + * src/libtracker/vala/Makefile.am: + * src/libtracker/vala/tracker.gi: + * src/libtracker/vala/tracker.vapi: + * src/libtracker/vala/tracker.deps: + * src/libtracker/vala/regenerate.sh: + * src/libtracker/Makefile.am: + * configure.ac: + + Added a Vala binding for libtrackerclient + 2008-07-29 Carlos Garnacho * src/libtracker-common/tracker-ontology.c Index: src/libtracker/tracker.h =================================================================== --- src/libtracker/tracker.h (revision 1962) +++ src/libtracker/tracker.h (working copy) @@ -26,7 +26,7 @@ G_BEGIN_DECLS #include #include -typedef void (*TrackerArrayReply) (char **result, GError *error, gpointer user_data); +typedef void (*TrackerArrayReply) (GStrv 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); typedef void (*TrackerBooleanReply) (gboolean result, GError *error, gpointer user_data); @@ -120,30 +120,30 @@ void tracker_set_int_option (Tracker void tracker_shutdown (TrackerClient *client, gboolean reindex, GError **error); void tracker_prompt_index_signals (TrackerClient *client, GError **error); -char ** tracker_metadata_get (TrackerClient *client, ServiceType service, const char *id, char **keys, GError **error); -void tracker_metadata_set (TrackerClient *client, ServiceType service, const char *id, char **keys, char **values, GError **error); +GStrv tracker_metadata_get (TrackerClient *client, ServiceType service, const char *id, GStrv keys, GError **error); +void tracker_metadata_set (TrackerClient *client, ServiceType service, const char *id, GStrv keys, GStrv values, GError **error); void tracker_metadata_register_type (TrackerClient *client, const char *name, MetadataTypes type, GError **error); MetaDataTypeDetails * tracker_metadata_get_type_details (TrackerClient *client, const char *name, GError **error); -char ** tracker_metadata_get_registered_types (TrackerClient *client, const char *classname, GError **error); -char ** tracker_metadata_get_writeable_types (TrackerClient *client, const char *classname, GError **error); -char ** tracker_metadata_get_registered_classes (TrackerClient *client, GError **error); +GStrv tracker_metadata_get_registered_types (TrackerClient *client, const char *classname, GError **error); +GStrv tracker_metadata_get_writeable_types (TrackerClient *client, const char *classname, GError **error); +GStrv tracker_metadata_get_registered_classes (TrackerClient *client, GError **error); GPtrArray * tracker_keywords_get_list (TrackerClient *client, ServiceType service, GError **error); -char ** tracker_keywords_get (TrackerClient *client, ServiceType service, const char *id, GError **error); -void tracker_keywords_add (TrackerClient *client, ServiceType service, const char *id, char **values, GError **error); -void tracker_keywords_remove (TrackerClient *client, ServiceType service, const char *id, char **values, GError **error); +GStrv tracker_keywords_get (TrackerClient *client, ServiceType service, const char *id, GError **error); +void tracker_keywords_add (TrackerClient *client, ServiceType service, const char *id, GStrv values, GError **error); +void tracker_keywords_remove (TrackerClient *client, ServiceType service, const char *id, GStrv values, GError **error); void tracker_keywords_remove_all (TrackerClient *client, ServiceType service, const char *id, GError **error); -char ** tracker_keywords_search (TrackerClient *client, int live_query_id, ServiceType service, char **keywords, int offset, int max_hits, GError **error); +GStrv tracker_keywords_search (TrackerClient *client, int live_query_id, ServiceType service, GStrv keywords, int offset, int max_hits, GError **error); int tracker_search_get_hit_count (TrackerClient *client, ServiceType service, const char *search_text, GError **error); GPtrArray * tracker_search_get_hit_count_all (TrackerClient *client, const char *search_text, GError **error); -char ** tracker_search_text (TrackerClient *client, int live_query_id, ServiceType service, const char *search_text, int offset, int max_hits, GError **error); +GStrv tracker_search_text (TrackerClient *client, int live_query_id, ServiceType service, const char *search_text, int offset, int max_hits, GError **error); GPtrArray * tracker_search_text_detailed (TrackerClient *client, int live_query_id, ServiceType service, const char *search_text, int offset, int max_hits, GError **error); char * tracker_search_get_snippet (TrackerClient *client, ServiceType service, const char *uri, const char *search_text, GError **error); -char ** tracker_search_metadata (TrackerClient *client, ServiceType service, const char *field, const char* search_text, int offset, int max_hits, GError **error); -GPtrArray * tracker_search_query (TrackerClient *client, int live_query_id, ServiceType service, char **fields, const char *search_text, const char *keywords, const char *query, int offset, int max_hits, gboolean sort_by_service, GError **error); +GStrv tracker_search_metadata (TrackerClient *client, ServiceType service, const char *field, const char* search_text, int offset, int max_hits, GError **error); +GPtrArray * tracker_search_query (TrackerClient *client, int live_query_id, ServiceType service, GStrv fields, const char *search_text, const char *keywords, const char *query, int offset, int max_hits, gboolean sort_by_service, GError **error); gchar * tracker_search_suggest (TrackerClient *client, const char *search_text, int maxdist, GError **error); @@ -151,19 +151,19 @@ void tracker_files_create (TrackerCl void tracker_files_delete (TrackerClient *client, const char *uri, GError **error); char * tracker_files_get_text_contents (TrackerClient *client, const char *uri, int offset, int max_length, GError **error); char * tracker_files_search_text_contents (TrackerClient *client, const char *uri, const char *search_text, int length, GError **error); -char ** tracker_files_get_by_service_type (TrackerClient *client, int live_query_id, ServiceType service, int offset, int max_hits, GError **error); -char ** tracker_files_get_by_mime_type (TrackerClient *client, int live_query_id, char **mimes, int offset, int max_hits, GError **error); -char ** tracker_files_get_by_mime_type_vfs (TrackerClient *client, int live_query_id, char **mimes, int offset, int max_hits, GError **error); +GStrv tracker_files_get_by_service_type (TrackerClient *client, int live_query_id, ServiceType service, int offset, int max_hits, GError **error); +GStrv tracker_files_get_by_mime_type (TrackerClient *client, int live_query_id, GStrv mimes, int offset, int max_hits, GError **error); +GStrv tracker_files_get_by_mime_type_vfs (TrackerClient *client, int live_query_id, GStrv mimes, int offset, int max_hits, GError **error); int tracker_files_get_mtime (TrackerClient *client, const char *uri, GError **error); -GPtrArray * tracker_files_get_metadata_for_files_in_folder (TrackerClient *client, int live_query_id, const char *uri, char **fields, GError **error); +GPtrArray * tracker_files_get_metadata_for_files_in_folder (TrackerClient *client, int live_query_id, const char *uri, GStrv fields, GError **error); /* Deprecated calls - Following API specific for nautilus search use only */ -char ** tracker_search_metadata_by_text (TrackerClient *client, const char *query, GError **error); -char ** tracker_search_metadata_by_text_and_mime (TrackerClient *client, const char *query, const char **mimes, GError **error); -char ** tracker_search_metadata_by_text_and_mime_and_location (TrackerClient *client, const char *query, const char **mimes, const char *location, GError **error); -char ** tracker_search_metadata_by_text_and_location (TrackerClient *client, const char *query, const char *location, GError **error); +GStrv tracker_search_metadata_by_text (TrackerClient *client, const char *query, GError **error); +GStrv tracker_search_metadata_by_text_and_mime (TrackerClient *client, const char *query, const GStrv mimes, GError **error); +GStrv tracker_search_metadata_by_text_and_mime_and_location (TrackerClient *client, const char *query, const GStrv mimes, const char *location, GError **error); +GStrv tracker_search_metadata_by_text_and_location (TrackerClient *client, const char *query, const char *location, GError **error); /* end deprecated call list */ @@ -180,8 +180,8 @@ void tracker_set_int_option_async (T void tracker_shutdown_async (TrackerClient *client, gboolean reindex, TrackerVoidReply callback, gpointer user_data); void tracker_prompt_index_signals_async (TrackerClient *client, TrackerVoidReply callback, gpointer user_data); -void tracker_metadata_get_async (TrackerClient *client, ServiceType service, const char *id, char **keys, TrackerArrayReply callback, gpointer user_data); -void tracker_metadata_set_async (TrackerClient *client, ServiceType service, const char *id, char **keys, char **values, TrackerVoidReply callback, gpointer user_data); +void tracker_metadata_get_async (TrackerClient *client, ServiceType service, const char *id, GStrv keys, TrackerArrayReply callback, gpointer user_data); +void tracker_metadata_set_async (TrackerClient *client, ServiceType service, const char *id, GStrv keys, GStrv values, TrackerVoidReply callback, gpointer user_data); void tracker_metadata_register_type_async (TrackerClient *client, const char *name, MetadataTypes type, TrackerVoidReply callback, gpointer user_data); void tracker_metadata_get_registered_types_async (TrackerClient *client, const char *classname, TrackerArrayReply callback, gpointer user_data); void tracker_metadata_get_writeable_types_async (TrackerClient *client, const char *classname, TrackerArrayReply callback, gpointer user_data); @@ -190,10 +190,10 @@ void tracker_metadata_get_registered_cl void tracker_keywords_get_list_async (TrackerClient *client, ServiceType service, TrackerGPtrArrayReply callback, gpointer user_data); void tracker_keywords_get_async (TrackerClient *client, ServiceType service, const char *id, TrackerArrayReply callback, gpointer user_data); -void tracker_keywords_add_async (TrackerClient *client, ServiceType service, const char *id, char **values, TrackerVoidReply callback, gpointer user_data); -void tracker_keywords_remove_async (TrackerClient *client, ServiceType service, const char *id, char **values, TrackerVoidReply callback, gpointer user_data); +void tracker_keywords_add_async (TrackerClient *client, ServiceType service, const char *id, GStrv values, TrackerVoidReply callback, gpointer user_data); +void tracker_keywords_remove_async (TrackerClient *client, ServiceType service, const char *id, GStrv values, TrackerVoidReply callback, gpointer user_data); void tracker_keywords_remove_all_async (TrackerClient *client, ServiceType service, const char *id, TrackerVoidReply callback, gpointer user_data); -void tracker_keywords_search_async (TrackerClient *client, int live_query_id, ServiceType service, char **keywords, int offset, int max_hits, TrackerArrayReply callback, gpointer user_data); +void tracker_keywords_search_async (TrackerClient *client, int live_query_id, ServiceType service, GStrv keywords, int offset, int max_hits, TrackerArrayReply callback, gpointer user_data); void tracker_search_text_get_hit_count_async (TrackerClient *client, ServiceType service, const char *search_text, TrackerIntReply callback, gpointer user_data); void tracker_search_text_get_hit_count_all_async (TrackerClient *client, const char *search_text, TrackerGPtrArrayReply callback, gpointer user_data); @@ -201,7 +201,7 @@ void tracker_search_text_async (Tra void tracker_search_text_detailed_async (TrackerClient *client, int live_query_id, ServiceType service, const char *search_text, int offset, int max_hits, TrackerGPtrArrayReply callback, gpointer user_data); void tracker_search_get_snippet_async (TrackerClient *client, ServiceType service, const char *uri, const char *search_text, TrackerStringReply callback, gpointer user_data); void tracker_search_metadata_async (TrackerClient *client, ServiceType service, const char *field, const char* search_text, int offset, int max_hits, TrackerArrayReply callback, gpointer user_data); -void tracker_search_query_async (TrackerClient *client, int live_query_id, ServiceType service, char **fields, const char *search_text, const char *keywords, const char *query, int offset, int max_hits, gboolean sort_by_service, TrackerGPtrArrayReply callback, gpointer user_data); +void tracker_search_query_async (TrackerClient *client, int live_query_id, ServiceType service, GStrv fields, const char *search_text, const char *keywords, const char *query, int offset, int max_hits, gboolean sort_by_service, TrackerGPtrArrayReply callback, gpointer user_data); void tracker_search_suggest_async (TrackerClient *client, const char *search_text, int maxdist, TrackerStringReply callback, gpointer user_data); void tracker_files_create_async (TrackerClient *client, const char *uri, gboolean is_directory, const char *mime, int size, int mtime, TrackerVoidReply callback, gpointer user_data); @@ -209,19 +209,19 @@ void tracker_files_delete_async (Tr void tracker_files_get_text_contents_async (TrackerClient *client, const char *uri, int offset, int max_length, TrackerStringReply callback, gpointer user_data); void tracker_files_search_text_contents_async (TrackerClient *client, const char *uri, const char *search_text, int length, TrackerStringReply callback, gpointer user_data); void tracker_files_get_by_service_type_async (TrackerClient *client, int live_query_id, ServiceType service, int offset, int max_hits, TrackerArrayReply callback, gpointer user_data); -void tracker_files_get_by_mime_type_async (TrackerClient *client, int live_query_id, char **mimes, int offset, int max_hits, TrackerArrayReply callback, gpointer user_data); -void tracker_files_get_by_mime_type_vfs_async (TrackerClient *client, int live_query_id, char **mimes, int offset, int max_hits, TrackerArrayReply callback, gpointer user_data); +void tracker_files_get_by_mime_type_async (TrackerClient *client, int live_query_id, GStrv mimes, int offset, int max_hits, TrackerArrayReply callback, gpointer user_data); +void tracker_files_get_by_mime_type_vfs_async (TrackerClient *client, int live_query_id, GStrv mimes, int offset, int max_hits, TrackerArrayReply callback, gpointer user_data); void tracker_files_get_mtime_async (TrackerClient *client, const char *uri, TrackerIntReply callback, gpointer user_data); -void tracker_files_get_metadata_for_files_in_folder_async (TrackerClient *client, int live_query_id, const char *uri, char **fields, TrackerGPtrArrayReply callback, gpointer user_data); +void tracker_files_get_metadata_for_files_in_folder_async (TrackerClient *client, int live_query_id, const char *uri, GStrv fields, TrackerGPtrArrayReply callback, gpointer user_data); /* Deprecated calls - API specific for nautilus search use only. New code should use tracker_search_metadata_matching_text_async instead */ void tracker_search_metadata_by_text_async (TrackerClient *client, const char *query, TrackerArrayReply callback, gpointer user_data); -void tracker_search_metadata_by_text_and_mime_async (TrackerClient *client, const char *query, const char **mimes, TrackerArrayReply callback, gpointer user_data); -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); +void tracker_search_metadata_by_text_and_mime_async (TrackerClient *client, const char *query, const GStrv mimes, TrackerArrayReply callback, gpointer user_data); +void tracker_search_metadata_by_text_and_mime_and_location_async (TrackerClient *client, const char *query, const GStrv mimes, const char *location, TrackerArrayReply callback, gpointer user_data); void tracker_search_metadata_by_text_and_location_async (TrackerClient *client, const char *query, const char *location, TrackerArrayReply callback, gpointer user_data); G_END_DECLS Index: src/libtracker/vala/tracker.deps =================================================================== --- src/libtracker/vala/tracker.deps (revision 0) +++ src/libtracker/vala/tracker.deps (revision 0) @@ -0,0 +1 @@ +dbus-glib-1 Index: src/libtracker/vala/Makefile.am =================================================================== --- src/libtracker/vala/Makefile.am (revision 0) +++ src/libtracker/vala/Makefile.am (revision 0) @@ -0,0 +1,3 @@ +NULL = +vapidir = $(datadir)/vala/vapi +dist_vapi_DATA = tracker.vapi tracker.deps Index: src/libtracker/vala/tracker.gi =================================================================== --- src/libtracker/vala/tracker.gi (revision 0) +++ src/libtracker/vala/tracker.gi (revision 0) @@ -0,0 +1,965 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: src/libtracker/vala/tracker.vapi =================================================================== --- src/libtracker/vala/tracker.vapi (revision 0) +++ src/libtracker/vala/tracker.vapi (revision 0) @@ -0,0 +1,251 @@ +/* tracker.vapi generated by vapigen, do not modify. */ + +[CCode (cprefix = "Tracker", lower_case_cprefix = "tracker_")] +namespace Tracker { + [CCode (cprefix = "METADATA_", has_type_id = "0", cheader_filename = "tracker.h")] + public enum MetadataTypes { + STRING_INDEXABLE, + STRING, + NUMERIC, + DATE + } + [CCode (cprefix = "SERVICE_", has_type_id = "0", cheader_filename = "tracker.h")] + public enum ServiceType { + FILES, + FOLDERS, + DOCUMENTS, + IMAGES, + MUSIC, + VIDEOS, + TEXT_FILES, + DEVELOPMENT_FILES, + OTHER_FILES, + VFS_FILES, + VFS_FOLDERS, + VFS_DOCUMENTS, + VFS_IMAGES, + VFS_MUSIC, + VFS_VIDEOS, + VFS_TEXT_FILES, + VFS_DEVELOPMENT_FILES, + VFS_OTHER_FILES, + CONVERSATIONS, + PLAYLISTS, + APPLICATIONS, + CONTACTS, + EMAILS, + EMAILATTACHMENTS, + APPOINTMENTS, + TASKS, + BOOKMARKS, + WEBHISTORY, + PROJECTS + } + [Compact] + [CCode (cheader_filename = "tracker.h")] + public class MetaDataTypeDetails { + public weak string type; + public bool is_embedded; + public bool is_writeable; + } + [Compact] + [CCode (cheader_filename = "tracker.h")] + public class Client { + public weak DBus.Object proxy; + public weak DBus.Object proxy_metadata; + public weak DBus.Object proxy_keywords; + public weak DBus.Object proxy_search; + public weak DBus.Object proxy_files; + public weak DBus.ProxyCall last_pending_call; + } + [CCode (cheader_filename = "tracker.h")] + public delegate void ArrayReply (string[] result, GLib.Error error); + [CCode (cheader_filename = "tracker.h")] + public delegate void BooleanReply (bool result, GLib.Error error); + [CCode (cheader_filename = "tracker.h")] + public delegate void GPtrArrayReply (GLib.PtrArray result, GLib.Error error); + [CCode (cheader_filename = "tracker.h")] + public delegate void HashTableReply (GLib.HashTable result, GLib.Error error); + [CCode (cheader_filename = "tracker.h")] + public delegate void IntReply (int result, GLib.Error error); + [CCode (cheader_filename = "tracker.h")] + public delegate void StringReply (string result, GLib.Error error); + [CCode (cheader_filename = "tracker.h")] + public delegate void VoidReply (GLib.Error error); + [CCode (cheader_filename = "tracker.h")] + public static void cancel_last_call (Tracker.Client client); + [CCode (cheader_filename = "tracker.h")] + public static weak Tracker.Client connect (bool enable_warnings); + [CCode (cheader_filename = "tracker.h")] + public static void disconnect (Tracker.Client client); + [CCode (cheader_filename = "tracker.h")] + public static void files_create (Tracker.Client client, string uri, bool is_directory, string mime, int size, int mtime) throws GLib.Error; + [CCode (cheader_filename = "tracker.h")] + public static void files_create_async (Tracker.Client client, string uri, bool is_directory, string mime, int size, int mtime, Tracker.VoidReply callback); + [CCode (cheader_filename = "tracker.h")] + public static void files_delete (Tracker.Client client, string uri) throws GLib.Error; + [CCode (cheader_filename = "tracker.h")] + public static void files_delete_async (Tracker.Client client, string uri, Tracker.VoidReply callback); + [CCode (cheader_filename = "tracker.h")] + public static weak string[] files_get_by_mime_type (Tracker.Client client, int live_query_id, string[] mimes, int offset, int max_hits) throws GLib.Error; + [CCode (cheader_filename = "tracker.h")] + public static void files_get_by_mime_type_async (Tracker.Client client, int live_query_id, string[] mimes, int offset, int max_hits, Tracker.ArrayReply callback); + [CCode (cheader_filename = "tracker.h")] + public static weak string[] files_get_by_mime_type_vfs (Tracker.Client client, int live_query_id, string[] mimes, int offset, int max_hits) throws GLib.Error; + [CCode (cheader_filename = "tracker.h")] + public static void files_get_by_mime_type_vfs_async (Tracker.Client client, int live_query_id, string[] mimes, int offset, int max_hits, Tracker.ArrayReply callback); + [CCode (cheader_filename = "tracker.h")] + public static weak string[] files_get_by_service_type (Tracker.Client client, int live_query_id, Tracker.ServiceType service, int offset, int max_hits) throws GLib.Error; + [CCode (cheader_filename = "tracker.h")] + public static void files_get_by_service_type_async (Tracker.Client client, int live_query_id, Tracker.ServiceType service, int offset, int max_hits, Tracker.ArrayReply callback); + [CCode (cheader_filename = "tracker.h")] + public static weak GLib.PtrArray files_get_metadata_for_files_in_folder (Tracker.Client client, int live_query_id, string uri, string[] fields) throws GLib.Error; + [CCode (cheader_filename = "tracker.h")] + public static void files_get_metadata_for_files_in_folder_async (Tracker.Client client, int live_query_id, string uri, string[] fields, Tracker.GPtrArrayReply callback); + [CCode (cheader_filename = "tracker.h")] + public static int files_get_mtime (Tracker.Client client, string uri) throws GLib.Error; + [CCode (cheader_filename = "tracker.h")] + public static void files_get_mtime_async (Tracker.Client client, string uri, Tracker.IntReply callback); + [CCode (cheader_filename = "tracker.h")] + public static weak string files_get_text_contents (Tracker.Client client, string uri, int offset, int max_length) throws GLib.Error; + [CCode (cheader_filename = "tracker.h")] + public static void files_get_text_contents_async (Tracker.Client client, string uri, int offset, int max_length, Tracker.StringReply callback); + [CCode (cheader_filename = "tracker.h")] + public static weak string files_search_text_contents (Tracker.Client client, string uri, string search_text, int length) throws GLib.Error; + [CCode (cheader_filename = "tracker.h")] + public static void files_search_text_contents_async (Tracker.Client client, string uri, string search_text, int length, Tracker.StringReply callback); + [CCode (cheader_filename = "tracker.h")] + public static weak GLib.HashTable get_services (Tracker.Client client, bool main_services_only) throws GLib.Error; + [CCode (cheader_filename = "tracker.h")] + public static void get_services_async (Tracker.Client client, bool main_services_only, Tracker.HashTableReply callback); + [CCode (cheader_filename = "tracker.h")] + public static weak GLib.PtrArray get_stats (Tracker.Client client) throws GLib.Error; + [CCode (cheader_filename = "tracker.h")] + public static void get_stats_async (Tracker.Client client, Tracker.GPtrArrayReply callback); + [CCode (cheader_filename = "tracker.h")] + public static weak string get_status (Tracker.Client client) throws GLib.Error; + [CCode (cheader_filename = "tracker.h")] + public static void get_status_async (Tracker.Client client, Tracker.StringReply callback); + [CCode (cheader_filename = "tracker.h")] + public static int get_version (Tracker.Client client) throws GLib.Error; + [CCode (cheader_filename = "tracker.h")] + public static void get_version_async (Tracker.Client client, Tracker.IntReply callback); + [CCode (cheader_filename = "tracker.h")] + public static void keywords_add (Tracker.Client client, Tracker.ServiceType service, string id, string[] values) throws GLib.Error; + [CCode (cheader_filename = "tracker.h")] + public static void keywords_add_async (Tracker.Client client, Tracker.ServiceType service, string id, string[] values, Tracker.VoidReply callback); + [CCode (cheader_filename = "tracker.h")] + public static weak string[] keywords_get (Tracker.Client client, Tracker.ServiceType service, string id) throws GLib.Error; + [CCode (cheader_filename = "tracker.h")] + public static void keywords_get_async (Tracker.Client client, Tracker.ServiceType service, string id, Tracker.ArrayReply callback); + [CCode (cheader_filename = "tracker.h")] + public static weak GLib.PtrArray keywords_get_list (Tracker.Client client, Tracker.ServiceType service) throws GLib.Error; + [CCode (cheader_filename = "tracker.h")] + public static void keywords_get_list_async (Tracker.Client client, Tracker.ServiceType service, Tracker.GPtrArrayReply callback); + [CCode (cheader_filename = "tracker.h")] + public static void keywords_remove (Tracker.Client client, Tracker.ServiceType service, string id, string[] values) throws GLib.Error; + [CCode (cheader_filename = "tracker.h")] + public static void keywords_remove_all (Tracker.Client client, Tracker.ServiceType service, string id) throws GLib.Error; + [CCode (cheader_filename = "tracker.h")] + public static void keywords_remove_all_async (Tracker.Client client, Tracker.ServiceType service, string id, Tracker.VoidReply callback); + [CCode (cheader_filename = "tracker.h")] + public static void keywords_remove_async (Tracker.Client client, Tracker.ServiceType service, string id, string[] values, Tracker.VoidReply callback); + [CCode (cheader_filename = "tracker.h")] + public static weak string[] keywords_search (Tracker.Client client, int live_query_id, Tracker.ServiceType service, string[] keywords, int offset, int max_hits) throws GLib.Error; + [CCode (cheader_filename = "tracker.h")] + public static void keywords_search_async (Tracker.Client client, int live_query_id, Tracker.ServiceType service, string[] keywords, int offset, int max_hits, Tracker.ArrayReply callback); + [CCode (cheader_filename = "tracker.h")] + public static weak string[] metadata_get (Tracker.Client client, Tracker.ServiceType service, string id, string[] keys) throws GLib.Error; + [CCode (cheader_filename = "tracker.h")] + public static void metadata_get_async (Tracker.Client client, Tracker.ServiceType service, string id, string[] keys, Tracker.ArrayReply callback); + [CCode (cheader_filename = "tracker.h")] + public static weak string[] metadata_get_registered_classes (Tracker.Client client) throws GLib.Error; + [CCode (cheader_filename = "tracker.h")] + public static void metadata_get_registered_classes_async (Tracker.Client client, Tracker.ArrayReply callback); + [CCode (cheader_filename = "tracker.h")] + public static weak string[] metadata_get_registered_types (Tracker.Client client, string classname) throws GLib.Error; + [CCode (cheader_filename = "tracker.h")] + public static void metadata_get_registered_types_async (Tracker.Client client, string classname, Tracker.ArrayReply callback); + [CCode (cheader_filename = "tracker.h")] + public static weak Tracker.MetaDataTypeDetails metadata_get_type_details (Tracker.Client client, string name) throws GLib.Error; + [CCode (cheader_filename = "tracker.h")] + public static weak string[] metadata_get_writeable_types (Tracker.Client client, string classname) throws GLib.Error; + [CCode (cheader_filename = "tracker.h")] + public static void metadata_get_writeable_types_async (Tracker.Client client, string classname, Tracker.ArrayReply callback); + [CCode (cheader_filename = "tracker.h")] + public static void metadata_register_type (Tracker.Client client, string name, Tracker.MetadataTypes type) throws GLib.Error; + [CCode (cheader_filename = "tracker.h")] + public static void metadata_register_type_async (Tracker.Client client, string name, Tracker.MetadataTypes type, Tracker.VoidReply callback); + [CCode (cheader_filename = "tracker.h")] + public static void metadata_set (Tracker.Client client, Tracker.ServiceType service, string id, string[] keys, string[] values) throws GLib.Error; + [CCode (cheader_filename = "tracker.h")] + public static void metadata_set_async (Tracker.Client client, Tracker.ServiceType service, string id, string[] keys, string[] values, Tracker.VoidReply callback); + [CCode (cheader_filename = "tracker.h")] + public static void prompt_index_signals (Tracker.Client client) throws GLib.Error; + [CCode (cheader_filename = "tracker.h")] + public static void prompt_index_signals_async (Tracker.Client client, Tracker.VoidReply callback); + [CCode (cheader_filename = "tracker.h")] + public static int search_get_hit_count (Tracker.Client client, Tracker.ServiceType service, string search_text) throws GLib.Error; + [CCode (cheader_filename = "tracker.h")] + public static weak GLib.PtrArray search_get_hit_count_all (Tracker.Client client, string search_text) throws GLib.Error; + [CCode (cheader_filename = "tracker.h")] + public static weak string search_get_snippet (Tracker.Client client, Tracker.ServiceType service, string uri, string search_text) throws GLib.Error; + [CCode (cheader_filename = "tracker.h")] + public static void search_get_snippet_async (Tracker.Client client, Tracker.ServiceType service, string uri, string search_text, Tracker.StringReply callback); + [CCode (cheader_filename = "tracker.h")] + public static weak string[] search_metadata (Tracker.Client client, Tracker.ServiceType service, string field, string search_text, int offset, int max_hits) throws GLib.Error; + [CCode (cheader_filename = "tracker.h")] + public static void search_metadata_async (Tracker.Client client, Tracker.ServiceType service, string field, string search_text, int offset, int max_hits, Tracker.ArrayReply callback); + [CCode (cheader_filename = "tracker.h")] + public static weak string[] search_metadata_by_text (Tracker.Client client, string query) throws GLib.Error; + [CCode (cheader_filename = "tracker.h")] + public static weak string[] search_metadata_by_text_and_location (Tracker.Client client, string query, string location) throws GLib.Error; + [CCode (cheader_filename = "tracker.h")] + public static void search_metadata_by_text_and_location_async (Tracker.Client client, string query, string location, Tracker.ArrayReply callback); + [CCode (cheader_filename = "tracker.h")] + public static weak string[] search_metadata_by_text_and_mime (Tracker.Client client, string query, string[] mimes) throws GLib.Error; + [CCode (cheader_filename = "tracker.h")] + public static weak string[] search_metadata_by_text_and_mime_and_location (Tracker.Client client, string query, string[] mimes, string location) throws GLib.Error; + [CCode (cheader_filename = "tracker.h")] + public static void search_metadata_by_text_and_mime_and_location_async (Tracker.Client client, string query, string[] mimes, string location, Tracker.ArrayReply callback); + [CCode (cheader_filename = "tracker.h")] + public static void search_metadata_by_text_and_mime_async (Tracker.Client client, string query, string[] mimes, Tracker.ArrayReply callback); + [CCode (cheader_filename = "tracker.h")] + public static void search_metadata_by_text_async (Tracker.Client client, string query, Tracker.ArrayReply callback); + [CCode (cheader_filename = "tracker.h")] + public static weak GLib.PtrArray search_query (Tracker.Client client, int live_query_id, Tracker.ServiceType service, string[] fields, string search_text, string keywords, string query, int offset, int max_hits, bool sort_by_service) throws GLib.Error; + [CCode (cheader_filename = "tracker.h")] + public static void search_query_async (Tracker.Client client, int live_query_id, Tracker.ServiceType service, string[] fields, string search_text, string keywords, string query, int offset, int max_hits, bool sort_by_service, Tracker.GPtrArrayReply callback); + [CCode (cheader_filename = "tracker.h")] + public static weak string search_suggest (Tracker.Client client, string search_text, int maxdist) throws GLib.Error; + [CCode (cheader_filename = "tracker.h")] + public static void search_suggest_async (Tracker.Client client, string search_text, int maxdist, Tracker.StringReply callback); + [CCode (cheader_filename = "tracker.h")] + public static weak string[] search_text (Tracker.Client client, int live_query_id, Tracker.ServiceType service, string search_text, int offset, int max_hits) throws GLib.Error; + [CCode (cheader_filename = "tracker.h")] + public static void search_text_async (Tracker.Client client, int live_query_id, Tracker.ServiceType service, string search_text, int offset, int max_hits, Tracker.ArrayReply callback); + [CCode (cheader_filename = "tracker.h")] + public static weak GLib.PtrArray search_text_detailed (Tracker.Client client, int live_query_id, Tracker.ServiceType service, string search_text, int offset, int max_hits) throws GLib.Error; + [CCode (cheader_filename = "tracker.h")] + public static void search_text_detailed_async (Tracker.Client client, int live_query_id, Tracker.ServiceType service, string search_text, int offset, int max_hits, Tracker.GPtrArrayReply callback); + [CCode (cheader_filename = "tracker.h")] + public static void search_text_get_hit_count_all_async (Tracker.Client client, string search_text, Tracker.GPtrArrayReply callback); + [CCode (cheader_filename = "tracker.h")] + public static void search_text_get_hit_count_async (Tracker.Client client, Tracker.ServiceType service, string search_text, Tracker.IntReply callback); + [CCode (cheader_filename = "tracker.h")] + public static Tracker.ServiceType service_name_to_type (string service); + [CCode (cheader_filename = "tracker.h")] + public static void set_bool_option (Tracker.Client client, string option, bool value) throws GLib.Error; + [CCode (cheader_filename = "tracker.h")] + public static void set_bool_option_async (Tracker.Client client, string option, bool value, Tracker.VoidReply callback); + [CCode (cheader_filename = "tracker.h")] + public static void set_int_option (Tracker.Client client, string option, int value) throws GLib.Error; + [CCode (cheader_filename = "tracker.h")] + public static void set_int_option_async (Tracker.Client client, string option, int value, Tracker.VoidReply callback); + [CCode (cheader_filename = "tracker.h")] + public static void shutdown (Tracker.Client client, bool reindex) throws GLib.Error; + [CCode (cheader_filename = "tracker.h")] + public static void shutdown_async (Tracker.Client client, bool reindex, Tracker.VoidReply callback); + [CCode (cheader_filename = "tracker.h")] + public static weak string type_to_service_name (Tracker.ServiceType s); +} Index: src/libtracker/vala/regenerate.sh =================================================================== --- src/libtracker/vala/regenerate.sh (revision 0) +++ src/libtracker/vala/regenerate.sh (revision 0) @@ -0,0 +1,5 @@ +#! /bin/sh + +VALA=/opt/vala +$VALA/lib/vala/gen-introspect --namespace=Tracker ../tracker.h `pkg-config gobject-2.0 dbus-glib-1 --cflags` -I.. -I../.. --shared-library=../.libs/libtrackerclient.so > tracker.gi +$VALA/bin/vapigen --pkg=dbus-glib-1 --library tracker tracker.gi Property changes on: src/libtracker/vala/regenerate.sh ___________________________________________________________________ Name: svn:executable + * Index: src/libtracker/Makefile.am =================================================================== --- src/libtracker/Makefile.am (revision 1962) +++ src/libtracker/Makefile.am (working copy) @@ -10,6 +10,8 @@ libs = \ $(DBUS_LIBS) \ $(GOBJECT_LIBS) +SUBDIRS = vala + # Libraries lib_LTLIBRARIES = libtrackerclient.la Index: src/libtracker/tracker.c =================================================================== --- src/libtracker/tracker.c (revision 1962) +++ src/libtracker/tracker.c (working copy) @@ -123,7 +123,7 @@ ServiceType tracker_service_name_to_type (const char *service) { - char **st; + GStrv st; int i = 0; for (st=tracker_service_types; *st; st++) { @@ -148,7 +148,7 @@ tracker_type_to_service_name (ServiceTyp static void -tracker_array_reply (DBusGProxy *proxy, char **OUT_result, GError *error, gpointer user_data) +tracker_array_reply (DBusGProxy *proxy, GStrv OUT_result, GError *error, gpointer user_data) { ArrayCallBackStruct *callback_struct; @@ -427,13 +427,13 @@ tracker_prompt_index_signals (TrackerCli -char ** -tracker_metadata_get (TrackerClient *client, ServiceType service, const char *id, char **keys, GError **error) +GStrv +tracker_metadata_get (TrackerClient *client, ServiceType service, const char *id, GStrv keys, GError **error) { - char **array = NULL; + GStrv array = NULL; char *service_str = tracker_service_types[service]; - if (!org_freedesktop_Tracker_Metadata_get (client->proxy_metadata, service_str, id, (const char **)keys, &array, &*error)) { + if (!org_freedesktop_Tracker_Metadata_get (client->proxy_metadata, service_str, id, (const GStrv )keys, &array, &*error)) { return NULL; } @@ -442,11 +442,11 @@ tracker_metadata_get (TrackerClient *cli void -tracker_metadata_set (TrackerClient *client, ServiceType service, const char *id, char **keys, char **values, GError **error) +tracker_metadata_set (TrackerClient *client, ServiceType service, const char *id, GStrv keys, GStrv values, GError **error) { char *service_str = tracker_service_types[service]; - org_freedesktop_Tracker_Metadata_set (client->proxy_metadata, service_str, id, (const char **)keys, (const char **)values, &*error); + org_freedesktop_Tracker_Metadata_set (client->proxy_metadata, service_str, id, (const GStrv )keys, (const GStrv )values, &*error); } @@ -475,10 +475,10 @@ tracker_metadata_get_type_details (Track } -char ** +GStrv tracker_metadata_get_registered_types (TrackerClient *client, const char *class, GError **error) { - char **array = NULL; + GStrv array = NULL; if (!org_freedesktop_Tracker_Metadata_get_registered_types (client->proxy_metadata, class, &array, &*error)) { return NULL; @@ -488,7 +488,7 @@ tracker_metadata_get_registered_types (T } -char ** +GStrv tracker_metadata_get_writeable_types (TrackerClient *client, const char *class, GError **error) { /* This does nothing now, this API has been removed */ @@ -499,10 +499,10 @@ tracker_metadata_get_writeable_types (Tr -char ** +GStrv tracker_metadata_get_registered_classes (TrackerClient *client, GError **error) { - char **array = NULL; + GStrv array = NULL; if (!org_freedesktop_Tracker_Metadata_get_registered_classes (client->proxy_metadata, &array, &*error)) { return NULL; @@ -532,10 +532,10 @@ tracker_keywords_get_list (TrackerClient } -char ** +GStrv tracker_keywords_get (TrackerClient *client, ServiceType service, const char *id, GError **error) { - char **array = NULL; + GStrv array = NULL; char *service_str = tracker_service_types[service]; if (!org_freedesktop_Tracker_Keywords_get (client->proxy_keywords, service_str, id, &array, &*error)) { @@ -548,20 +548,20 @@ tracker_keywords_get (TrackerClient *cli void -tracker_keywords_add (TrackerClient *client, ServiceType service, const char *id, char **values, GError **error) +tracker_keywords_add (TrackerClient *client, ServiceType service, const char *id, GStrv values, GError **error) { char *service_str = tracker_service_types[service]; - org_freedesktop_Tracker_Keywords_add (client->proxy_keywords, service_str, id, (const char **)values, &*error); + org_freedesktop_Tracker_Keywords_add (client->proxy_keywords, service_str, id, (const GStrv )values, &*error); } void -tracker_keywords_remove (TrackerClient *client, ServiceType service, const char *id, char **values, GError **error) +tracker_keywords_remove (TrackerClient *client, ServiceType service, const char *id, GStrv values, GError **error) { char *service_str = tracker_service_types[service]; - org_freedesktop_Tracker_Keywords_remove (client->proxy_keywords, service_str, id, (const char **)values, &*error); + org_freedesktop_Tracker_Keywords_remove (client->proxy_keywords, service_str, id, (const GStrv )values, &*error); } @@ -575,13 +575,13 @@ tracker_keywords_remove_all (TrackerClie } -char ** -tracker_keywords_search (TrackerClient *client, int live_query_id, ServiceType service, char **keywords, int offset, int max_hits, GError **error) +GStrv +tracker_keywords_search (TrackerClient *client, int live_query_id, ServiceType service, GStrv keywords, int offset, int max_hits, GError **error) { - char **array = NULL; + GStrv array = NULL; char *service_str = tracker_service_types[service]; - if (!org_freedesktop_Tracker_Keywords_search (client->proxy_keywords, live_query_id, service_str, (const char **)keywords, offset, max_hits, &array, &*error)) { + if (!org_freedesktop_Tracker_Keywords_search (client->proxy_keywords, live_query_id, service_str, (const GStrv )keywords, offset, max_hits, &array, &*error)) { return NULL; } @@ -620,10 +620,10 @@ tracker_search_get_hit_count_all (Tracke } -char ** +GStrv tracker_search_text (TrackerClient *client, int live_query_id, ServiceType service, const char *search_text, int offset, int max_hits, GError **error) { - char **array = NULL; + GStrv array = NULL; char *service_str = tracker_service_types[service]; if (!org_freedesktop_Tracker_Search_text (client->proxy_search, live_query_id, service_str, search_text, offset, max_hits, &array, &*error)) { @@ -663,10 +663,10 @@ tracker_search_get_snippet (TrackerClien -char ** +GStrv tracker_search_metadata (TrackerClient *client, ServiceType service, const char *field, const char* search_text, int offset, int max_hits, GError **error) { - char **array = NULL; + GStrv array = NULL; char *service_str = tracker_service_types[service]; if (!org_freedesktop_Tracker_Search_metadata (client->proxy_search, service_str, field, search_text, offset, max_hits, &array, &*error)) { @@ -679,12 +679,12 @@ tracker_search_metadata (TrackerClient * GPtrArray * -tracker_search_query (TrackerClient *client, int live_query_id, ServiceType service, char **fields, const char *search_text, const char *keywords, const char *query, int offset, int max_hits, gboolean sort_by_service, GError **error) +tracker_search_query (TrackerClient *client, int live_query_id, ServiceType service, GStrv fields, const char *search_text, const char *keywords, const char *query, int offset, int max_hits, gboolean sort_by_service, GError **error) { GPtrArray *table; char *service_str = tracker_service_types[service]; - if (!org_freedesktop_Tracker_Search_query (client->proxy_search, live_query_id, service_str, (const char **)fields, search_text, keywords, query, sort_by_service, offset, max_hits , &table, &*error)) { + if (!org_freedesktop_Tracker_Search_query (client->proxy_search, live_query_id, service_str, (const GStrv )fields, search_text, keywords, query, sort_by_service, offset, max_hits , &table, &*error)) { return NULL; } @@ -746,10 +746,10 @@ tracker_files_search_text_contents (Trac -char ** +GStrv tracker_files_get_by_service_type (TrackerClient *client, int live_query_id, ServiceType service, int offset, int max_hits, GError **error) { - char **array = NULL; + GStrv array = NULL; char *service_str = tracker_service_types[service]; if (!org_freedesktop_Tracker_Files_get_by_service_type (client->proxy_files, live_query_id, service_str, offset, max_hits, &array, &*error)) { @@ -761,12 +761,12 @@ tracker_files_get_by_service_type (Track -char ** -tracker_files_get_by_mime_type (TrackerClient *client, int live_query_id, char **mimes, int offset, int max_hits, GError **error) +GStrv +tracker_files_get_by_mime_type (TrackerClient *client, int live_query_id, GStrv mimes, int offset, int max_hits, GError **error) { - char **array = NULL; + GStrv array = NULL; - if (!org_freedesktop_Tracker_Files_get_by_mime_type (client->proxy_files, live_query_id, (const char **)mimes, offset, max_hits, &array, &*error)) { + if (!org_freedesktop_Tracker_Files_get_by_mime_type (client->proxy_files, live_query_id, (const GStrv )mimes, offset, max_hits, &array, &*error)) { return NULL; } @@ -775,12 +775,12 @@ tracker_files_get_by_mime_type (TrackerC -char ** -tracker_files_get_by_mime_type_vfs (TrackerClient *client, int live_query_id, char **mimes, int offset, int max_hits, GError **error) +GStrv +tracker_files_get_by_mime_type_vfs (TrackerClient *client, int live_query_id, GStrv mimes, int offset, int max_hits, GError **error) { - char **array = NULL; + GStrv array = NULL; - if (!org_freedesktop_Tracker_Files_get_by_mime_type_vfs (client->proxy_files, live_query_id,(const char **) mimes, offset, max_hits, &array, &*error)) { + if (!org_freedesktop_Tracker_Files_get_by_mime_type_vfs (client->proxy_files, live_query_id,(const GStrv ) mimes, offset, max_hits, &array, &*error)) { return NULL; } @@ -803,11 +803,11 @@ tracker_files_get_mtime (TrackerClient * GPtrArray * -tracker_files_get_metadata_for_files_in_folder (TrackerClient *client, int live_query_id, const char *uri, char **fields, GError **error) +tracker_files_get_metadata_for_files_in_folder (TrackerClient *client, int live_query_id, const char *uri, GStrv fields, GError **error) { GPtrArray *table; - if (!org_freedesktop_Tracker_Files_get_metadata_for_files_in_folder (client->proxy_files, live_query_id, uri, (const char **)fields, &table, &*error)) { + if (!org_freedesktop_Tracker_Files_get_metadata_for_files_in_folder (client->proxy_files, live_query_id, uri, (const GStrv )fields, &table, &*error)) { return NULL; } @@ -816,11 +816,11 @@ tracker_files_get_metadata_for_files_in_ -char ** +GStrv tracker_search_metadata_by_text (TrackerClient *client, const char *query, GError **error) { - char **array = NULL; + GStrv array = NULL; if (!org_freedesktop_Tracker_Search_text (client->proxy_search, -1, "Files", query, 0, 512, &array, &*error)) { return NULL; @@ -834,12 +834,12 @@ tracker_search_metadata_by_text (Tracker -char ** -tracker_search_metadata_by_text_and_mime (TrackerClient *client, const char *query, const char **mimes, GError **error) +GStrv +tracker_search_metadata_by_text_and_mime (TrackerClient *client, const char *query, const GStrv mimes, GError **error) { - char **strs; + GStrv strs; - if (!org_freedesktop_Tracker_Files_search_by_text_and_mime (client->proxy_files, query,(const char **) mimes, &strs, &*error)) { + if (!org_freedesktop_Tracker_Files_search_by_text_and_mime (client->proxy_files, query,(const GStrv ) mimes, &strs, &*error)) { return NULL; } return strs; @@ -847,12 +847,12 @@ tracker_search_metadata_by_text_and_mime } -char ** -tracker_search_metadata_by_text_and_mime_and_location (TrackerClient *client, const char *query, const char **mimes, const char *location, GError **error) +GStrv +tracker_search_metadata_by_text_and_mime_and_location (TrackerClient *client, const char *query, const GStrv mimes, const char *location, GError **error) { - char **strs; + GStrv strs; - if (!org_freedesktop_Tracker_Files_search_by_text_and_mime_and_location (client->proxy_files, query, (const char **)mimes, location, &strs, &*error)) { + if (!org_freedesktop_Tracker_Files_search_by_text_and_mime_and_location (client->proxy_files, query, (const GStrv )mimes, location, &strs, &*error)) { return NULL; } return strs; @@ -861,10 +861,10 @@ tracker_search_metadata_by_text_and_mime -char ** +GStrv tracker_search_metadata_by_text_and_location (TrackerClient *client, const char *query, const char *location, GError **error) { - char **strs; + GStrv strs; if (!org_freedesktop_Tracker_Files_search_by_text_and_location (client->proxy_files, query, location, &strs, &*error)) { return NULL; @@ -991,7 +991,7 @@ tracker_prompt_index_signals_async (Trac void -tracker_metadata_get_async (TrackerClient *client, ServiceType service, const char *id, char **keys, TrackerArrayReply callback, gpointer user_data) +tracker_metadata_get_async (TrackerClient *client, ServiceType service, const char *id, GStrv keys, TrackerArrayReply callback, gpointer user_data) { ArrayCallBackStruct *callback_struct; @@ -1007,7 +1007,7 @@ tracker_metadata_get_async (TrackerClien void -tracker_metadata_set_async (TrackerClient *client, ServiceType service, const char *id, char **keys, char **values, TrackerVoidReply callback, gpointer user_data) +tracker_metadata_set_async (TrackerClient *client, ServiceType service, const char *id, GStrv keys, GStrv values, TrackerVoidReply callback, gpointer user_data) { VoidCallBackStruct *callback_struct; @@ -1019,7 +1019,7 @@ tracker_metadata_set_async (TrackerClien char *service_str = tracker_service_types[service]; - client->last_pending_call = org_freedesktop_Tracker_Metadata_set_async (client->proxy_metadata, service_str, id, (const char **)keys, (const char **)values, tracker_void_reply, callback_struct); + client->last_pending_call = org_freedesktop_Tracker_Metadata_set_async (client->proxy_metadata, service_str, id, (const GStrv )keys, (const GStrv )values, tracker_void_reply, callback_struct); } @@ -1135,7 +1135,7 @@ tracker_keywords_get_async (TrackerClien void -tracker_keywords_add_async (TrackerClient *client, ServiceType service, const char *id, char **values, TrackerVoidReply callback, gpointer user_data) +tracker_keywords_add_async (TrackerClient *client, ServiceType service, const char *id, GStrv values, TrackerVoidReply callback, gpointer user_data) { VoidCallBackStruct *callback_struct; @@ -1145,13 +1145,13 @@ tracker_keywords_add_async (TrackerClien callback_struct->data = user_data; char *service_str = tracker_service_types[service]; - client->last_pending_call = org_freedesktop_Tracker_Keywords_add_async (client->proxy_keywords, service_str, id, (const char **)values, tracker_void_reply, callback_struct); + client->last_pending_call = org_freedesktop_Tracker_Keywords_add_async (client->proxy_keywords, service_str, id, (const GStrv )values, tracker_void_reply, callback_struct); } void -tracker_keywords_remove_async (TrackerClient *client, ServiceType service, const char *id, char **values, TrackerVoidReply callback, gpointer user_data) +tracker_keywords_remove_async (TrackerClient *client, ServiceType service, const char *id, GStrv values, TrackerVoidReply callback, gpointer user_data) { VoidCallBackStruct *callback_struct; @@ -1162,7 +1162,7 @@ tracker_keywords_remove_async (TrackerCl char *service_str = tracker_service_types[service]; - client->last_pending_call = org_freedesktop_Tracker_Keywords_remove_async (client->proxy_keywords, service_str, id, (const char **)values, tracker_void_reply, callback_struct); + client->last_pending_call = org_freedesktop_Tracker_Keywords_remove_async (client->proxy_keywords, service_str, id, (const GStrv )values, tracker_void_reply, callback_struct); } @@ -1184,7 +1184,7 @@ tracker_keywords_remove_all_async (Track void -tracker_keywords_search_async (TrackerClient *client, int live_query_id, ServiceType service, char **keywords, int offset, int max_hits, TrackerArrayReply callback, gpointer user_data) +tracker_keywords_search_async (TrackerClient *client, int live_query_id, ServiceType service, GStrv keywords, int offset, int max_hits, TrackerArrayReply callback, gpointer user_data) { ArrayCallBackStruct *callback_struct; @@ -1195,7 +1195,7 @@ tracker_keywords_search_async (TrackerCl char *service_str = tracker_service_types[service]; - client->last_pending_call = org_freedesktop_Tracker_Keywords_search_async (client->proxy_keywords, live_query_id, service_str, (const char **)keywords, offset, max_hits, tracker_array_reply, callback_struct); + client->last_pending_call = org_freedesktop_Tracker_Keywords_search_async (client->proxy_keywords, live_query_id, service_str, (const GStrv )keywords, offset, max_hits, tracker_array_reply, callback_struct); } @@ -1299,7 +1299,7 @@ tracker_search_metadata_async (TrackerCl } void -tracker_search_query_async (TrackerClient *client, int live_query_id, ServiceType service, char **fields, const char *search_text, const char *keywords, const char *query, int offset, int max_hits, gboolean sort_by_service, TrackerGPtrArrayReply callback, gpointer user_data) +tracker_search_query_async (TrackerClient *client, int live_query_id, ServiceType service, GStrv fields, const char *search_text, const char *keywords, const char *query, int offset, int max_hits, gboolean sort_by_service, TrackerGPtrArrayReply callback, gpointer user_data) { GPtrArrayCallBackStruct *callback_struct; @@ -1309,7 +1309,7 @@ tracker_search_query_async (TrackerClien char *service_str = tracker_service_types[service]; - client->last_pending_call = org_freedesktop_Tracker_Search_query_async (client->proxy_search, live_query_id, service_str, (const char **)fields, search_text, keywords, query, sort_by_service, offset, max_hits, tracker_GPtrArray_reply, callback_struct); + client->last_pending_call = org_freedesktop_Tracker_Search_query_async (client->proxy_search, live_query_id, service_str, (const GStrv )fields, search_text, keywords, query, sort_by_service, offset, max_hits, tracker_GPtrArray_reply, callback_struct); } @@ -1405,7 +1405,7 @@ tracker_files_get_by_service_type_async void -tracker_files_get_by_mime_type_async (TrackerClient *client, int live_query_id, char **mimes, int offset, int max_hits, TrackerArrayReply callback, gpointer user_data) +tracker_files_get_by_mime_type_async (TrackerClient *client, int live_query_id, GStrv mimes, int offset, int max_hits, TrackerArrayReply callback, gpointer user_data) { ArrayCallBackStruct *callback_struct; @@ -1413,14 +1413,14 @@ tracker_files_get_by_mime_type_async (Tr callback_struct->callback = callback; callback_struct->data = user_data; - client->last_pending_call = org_freedesktop_Tracker_Files_get_by_mime_type_async (client->proxy_files, live_query_id, (const char **)mimes, offset, max_hits, tracker_array_reply, callback_struct); + client->last_pending_call = org_freedesktop_Tracker_Files_get_by_mime_type_async (client->proxy_files, live_query_id, (const GStrv )mimes, offset, max_hits, tracker_array_reply, callback_struct); } void -tracker_files_get_by_mime_type_vfs_async (TrackerClient *client, int live_query_id, char **mimes, int offset, int max_hits, TrackerArrayReply callback, gpointer user_data) +tracker_files_get_by_mime_type_vfs_async (TrackerClient *client, int live_query_id, GStrv mimes, int offset, int max_hits, TrackerArrayReply callback, gpointer user_data) { ArrayCallBackStruct *callback_struct; @@ -1428,7 +1428,7 @@ tracker_files_get_by_mime_type_vfs_async callback_struct->callback = callback; callback_struct->data = user_data; - client->last_pending_call = org_freedesktop_Tracker_Files_get_by_mime_type_vfs_async (client->proxy_files, live_query_id,(const char **) mimes, offset, max_hits, tracker_array_reply, callback_struct); + client->last_pending_call = org_freedesktop_Tracker_Files_get_by_mime_type_vfs_async (client->proxy_files, live_query_id,(const GStrv ) mimes, offset, max_hits, tracker_array_reply, callback_struct); } @@ -1450,7 +1450,7 @@ tracker_files_get_mtime_async (TrackerCl void -tracker_files_get_metadata_for_files_in_folder_async (TrackerClient *client, int live_query_id, const char *uri, char **fields, TrackerGPtrArrayReply callback, gpointer user_data) +tracker_files_get_metadata_for_files_in_folder_async (TrackerClient *client, int live_query_id, const char *uri, GStrv fields, TrackerGPtrArrayReply callback, gpointer user_data) { GPtrArrayCallBackStruct *callback_struct; @@ -1458,7 +1458,7 @@ tracker_files_get_metadata_for_files_in_ callback_struct->callback = callback; callback_struct->data = user_data; - client->last_pending_call = org_freedesktop_Tracker_Files_get_metadata_for_files_in_folder_async (client->proxy_files, live_query_id, uri, (const char **)fields, tracker_GPtrArray_reply, callback_struct); + client->last_pending_call = org_freedesktop_Tracker_Files_get_metadata_for_files_in_folder_async (client->proxy_files, live_query_id, uri, (const GStrv )fields, tracker_GPtrArray_reply, callback_struct); } @@ -1481,7 +1481,7 @@ tracker_search_metadata_by_text_async (T if(strcoll(metadata,"tag") == 0){ keywords[0] = strtok (NULL, ":"); keywords[1] = NULL; - client->last_pending_call = org_freedesktop_Tracker_Keywords_search_async (client->proxy_keywords, -1, "Files", (const char **)keywords, 0, 512, tracker_array_reply, callback_struct); + client->last_pending_call = org_freedesktop_Tracker_Keywords_search_async (client->proxy_keywords, -1, "Files", (const GStrv )keywords, 0, 512, tracker_array_reply, callback_struct); } }else{ client->last_pending_call = org_freedesktop_Tracker_Search_text_async (client->proxy_search, -1, "Files", query, 0, 512, tracker_array_reply, callback_struct); @@ -1489,7 +1489,7 @@ tracker_search_metadata_by_text_async (T } void -tracker_search_metadata_by_text_and_mime_async (TrackerClient *client, const char *query, const char **mimes, TrackerArrayReply callback, gpointer user_data) +tracker_search_metadata_by_text_and_mime_async (TrackerClient *client, const char *query, const GStrv mimes, TrackerArrayReply callback, gpointer user_data) { ArrayCallBackStruct *callback_struct; @@ -1497,13 +1497,13 @@ tracker_search_metadata_by_text_and_mime 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); + client->last_pending_call = org_freedesktop_Tracker_Files_search_by_text_and_mime_async (client->proxy_files, query,(const GStrv ) 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) +tracker_search_metadata_by_text_and_mime_and_location_async (TrackerClient *client, const char *query, const GStrv mimes, const char *location, TrackerArrayReply callback, gpointer user_data) { ArrayCallBackStruct *callback_struct; @@ -1511,7 +1511,7 @@ tracker_search_metadata_by_text_and_mime 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); + client->last_pending_call = org_freedesktop_Tracker_Files_search_by_text_and_mime_and_location_async (client->proxy_files, query, (const GStrv )mimes, location, tracker_array_reply, callback_struct); } Index: configure.ac =================================================================== --- configure.ac (revision 1962) +++ configure.ac (working copy) @@ -735,6 +735,7 @@ AC_CONFIG_FILES([ src/libstemmer/Makefile src/libtracker-common/Makefile src/libtracker/Makefile + src/libtracker/vala/Makefile src/libtracker-db/Makefile src/libtracker-gtk/Makefile src/tracker-indexer/Makefile