Index: src/trackerd/tracker-dbus-metadata.c =================================================================== RCS file: /cvs/gnome/tracker/src/trackerd/tracker-dbus-metadata.c,v retrieving revision 1.12 diff -u -r1.12 tracker-dbus-metadata.c --- src/trackerd/tracker-dbus-metadata.c 3 Oct 2006 21:02:47 -0000 1.12 +++ src/trackerd/tracker-dbus-metadata.c 24 Oct 2006 20:55:37 -0000 @@ -28,6 +28,7 @@ tracker_dbus_method_metadata_set (DBusRec *rec) { DBConnection *db_con; + DBusError dbus_error; DBusMessage *reply; int i, key_count, value_count; char *uri, *service, *id; @@ -47,12 +48,17 @@ */ - dbus_message_get_args (rec->message, NULL, + dbus_error_init(&dbus_error); + if (!dbus_message_get_args (rec->message, NULL, DBUS_TYPE_STRING, &service, DBUS_TYPE_STRING, &uri, DBUS_TYPE_ARRAY, DBUS_TYPE_STRING, &keys, &key_count, DBUS_TYPE_ARRAY, DBUS_TYPE_STRING, &values, &value_count, - DBUS_TYPE_INVALID); + DBUS_TYPE_INVALID)) { + tracker_set_error(rec, "DBusError: %s;%s", dbus_error.name, dbus_error.message); + dbus_error_free(&dbus_error); + return; + } if (!tracker_is_valid_service (db_con, service)) { tracker_set_error (rec, "Invalid service %s or service has not been implemented yet", service); @@ -119,6 +125,7 @@ tracker_dbus_method_metadata_get (DBusRec *rec) { DBConnection *db_con; + DBusError dbus_error; DBusMessage *reply; int i, key_count, table_count, row_count; char **keys, **array; @@ -140,11 +147,16 @@ */ - dbus_message_get_args (rec->message, NULL, + dbus_error_init(&dbus_error); + if (!dbus_message_get_args (rec->message, NULL, DBUS_TYPE_STRING, &service, DBUS_TYPE_STRING, &uri, DBUS_TYPE_ARRAY, DBUS_TYPE_STRING, &keys, &key_count, - DBUS_TYPE_INVALID); + DBUS_TYPE_INVALID)) { + tracker_set_error(rec, "DBusError: %s;%s", dbus_error.name, dbus_error.message); + dbus_error_free(&dbus_error); + return; + } if (!tracker_is_valid_service (db_con, service)) { tracker_set_error (rec, "Invalid service %s or service has not been implemented yet", service); @@ -327,6 +339,7 @@ tracker_dbus_method_metadata_register_type (DBusRec *rec) { DBConnection *db_con; + DBusError dbus_error; DBusMessage *reply; char *meta, *type_id; char *type; @@ -335,10 +348,15 @@ db_con = rec->user_data; - dbus_message_get_args (rec->message, NULL, + dbus_error_init(&dbus_error); + if (!dbus_message_get_args (rec->message, NULL, DBUS_TYPE_STRING, &meta, DBUS_TYPE_STRING, &type, - DBUS_TYPE_INVALID); + DBUS_TYPE_INVALID)) { + tracker_set_error(rec, "DBusError: %s;%s", dbus_error.name, dbus_error.message); + dbus_error_free(&dbus_error); + return; + } if (!meta || strlen (meta) < 3 || (strchr (meta, '.') == NULL) ) { tracker_set_error (rec, "Metadata name is invalid. All names must be in the format 'class.name' "); @@ -372,6 +390,7 @@ tracker_dbus_method_metadata_get_type_details (DBusRec *rec) { DBConnection *db_con; + DBusError dbus_error; DBusMessage *reply; char *meta, *data_type; gboolean is_embedded, is_writable; @@ -389,9 +408,14 @@ db_con = rec->user_data; - dbus_message_get_args (rec->message, NULL, + dbus_error_init(&dbus_error); + if (!dbus_message_get_args (rec->message, NULL, DBUS_TYPE_STRING, &meta, - DBUS_TYPE_INVALID); + DBUS_TYPE_INVALID)) { + tracker_set_error(rec, "DBusError: %s;%s", dbus_error.name, dbus_error.message); + dbus_error_free(&dbus_error); + return; + } data_type = NULL; is_embedded = FALSE; @@ -452,6 +476,7 @@ tracker_dbus_method_metadata_get_registered_types (DBusRec *rec) { DBConnection *db_con; + DBusError dbus_error; DBusMessage *reply; char *class, **array; int row_count; @@ -468,9 +493,14 @@ db_con = rec->user_data; - dbus_message_get_args (rec->message, NULL, + dbus_error_init(&dbus_error); + if (!dbus_message_get_args (rec->message, NULL, DBUS_TYPE_STRING, &class, - DBUS_TYPE_INVALID); + DBUS_TYPE_INVALID)) { + tracker_set_error(rec, "DBusError: %s;%s", dbus_error.name, dbus_error.message); + dbus_error_free(&dbus_error); + return; + } array = NULL; row_count = 0; @@ -503,6 +533,7 @@ tracker_dbus_method_metadata_get_writeable_types (DBusRec *rec) { DBConnection *db_con; + DBusError dbus_error; DBusMessage *reply; char *class, *class_formatted, **array; int row_count; @@ -521,9 +552,14 @@ db_con = rec->user_data; - dbus_message_get_args (rec->message, NULL, + dbus_error_init(&dbus_error); + if (!dbus_message_get_args (rec->message, NULL, DBUS_TYPE_STRING, &class, - DBUS_TYPE_INVALID); + DBUS_TYPE_INVALID)) { + tracker_set_error(rec, "DBusError: %s;%s", dbus_error.name, dbus_error.message); + dbus_error_free(&dbus_error); + return; + } array = NULL; row_count = 0; @@ -560,6 +596,7 @@ tracker_dbus_method_metadata_get_registered_classes (DBusRec *rec) { DBConnection *db_con; + DBusError dbus_error; DBusMessage *reply; char **array; int row_count; Index: src/trackerd/tracker-dbus-methods.c =================================================================== RCS file: /cvs/gnome/tracker/src/trackerd/tracker-dbus-methods.c,v retrieving revision 1.14 diff -u -r1.14 tracker-dbus-methods.c --- src/trackerd/tracker-dbus-methods.c 23 Oct 2006 00:16:21 -0000 1.14 +++ src/trackerd/tracker-dbus-methods.c 24 Oct 2006 20:55:37 -0000 @@ -350,7 +350,8 @@ tracker_dbus_method_get_services (DBusRec *rec) { DBConnection *db_con; - DBusMessage *reply; + DBusError dbus_error; + DBusMessage *reply; DBusMessageIter iter; DBusMessageIter iter_dict; gboolean main_only; @@ -362,8 +363,13 @@ tracker_log ("Executing GetServices Dbus Call"); - dbus_message_get_args (rec->message, NULL, DBUS_TYPE_BOOLEAN, &main_only, DBUS_TYPE_INVALID); - + dbus_error_init(&dbus_error); + if (!dbus_message_get_args (rec->message, NULL, DBUS_TYPE_BOOLEAN, &main_only, DBUS_TYPE_INVALID)) { + tracker_set_error(rec, "DBusError: %s;%s", dbus_error.name, dbus_error.message); + dbus_error_free(&dbus_error); + return; + } + if (main_only) { res = tracker_exec_proc (db_con, "GetServices", 1, "1"); } else { Index: src/trackerd/tracker-dbus-search.c =================================================================== RCS file: /cvs/gnome/tracker/src/trackerd/tracker-dbus-search.c,v retrieving revision 1.10 diff -u -r1.10 tracker-dbus-search.c --- src/trackerd/tracker-dbus-search.c 19 Oct 2006 01:27:41 -0000 1.10 +++ src/trackerd/tracker-dbus-search.c 24 Oct 2006 20:55:38 -0000 @@ -27,6 +27,7 @@ tracker_dbus_method_search_text (DBusRec *rec) { DBConnection *db_con; + DBusError dbus_error; DBusMessage *reply; char **array; int row_count, i; @@ -52,12 +53,17 @@ */ - dbus_message_get_args (rec->message, NULL, DBUS_TYPE_INT32, &query_id, + dbus_error_init(&dbus_error); + if (!dbus_message_get_args (rec->message, NULL, DBUS_TYPE_INT32, &query_id, DBUS_TYPE_STRING, &service, DBUS_TYPE_STRING, &str, DBUS_TYPE_INT32, &offset, DBUS_TYPE_INT32, &limit, - DBUS_TYPE_INVALID); + DBUS_TYPE_INVALID)) { + tracker_set_error(rec, "DBusError: %s;%s", dbus_error.name, dbus_error.message); + dbus_error_free(&dbus_error); + return; + } if (!service) { tracker_set_error (rec, "No service was specified"); @@ -139,6 +145,7 @@ tracker_dbus_method_search_text_detailed (DBusRec *rec) { DBConnection *db_con; + DBusError dbus_error; int limit, query_id, offset; char *service; char ***res; @@ -162,12 +169,17 @@ */ - dbus_message_get_args (rec->message, NULL, DBUS_TYPE_INT32, &query_id, + dbus_error_init(&dbus_error); + if (!dbus_message_get_args (rec->message, NULL, DBUS_TYPE_INT32, &query_id, DBUS_TYPE_STRING, &service, DBUS_TYPE_STRING, &str, DBUS_TYPE_INT32, &offset, DBUS_TYPE_INT32, &limit, - DBUS_TYPE_INVALID); + DBUS_TYPE_INVALID)) { + tracker_set_error(rec, "DBusError: %s;%s", dbus_error.name, dbus_error.message); + dbus_error_free(&dbus_error); + return; + } if (!service) { tracker_set_error (rec, "No service was specified"); @@ -202,6 +214,7 @@ tracker_dbus_method_search_get_snippet (DBusRec *rec) { DBConnection *db_con; + DBusError dbus_error; DBusMessage *reply; char *service, *uri, *str; char *snippet, *service_id; @@ -221,11 +234,16 @@ */ - dbus_message_get_args (rec->message, NULL, + dbus_error_init(&dbus_error); + if (!dbus_message_get_args (rec->message, NULL, DBUS_TYPE_STRING, &service, DBUS_TYPE_STRING, &uri, DBUS_TYPE_STRING, &str, - DBUS_TYPE_INVALID); + DBUS_TYPE_INVALID)) { + tracker_set_error(rec, "DBusError: %s;%s", dbus_error.name, dbus_error.message); + dbus_error_free(&dbus_error); + return; + } if (!service) { tracker_set_error (rec, "No service was specified"); @@ -300,6 +318,7 @@ tracker_dbus_method_search_files_by_text (DBusRec *rec) { DBConnection *db_con; + DBusError dbus_error; DBusMessage *reply; DBusMessageIter iter; DBusMessageIter iter_dict; @@ -329,13 +348,18 @@ */ - dbus_message_get_args (rec->message, NULL, + dbus_error_init(&dbus_error); + if (!dbus_message_get_args (rec->message, NULL, DBUS_TYPE_INT32, &query_id, DBUS_TYPE_STRING, &text, DBUS_TYPE_INT32, &offset, DBUS_TYPE_INT32, &limit, DBUS_TYPE_BOOLEAN, &sort, - DBUS_TYPE_INVALID); + DBUS_TYPE_INVALID)) { + tracker_set_error(rec, "DBusError: %s;%s", dbus_error.name, dbus_error.message); + dbus_error_free(&dbus_error); + return; + } res = tracker_db_search_files_by_text (db_con, text, offset, limit, sort); @@ -370,6 +394,7 @@ tracker_dbus_method_search_metadata (DBusRec *rec) { DBConnection *db_con; + DBusError dbus_error; DBusMessage *reply; char *service, *field, *text; char **array; @@ -393,13 +418,18 @@ */ - dbus_message_get_args (rec->message, NULL, + dbus_error_init(&dbus_error); + if (!dbus_message_get_args (rec->message, NULL, DBUS_TYPE_STRING, &service, DBUS_TYPE_STRING, &field, DBUS_TYPE_STRING, &text, DBUS_TYPE_INT32, &offset, DBUS_TYPE_INT32, &limit, - DBUS_TYPE_INVALID); + DBUS_TYPE_INVALID)) { + tracker_set_error(rec, "DBusError: %s;%s", dbus_error.name, dbus_error.message); + dbus_error_free(&dbus_error); + return; + } if (!tracker_is_valid_service (db_con, service)) { tracker_set_error (rec, "Invalid service %s or service has not been implemented yet", service); @@ -432,6 +462,7 @@ tracker_dbus_method_search_matching_fields (DBusRec *rec) { DBConnection *db_con; + DBusError dbus_error; char *text, *service, *id; char ***res; @@ -454,11 +485,16 @@ */ - dbus_message_get_args (rec->message, NULL, + dbus_error_init(&dbus_error); + if (!dbus_message_get_args (rec->message, NULL, DBUS_TYPE_STRING, &service, DBUS_TYPE_STRING, &id, DBUS_TYPE_STRING, &text, - DBUS_TYPE_INVALID); + DBUS_TYPE_INVALID)) { + tracker_set_error(rec, "DBusError: %s;%s", dbus_error.name, dbus_error.message); + dbus_error_free(&dbus_error); + return; + } if (!tracker_is_valid_service (db_con, service)) { tracker_set_error (rec, "Invalid service %s or service has not been implemented yet", service); @@ -503,6 +539,7 @@ tracker_dbus_method_search_query (DBusRec *rec) { DBConnection *db_con; + DBusError dbus_error; char **fields; int limit, row_count, query_id, offset; char ***res; @@ -540,7 +577,8 @@ */ - dbus_message_get_args (rec->message, NULL, + dbus_error_init(&dbus_error); + if (!dbus_message_get_args (rec->message, NULL, DBUS_TYPE_INT32, &query_id, DBUS_TYPE_STRING, &service, DBUS_TYPE_ARRAY, DBUS_TYPE_STRING, &fields, &row_count, @@ -550,7 +588,11 @@ DBUS_TYPE_BOOLEAN, &sort_results, DBUS_TYPE_INT32, &offset, DBUS_TYPE_INT32, &limit, - DBUS_TYPE_INVALID); + DBUS_TYPE_INVALID)) { + tracker_set_error(rec, "DBusError: %s;%s", dbus_error.name, dbus_error.message); + dbus_error_free(&dbus_error); + return; + } if (!tracker_is_valid_service (db_con, service)) { tracker_set_error (rec, "Invalid service %s or service has not been implemented yet", service);