diff options
| author | David Zeuthen <davidz@redhat.com> | 2008-12-21 18:43:16 -0500 |
|---|---|---|
| committer | David Zeuthen <davidz@redhat.com> | 2008-12-21 18:43:16 -0500 |
| commit | 0cd22f79d557cc00d7a51ca12a99d4ed7fba738b (patch) | |
| tree | 9e65c2f7e767374b1aad97d2f48883d9ba498049 | |
| parent | aa1bfb3c7c762b5264b27d6910f52f14f0c24698 (diff) | |
drop the _invoke_ part of generated methods; it's clear it's a D-Bus already
| -rw-r--r-- | docs/eggdbus/eggdbus-sections.txt | 144 | ||||
| -rw-r--r-- | src/eggdbus/eggdbusbusnametracker.c | 58 | ||||
| -rw-r--r-- | src/eggdbus/eggdbusconnection.c | 54 | ||||
| -rw-r--r-- | src/eggdbus/eggdbusinterfaceproxy.c | 26 | ||||
| -rw-r--r-- | src/eggdbus/eggdbusobjectproxy.c | 36 | ||||
| -rw-r--r-- | src/eggdbus/interface.c | 36 | ||||
| -rw-r--r-- | src/tests/testclient.c | 984 | ||||
| -rw-r--r-- | src/tests/testserver.c | 14 |
8 files changed, 676 insertions, 676 deletions
diff --git a/docs/eggdbus/eggdbus-sections.txt b/docs/eggdbus/eggdbus-sections.txt index 1c0b327..00ee6e4 100644 --- a/docs/eggdbus/eggdbus-sections.txt +++ b/docs/eggdbus/eggdbus-sections.txt @@ -115,60 +115,60 @@ EggDBusRequestNameFlags EggDBusRequestNameReply EggDBusReleaseNameReply EggDBusStartServiceByNameReply -egg_dbus_bus_invoke_hello_sync -egg_dbus_bus_invoke_request_name_sync -egg_dbus_bus_invoke_release_name_sync -egg_dbus_bus_invoke_start_service_by_name_sync -egg_dbus_bus_invoke_update_activation_environment_sync -egg_dbus_bus_invoke_name_has_owner_sync -egg_dbus_bus_invoke_list_names_sync -egg_dbus_bus_invoke_list_activatable_names_sync -egg_dbus_bus_invoke_add_match_sync -egg_dbus_bus_invoke_remove_match_sync -egg_dbus_bus_invoke_get_name_owner_sync -egg_dbus_bus_invoke_list_queued_owners_sync -egg_dbus_bus_invoke_get_connection_unix_user_sync -egg_dbus_bus_invoke_get_connection_unix_process_id_sync -egg_dbus_bus_invoke_get_adt_audit_session_data_sync -egg_dbus_bus_invoke_get_connection_se_linux_security_context_sync -egg_dbus_bus_invoke_reload_config_sync -egg_dbus_bus_invoke_get_id_sync -egg_dbus_bus_invoke_hello -egg_dbus_bus_invoke_hello_finish -egg_dbus_bus_invoke_request_name -egg_dbus_bus_invoke_request_name_finish -egg_dbus_bus_invoke_release_name -egg_dbus_bus_invoke_release_name_finish -egg_dbus_bus_invoke_start_service_by_name -egg_dbus_bus_invoke_start_service_by_name_finish -egg_dbus_bus_invoke_update_activation_environment -egg_dbus_bus_invoke_update_activation_environment_finish -egg_dbus_bus_invoke_name_has_owner -egg_dbus_bus_invoke_name_has_owner_finish -egg_dbus_bus_invoke_list_names -egg_dbus_bus_invoke_list_names_finish -egg_dbus_bus_invoke_list_activatable_names -egg_dbus_bus_invoke_list_activatable_names_finish -egg_dbus_bus_invoke_add_match -egg_dbus_bus_invoke_add_match_finish -egg_dbus_bus_invoke_remove_match -egg_dbus_bus_invoke_remove_match_finish -egg_dbus_bus_invoke_get_name_owner -egg_dbus_bus_invoke_get_name_owner_finish -egg_dbus_bus_invoke_list_queued_owners -egg_dbus_bus_invoke_list_queued_owners_finish -egg_dbus_bus_invoke_get_connection_unix_user -egg_dbus_bus_invoke_get_connection_unix_user_finish -egg_dbus_bus_invoke_get_connection_unix_process_id -egg_dbus_bus_invoke_get_connection_unix_process_id_finish -egg_dbus_bus_invoke_get_adt_audit_session_data -egg_dbus_bus_invoke_get_adt_audit_session_data_finish -egg_dbus_bus_invoke_get_connection_se_linux_security_context -egg_dbus_bus_invoke_get_connection_se_linux_security_context_finish -egg_dbus_bus_invoke_reload_config -egg_dbus_bus_invoke_reload_config_finish -egg_dbus_bus_invoke_get_id -egg_dbus_bus_invoke_get_id_finish +egg_dbus_bus_hello_sync +egg_dbus_bus_request_name_sync +egg_dbus_bus_release_name_sync +egg_dbus_bus_start_service_by_name_sync +egg_dbus_bus_update_activation_environment_sync +egg_dbus_bus_name_has_owner_sync +egg_dbus_bus_list_names_sync +egg_dbus_bus_list_activatable_names_sync +egg_dbus_bus_add_match_sync +egg_dbus_bus_remove_match_sync +egg_dbus_bus_get_name_owner_sync +egg_dbus_bus_list_queued_owners_sync +egg_dbus_bus_get_connection_unix_user_sync +egg_dbus_bus_get_connection_unix_process_id_sync +egg_dbus_bus_get_adt_audit_session_data_sync +egg_dbus_bus_get_connection_se_linux_security_context_sync +egg_dbus_bus_reload_config_sync +egg_dbus_bus_get_id_sync +egg_dbus_bus_hello +egg_dbus_bus_hello_finish +egg_dbus_bus_request_name +egg_dbus_bus_request_name_finish +egg_dbus_bus_release_name +egg_dbus_bus_release_name_finish +egg_dbus_bus_start_service_by_name +egg_dbus_bus_start_service_by_name_finish +egg_dbus_bus_update_activation_environment +egg_dbus_bus_update_activation_environment_finish +egg_dbus_bus_name_has_owner +egg_dbus_bus_name_has_owner_finish +egg_dbus_bus_list_names +egg_dbus_bus_list_names_finish +egg_dbus_bus_list_activatable_names +egg_dbus_bus_list_activatable_names_finish +egg_dbus_bus_add_match +egg_dbus_bus_add_match_finish +egg_dbus_bus_remove_match +egg_dbus_bus_remove_match_finish +egg_dbus_bus_get_name_owner +egg_dbus_bus_get_name_owner_finish +egg_dbus_bus_list_queued_owners +egg_dbus_bus_list_queued_owners_finish +egg_dbus_bus_get_connection_unix_user +egg_dbus_bus_get_connection_unix_user_finish +egg_dbus_bus_get_connection_unix_process_id +egg_dbus_bus_get_connection_unix_process_id_finish +egg_dbus_bus_get_adt_audit_session_data +egg_dbus_bus_get_adt_audit_session_data_finish +egg_dbus_bus_get_connection_se_linux_security_context +egg_dbus_bus_get_connection_se_linux_security_context_finish +egg_dbus_bus_reload_config +egg_dbus_bus_reload_config_finish +egg_dbus_bus_get_id +egg_dbus_bus_get_id_finish egg_dbus_bus_handle_hello_finish egg_dbus_bus_handle_request_name_finish egg_dbus_bus_handle_release_name_finish @@ -311,12 +311,12 @@ EGG_DBUS_MESSAGE_GET_CLASS EggDBusPeer EggDBusPeerIface EGG_DBUS_QUERY_INTERFACE_PEER -egg_dbus_peer_invoke_ping_sync -egg_dbus_peer_invoke_get_machine_id_sync -egg_dbus_peer_invoke_ping -egg_dbus_peer_invoke_ping_finish -egg_dbus_peer_invoke_get_machine_id -egg_dbus_peer_invoke_get_machine_id_finish +egg_dbus_peer_ping_sync +egg_dbus_peer_get_machine_id_sync +egg_dbus_peer_ping +egg_dbus_peer_ping_finish +egg_dbus_peer_get_machine_id +egg_dbus_peer_get_machine_id_finish egg_dbus_peer_handle_ping_finish egg_dbus_peer_handle_get_machine_id_finish <SUBSECTION Standard> @@ -332,9 +332,9 @@ EGG_DBUS_PEER_GET_IFACE EggDBusIntrospectable EggDBusIntrospectableIface EGG_DBUS_QUERY_INTERFACE_INTROSPECTABLE -egg_dbus_introspectable_invoke_introspect_sync -egg_dbus_introspectable_invoke_introspect -egg_dbus_introspectable_invoke_introspect_finish +egg_dbus_introspectable_introspect_sync +egg_dbus_introspectable_introspect +egg_dbus_introspectable_introspect_finish egg_dbus_introspectable_handle_introspect_finish <SUBSECTION Standard> EGG_DBUS_INTROSPECTABLE @@ -518,15 +518,15 @@ EGG_DBUS_ARRAY_SEQ_GET_CLASS EggDBusProperties EggDBusPropertiesIface EGG_DBUS_QUERY_INTERFACE_PROPERTIES -egg_dbus_properties_invoke_get_sync -egg_dbus_properties_invoke_get_all_sync -egg_dbus_properties_invoke_set_sync -egg_dbus_properties_invoke_get -egg_dbus_properties_invoke_get_finish -egg_dbus_properties_invoke_get_all -egg_dbus_properties_invoke_get_all_finish -egg_dbus_properties_invoke_set -egg_dbus_properties_invoke_set_finish +egg_dbus_properties_get_sync +egg_dbus_properties_get_all_sync +egg_dbus_properties_set_sync +egg_dbus_properties_get +egg_dbus_properties_get_finish +egg_dbus_properties_get_all +egg_dbus_properties_get_all_finish +egg_dbus_properties_set +egg_dbus_properties_set_finish egg_dbus_properties_handle_get_finish egg_dbus_properties_handle_get_all_finish egg_dbus_properties_handle_set_finish diff --git a/src/eggdbus/eggdbusbusnametracker.c b/src/eggdbus/eggdbusbusnametracker.c index 05565c2..f627f96 100644 --- a/src/eggdbus/eggdbusbusnametracker.c +++ b/src/eggdbus/eggdbusbusnametracker.c @@ -104,9 +104,9 @@ remove_match_rule_cb (EggDBusBus *bus, GError *error; error = NULL; - if (!egg_dbus_bus_invoke_remove_match_finish (bus, - res, - &error)) + if (!egg_dbus_bus_remove_match_finish (bus, + res, + &error)) { g_warning ("Error removing match rule \"%s\": %s", match_rule, error->message); g_error_free (error); @@ -124,12 +124,12 @@ name_data_unref (NameData *data) { if (g_atomic_int_dec_and_test (&data->ref_count)) { - egg_dbus_bus_invoke_remove_match (data->bus, - 0, - data->match_rule, - NULL, - (GAsyncReadyCallback) remove_match_rule_cb, - data->match_rule); /* steal, remove_match_rule_cb() will free it */ + egg_dbus_bus_remove_match (data->bus, + 0, + data->match_rule, + NULL, + (GAsyncReadyCallback) remove_match_rule_cb, + data->match_rule); /* steal, remove_match_rule_cb() will free it */ g_object_unref (data->bus); g_free (data->name); g_free (data->owner); @@ -441,10 +441,10 @@ get_name_owner_cb (EggDBusBus *bus, /*g_debug ("get_name_owner_cb for %s", data->name);*/ error = NULL; - if (!egg_dbus_bus_invoke_get_name_owner_finish (bus, - &owner, - res, - &error)) + if (!egg_dbus_bus_get_name_owner_finish (bus, + &owner, + res, + &error)) { /* this is actually not fatal or weird; it's perfectly fine for a well-known name not to have an owner */ @@ -484,9 +484,9 @@ add_match_rule_cb (EggDBusBus *bus, GError *error; error = NULL; - if (!egg_dbus_bus_invoke_add_match_finish (bus, - res, - &error)) + if (!egg_dbus_bus_add_match_finish (bus, + res, + &error)) { /* TODO: handle cancelled */ g_warning ("Error adding match rule \"%s\": %s", data->match_rule, error->message); @@ -536,22 +536,22 @@ egg_dbus_bus_name_tracker_watch_bus_name (EggDBusBusNameTracker *bus_name_tracke "member='NameOwnerChanged',arg0='%s'", bus_name); /* Watch for changes */ - egg_dbus_bus_invoke_add_match (priv->bus, - 0, - data->match_rule, - NULL, - (GAsyncReadyCallback) add_match_rule_cb, - name_data_ref (data)); + egg_dbus_bus_add_match (priv->bus, + 0, + data->match_rule, + NULL, + (GAsyncReadyCallback) add_match_rule_cb, + name_data_ref (data)); data->get_name_owner_is_pending = TRUE; /* Get the name */ - egg_dbus_bus_invoke_get_name_owner (priv->bus, - 0, - data->name, - NULL, - (GAsyncReadyCallback) get_name_owner_cb, - name_data_ref (data)); + egg_dbus_bus_get_name_owner (priv->bus, + 0, + data->name, + NULL, + (GAsyncReadyCallback) get_name_owner_cb, + name_data_ref (data)); /*g_debug ("started watching bus name %s", bus_name);*/ } @@ -631,7 +631,7 @@ egg_dbus_bus_name_tracker_has_info_for_bus_name (EggDBusBusNameTracker *bus_nam * * Gets owner of @bus_name. * - * If @bus_name_tracker recently started watching @bus_name, a call to egg_dbus_bus_invoke_get_name_owner() + * If @bus_name_tracker recently started watching @bus_name, a call to egg_dbus_bus_get_name_owner() * call may be still be pending. This function will block in a main loop until the owner is resolved. * * If this synchronous behavior is not desired, use call egg_dbus_bus_name_tracker_has_info_for_bus_name() diff --git a/src/eggdbus/eggdbusconnection.c b/src/eggdbus/eggdbusconnection.c index 5700985..5477712 100644 --- a/src/eggdbus/eggdbusconnection.c +++ b/src/eggdbus/eggdbusconnection.c @@ -621,13 +621,13 @@ egg_dbus_connection_get_for_bus (EggDBusBusType bus_type) * connection = egg_dbus_connection_get_for_bus (EGG_DBUS_BUS_TYPE_SESSION); * * error = NULL; - * if (!egg_dbus_bus_invoke_request_name_sync (egg_dbus_connection_get_bus (connection), - * EGG_DBUS_CALL_FLAGS_NONE, - * "com.example.AwesomeProduct", - * EGG_DBUS_REQUEST_NAME_FLAGS_NONE, - * &request_name_reply, - * NULL, - * &error)) + * if (!egg_dbus_bus_request_name_sync (egg_dbus_connection_get_bus (connection), + * EGG_DBUS_CALL_FLAGS_NONE, + * "com.example.AwesomeProduct", + * EGG_DBUS_REQUEST_NAME_FLAGS_NONE, + * &request_name_reply, + * NULL, + * &error)) * { * g_warning ("Error claiming com.example.AwesomeProduct on session bus: %s", error->message); * g_error_free (error); @@ -726,9 +726,9 @@ add_match_rule_cb (EggDBusBus *bus, GError *error; error = NULL; - if (!egg_dbus_bus_invoke_add_match_finish (bus, - res, - &error)) + if (!egg_dbus_bus_add_match_finish (bus, + res, + &error)) { g_warning ("Error adding match rule \"%s\": %s", data->rule, error->message); g_error_free (error); @@ -747,9 +747,9 @@ remove_match_rule_cb (EggDBusBus *bus, GError *error; error = NULL; - if (!egg_dbus_bus_invoke_remove_match_finish (bus, - res, - &error)) + if (!egg_dbus_bus_remove_match_finish (bus, + res, + &error)) { g_warning ("Error removing match rule \"%s\": %s", data->rule, error->message); g_error_free (error); @@ -853,12 +853,12 @@ egg_dbus_connection_get_object_proxy (EggDBusConnection *connection, /*g_debug ("adding match rule \"%s\"", rule);*/ - egg_dbus_bus_invoke_add_match (EGG_DBUS_QUERY_INTERFACE_BUS (priv->bus_object_proxy), - 0, - rule, - NULL, - (GAsyncReadyCallback) add_match_rule_cb, - match_rule_data_new (rule, connection)); + egg_dbus_bus_add_match (EGG_DBUS_QUERY_INTERFACE_BUS (priv->bus_object_proxy), + 0, + rule, + NULL, + (GAsyncReadyCallback) add_match_rule_cb, + match_rule_data_new (rule, connection)); g_free (rule); @@ -918,12 +918,12 @@ _egg_dbus_connection_unregister_object_proxy (EggDBusConnection *connection, /*g_debug ("removing match rule \"%s\"", rule);*/ - egg_dbus_bus_invoke_remove_match (EGG_DBUS_QUERY_INTERFACE_BUS (priv->bus_object_proxy != NULL ? priv->bus_object_proxy : object_proxy), - 0, - rule, - NULL, - (GAsyncReadyCallback) remove_match_rule_cb, - match_rule_data_new (rule, connection)); + egg_dbus_bus_remove_match (EGG_DBUS_QUERY_INTERFACE_BUS (priv->bus_object_proxy != NULL ? priv->bus_object_proxy : object_proxy), + 0, + rule, + NULL, + (GAsyncReadyCallback) remove_match_rule_cb, + match_rule_data_new (rule, connection)); g_free (rule); @@ -2417,7 +2417,7 @@ egg_dbus_connection_send_message_with_reply_cb (DBusPendingCall *pending_call * egg_dbus_connection_pending_call_cancel: * @connection: A #EggDBusConnection. * @pending_call_id: A valid pending call id obtained from egg_dbus_connection_send_message_with_reply() - * or similar wrapper functions (such as egg_dbus_bus_invoke_request_name()). + * or similar wrapper functions (such as egg_dbus_bus_request_name()). * * Cancels an asynchronous method invocation expecting a reply. The * #GAsyncReadyCallback callback given to @@ -2459,7 +2459,7 @@ egg_dbus_connection_pending_call_cancel (EggDBusConnection *connection, * egg_dbus_connection_pending_call_block: * @connection: A #EggDBusConnection. * @pending_call_id: A valid pending call id obtained from egg_dbus_connection_send_message_with_reply() - * or similar wrapper functions (such as egg_dbus_bus_invoke_request_name()). + * or similar wrapper functions (such as egg_dbus_bus_request_name()). * * Blocks until the asynchronous method invocation with * @pending_call_id completes. The #GAsyncReadyCallback callback given to diff --git a/src/eggdbus/eggdbusinterfaceproxy.c b/src/eggdbus/eggdbusinterfaceproxy.c index 1a4d43f..5774e23 100644 --- a/src/eggdbus/eggdbusinterfaceproxy.c +++ b/src/eggdbus/eggdbusinterfaceproxy.c @@ -185,12 +185,12 @@ ensure_properties (EggDBusInterfaceProxy *interface_proxy, /* don't block in mainloop... */ error = NULL; - if (!egg_dbus_properties_invoke_get_all_sync (EGG_DBUS_QUERY_INTERFACE_PROPERTIES (egg_dbus_interface_proxy_get_object_proxy (interface_proxy)), - EGG_DBUS_CALL_FLAGS_NONE, - priv->interface_info->name, - &property_bag, - NULL, - &error)) + if (!egg_dbus_properties_get_all_sync (EGG_DBUS_QUERY_INTERFACE_PROPERTIES (egg_dbus_interface_proxy_get_object_proxy (interface_proxy)), + EGG_DBUS_CALL_FLAGS_NONE, + priv->interface_info->name, + &property_bag, + NULL, + &error)) { g_warning ("Error getting properties on interface %s: %s", priv->interface_info->name, @@ -291,13 +291,13 @@ egg_dbus_interface_proxy_set_property (GObject *object, * * TODO: Right now we block in the mainloop. This is *probably* wrong. */ - if (!egg_dbus_properties_invoke_set_sync (EGG_DBUS_QUERY_INTERFACE_PROPERTIES (egg_dbus_interface_proxy_get_object_proxy (interface_proxy)), - EGG_DBUS_CALL_FLAGS_BLOCK_IN_MAINLOOP, - priv->interface_info->name, - property_info->name, - variant, - NULL, - &error)) + if (!egg_dbus_properties_set_sync (EGG_DBUS_QUERY_INTERFACE_PROPERTIES (egg_dbus_interface_proxy_get_object_proxy (interface_proxy)), + EGG_DBUS_CALL_FLAGS_BLOCK_IN_MAINLOOP, + priv->interface_info->name, + property_info->name, + variant, + NULL, + &error)) { g_warning ("Error setting property %s (%s) on %s via D-Bus: %s", property_info->g_name, diff --git a/src/eggdbus/eggdbusobjectproxy.c b/src/eggdbus/eggdbusobjectproxy.c index 7163fd1..5f47c05 100644 --- a/src/eggdbus/eggdbusobjectproxy.c +++ b/src/eggdbus/eggdbusobjectproxy.c @@ -97,10 +97,10 @@ * peer = EGG_DBUS_QUERY_INTERFACE_PEER (object_proxy); * * error = NULL; - * if (!egg_dbus_peer_invoke_ping_sync (peer, - * EGG_DBUS_CALL_FLAGS_NONE, - * NULL, /<!-- -->* GCancellable *<!-- -->/ - * &error)) + * if (!egg_dbus_peer_ping_sync (peer, + * EGG_DBUS_CALL_FLAGS_NONE, + * NULL, /<!-- -->* GCancellable *<!-- -->/ + * &error)) * { * g_warning ("Error: %s", error->message); * g_error_free (error); @@ -663,10 +663,10 @@ egg_dbus_object_proxy_introspect_cb (GObject *source_object, GError *error; error = NULL; - if (!egg_dbus_introspectable_invoke_introspect_finish (EGG_DBUS_QUERY_INTERFACE_INTROSPECTABLE (object_proxy), - &xml_data, - res, - &error)) + if (!egg_dbus_introspectable_introspect_finish (EGG_DBUS_QUERY_INTERFACE_INTROSPECTABLE (object_proxy), + &xml_data, + res, + &error)) { g_simple_async_result_set_from_error (simple, error); g_error_free (error); @@ -719,11 +719,11 @@ egg_dbus_object_proxy_introspect (EggDBusObjectProxy *object_proxy, user_data, egg_dbus_object_proxy_introspect); - pending_call_id = egg_dbus_introspectable_invoke_introspect (EGG_DBUS_QUERY_INTERFACE_INTROSPECTABLE (object_proxy), - call_flags, - cancellable, - egg_dbus_object_proxy_introspect_cb, - simple); + pending_call_id = egg_dbus_introspectable_introspect (EGG_DBUS_QUERY_INTERFACE_INTROSPECTABLE (object_proxy), + call_flags, + cancellable, + egg_dbus_object_proxy_introspect_cb, + simple); return pending_call_id; } @@ -796,11 +796,11 @@ egg_dbus_object_proxy_introspect_sync (EggDBusObjectProxy *object_proxy, ret = NULL; - if (!egg_dbus_introspectable_invoke_introspect_sync (EGG_DBUS_QUERY_INTERFACE_INTROSPECTABLE (object_proxy), - call_flags, - &xml_data, - cancellable, - error)) + if (!egg_dbus_introspectable_introspect_sync (EGG_DBUS_QUERY_INTERFACE_INTROSPECTABLE (object_proxy), + call_flags, + &xml_data, + cancellable, + error)) goto out; ret = egg_dbus_interface_new_node_info_from_xml (xml_data, error); diff --git a/src/eggdbus/interface.c b/src/eggdbus/interface.c index abbd892..0b9c9a7 100644 --- a/src/eggdbus/interface.c +++ b/src/eggdbus/interface.c @@ -140,22 +140,22 @@ print_method_doc (const EggDBusInterfaceMethodInfo *method, { case METHOD_TYPE_SYNC: name_suffix = "_sync"; - method_name_qualifier = "invoke"; + method_name_qualifier = ""; break; case METHOD_TYPE_ASYNC: name_suffix = ""; - method_name_qualifier = "invoke"; + method_name_qualifier = ""; break; case METHOD_TYPE_ASYNC_FINISH: name_suffix = "_finish"; - method_name_qualifier = "invoke"; + method_name_qualifier = ""; break; case METHOD_TYPE_SERVER_FINISH: name_suffix = "_finish"; - method_name_qualifier = "handle"; + method_name_qualifier = "handle_"; break; default: @@ -163,7 +163,7 @@ print_method_doc (const EggDBusInterfaceMethodInfo *method, } g_print ("/**\n" - " * %s_%s_%s_%s%s:\n", + " * %s_%s_%s%s%s:\n", name_space_uscore, iface_name_uscore, method_name_qualifier, @@ -203,7 +203,7 @@ print_method_doc (const EggDBusInterfaceMethodInfo *method, g_print (" *\n" " * This function synchronously invokes the <literal>%s.%s()</literal> method on the object represented by @instance.\n" - " * See %s_%s_invoke_%s() for the asynchronous version of this function.\n", + " * See %s_%s_%s() for the asynchronous version of this function.\n", interface->name, method->name, name_space_uscore, iface_name_uscore, method_name_uscore); @@ -235,8 +235,8 @@ print_method_doc (const EggDBusInterfaceMethodInfo *method, " * This function asynchronously invokes the <literal>%s.%s()</literal> method\n" " * on the object represented by @instance.\n" " * When the reply is ready, @callback will be called (on the main thread).\n" - " * You can then call %s_%s_invoke_%s_finish() to get the result.\n" - " * See %s_%s_invoke_%s_sync() for the synchronous version of this function.\n", + " * You can then call %s_%s_%s_finish() to get the result.\n" + " * See %s_%s_%s_sync() for the synchronous version of this function.\n", interface->name, method->name, name_space_uscore, iface_name_uscore, method_name_uscore, name_space_uscore, iface_name_uscore, method_name_uscore); @@ -255,12 +255,12 @@ print_method_doc (const EggDBusInterfaceMethodInfo *method, error)) goto out; - g_print (" * @res: A #GAsyncResult obtained from the #GAsyncReadyCallback function passed to %s_%s_invoke_%s().\n" + g_print (" * @res: A #GAsyncResult obtained from the #GAsyncReadyCallback function passed to %s_%s_%s().\n" " * @error: Return location for error.\n", name_space_uscore, iface_name_uscore, method_name_uscore); g_print (" *\n" - " * Finishes an asynchronous method invocation started with %s_%s_invoke_%s().\n", + " * Finishes an asynchronous method invocation started with %s_%s_%s().\n", name_space_uscore, iface_name_uscore, method_name_uscore); } @@ -356,38 +356,38 @@ print_method_prototype (const EggDBusInterfaceMethodInfo *method, case METHOD_TYPE_SYNC: name_suffix = "_sync"; return_ctype = "gboolean"; - method_name_qualifier = "invoke"; + method_name_qualifier = ""; break; case METHOD_TYPE_ASYNC: name_suffix = ""; return_ctype = "guint"; - method_name_qualifier = "invoke"; + method_name_qualifier = ""; break; case METHOD_TYPE_ASYNC_FINISH: name_suffix = "_finish"; return_ctype = "gboolean"; - method_name_qualifier = "invoke"; + method_name_qualifier = ""; break; case METHOD_TYPE_SERVER: name_suffix = ""; return_ctype = "void"; - method_name_qualifier = "handle"; + method_name_qualifier = "handle_"; break; case METHOD_TYPE_SERVER_FINISH: name_suffix = "_finish"; return_ctype = "void"; - method_name_qualifier = "handle"; + method_name_qualifier = "handle_"; break; default: g_assert_not_reached (); } - g_print ("%*s%s%s%s%s%s_%s%s%s (\n" + g_print ("%*s%s%s%s%s%s%s%s%s (\n" "%*s ", indent, "", return_ctype, @@ -2403,7 +2403,7 @@ interface_generate_iface_c_file (const EggDBusInterfaceInfo *interface, " simple = g_simple_async_result_new (G_OBJECT (instance),\n" " callback,\n" " user_data,\n" - " %s_%s_invoke_%s);\n" + " %s_%s_%s);\n" "\n" " object_proxy = egg_dbus_interface_proxy_get_object_proxy (EGG_DBUS_INTERFACE_PROXY (instance));\n" "\n", @@ -2486,7 +2486,7 @@ interface_generate_iface_c_file (const EggDBusInterfaceInfo *interface, "\n" " g_return_val_if_fail (%s_IS_%s (instance) && EGG_DBUS_IS_INTERFACE_PROXY (instance), FALSE);\n" "\n" - " g_warn_if_fail (g_simple_async_result_get_source_tag (simple) == %s_%s_invoke_%s);\n" + " g_warn_if_fail (g_simple_async_result_get_source_tag (simple) == %s_%s_%s);\n" "\n" " ret = FALSE;\n" " reply = NULL;\n" diff --git a/src/tests/testclient.c b/src/tests/testclient.c index 3fd68d7..95f602b 100644 --- a/src/tests/testclient.c +++ b/src/tests/testclient.c @@ -355,7 +355,7 @@ hello_world_cb (TestFrob *frob, char *s; error = NULL; - if (!test_frob_invoke_hello_world_finish (frob, &s, res, &error)) + if (!test_frob_hello_world_finish (frob, &s, res, &error)) { g_assert_error (error, TEST_ERROR, TEST_ERROR_FLUX_CAPACITOR_FAILURE); g_assert_cmpstr (error->message, ==, "Remote Exception invoking com.example.Frob.HelloWorld() on /com/example/TestObject at name com.example.TestService: com.example.Error.FluxCapacitorFailure: Yo is not a proper greeting"); @@ -381,42 +381,42 @@ test_hello_world (void) error = NULL; /* test sync method invocation */ - g_assert (test_frob_invoke_hello_world_sync (TEST_QUERY_INTERFACE_FROB (object_proxy), 0, /* flags */ - "Hi!", - &s, - NULL, - &error)); + g_assert (test_frob_hello_world_sync (TEST_QUERY_INTERFACE_FROB (object_proxy), 0, /* flags */ + "Hi!", + &s, + NULL, + &error)); g_assert_no_error (error); g_assert_cmpstr (s, ==, "You greeted me with 'Hi!'. Thanks!"); g_free (s); /* test sync method invocation with exception */ - g_assert (!test_frob_invoke_hello_world_sync (TEST_QUERY_INTERFACE_FROB (object_proxy), 0, /* flags */ - "Yo", - &s, - NULL, - &error)); + g_assert (!test_frob_hello_world_sync (TEST_QUERY_INTERFACE_FROB (object_proxy), 0, /* flags */ + "Yo", + &s, + NULL, + &error)); g_assert_error (error, TEST_ERROR, TEST_ERROR_FLUX_CAPACITOR_FAILURE); g_assert_cmpstr (error->message, ==, "Remote Exception invoking com.example.Frob.HelloWorld() on /com/example/TestObject at name com.example.TestService: com.example.Error.FluxCapacitorFailure: Yo is not a proper greeting"); g_error_free (error); error = NULL; /* test async method invocation */ - test_frob_invoke_hello_world (TEST_QUERY_INTERFACE_FROB (object_proxy), 0, /* flags */ - "Hi Async!", - NULL, - (GAsyncReadyCallback) hello_world_cb, - &s); + test_frob_hello_world (TEST_QUERY_INTERFACE_FROB (object_proxy), 0, /* flags */ + "Hi Async!", + NULL, + (GAsyncReadyCallback) hello_world_cb, + &s); g_main_loop_run (loop); g_assert_cmpstr (s, ==, "You greeted me with 'Hi Async!'. Thanks!"); g_free (s); /* test async method invocation with exception */ - test_frob_invoke_hello_world (TEST_QUERY_INTERFACE_FROB (object_proxy), 0, /* flags */ - "Yo", - NULL, - (GAsyncReadyCallback) hello_world_cb, - &s); + test_frob_hello_world (TEST_QUERY_INTERFACE_FROB (object_proxy), 0, /* flags */ + "Yo", + NULL, + (GAsyncReadyCallback) hello_world_cb, + &s); g_main_loop_run (loop); g_assert (s == NULL); } @@ -442,33 +442,33 @@ test_primitive_types (void) error = NULL; - g_assert (test_frob_invoke_test_primitive_types_sync (TEST_QUERY_INTERFACE_FROB (object_proxy), 0, /* flags */ - 1, - FALSE, - 160, - 161, - 320, - 321, - 640, - 641, - 4.5, - "somestring", - "/some/objpath", - "(sig)", - &ret_byte, - &ret_boolean, - &ret_int16, - &ret_uint16, - &ret_int32, - &ret_uint32, - &ret_int64, - &ret_uint64, - &ret_double, - &ret_string, - &ret_objpath, - &ret_sig, - NULL, - &error)); + g_assert (test_frob_test_primitive_types_sync (TEST_QUERY_INTERFACE_FROB (object_proxy), 0, /* flags */ + 1, + FALSE, + 160, + 161, + 320, + 321, + 640, + 641, + 4.5, + "somestring", + "/some/objpath", + "(sig)", + &ret_byte, + &ret_boolean, + &ret_int16, + &ret_uint16, + &ret_int32, + &ret_uint32, + &ret_int64, + &ret_uint64, + &ret_double, + &ret_string, + &ret_objpath, + &ret_sig, + NULL, + &error)); g_assert_no_error (error); g_assert_cmphex (ret_byte, ==, 1 + 1); g_assert_cmpint (ret_boolean, ==, TRUE); @@ -556,34 +556,34 @@ test_array_of_primitive_types (void) egg_dbus_array_seq_add_float (array_double, 4.5); egg_dbus_array_seq_add_float (array_double, 5.5); - g_assert (test_frob_invoke_test_array_of_primitive_types_sync (TEST_QUERY_INTERFACE_FROB (object_proxy), - 0, /* call flags */ - array_byte, - array_boolean, - array_int16, - array_uint16, - array_int32, - array_uint32, - array_int64, - array_uint64, - array_double, - array_string, - array_objpath, - array_sig, - &ret_array_byte, - &ret_array_boolean, - &ret_array_int16, - &ret_array_uint16, - &ret_array_int32, - &ret_array_uint32, - &ret_array_int64, - &ret_array_uint64, - &ret_array_double, - &ret_array_string, - &ret_array_objpath, - &ret_array_sig, - NULL, - &error)); + g_assert (test_frob_test_array_of_primitive_types_sync (TEST_QUERY_INTERFACE_FROB (object_proxy), + 0, /* call flags */ + array_byte, + array_boolean, + array_int16, + array_uint16, + array_int32, + array_uint32, + array_int64, + array_uint64, + array_double, + array_string, + array_objpath, + array_sig, + &ret_array_byte, + &ret_array_boolean, + &ret_array_int16, + &ret_array_uint16, + &ret_array_int32, + &ret_array_uint32, + &ret_array_int64, + &ret_array_uint64, + &ret_array_double, + &ret_array_string, + &ret_array_objpath, + &ret_array_sig, + NULL, + &error)); g_assert_no_error (error); g_assert_cmpuint (egg_dbus_array_seq_get_size (ret_array_byte), ==, 4); @@ -698,13 +698,13 @@ test_structure_types (void) point2 = test_point_new (100, 101); dpoint = test_described_point_new ("described point", point2); - g_assert (test_frob_invoke_test_structure_types_sync (TEST_QUERY_INTERFACE_FROB (object_proxy), 0, /* flags */ - point, - dpoint, - &res_point, - &res_dpoint, - NULL, - &error)); + g_assert (test_frob_test_structure_types_sync (TEST_QUERY_INTERFACE_FROB (object_proxy), 0, /* flags */ + point, + dpoint, + &res_point, + &res_dpoint, + NULL, + &error)); g_assert_no_error (error); g_assert_cmpint (test_point_get_x (point) + 1, ==, test_point_get_x (res_point)); g_assert_cmpint (test_point_get_y (point) + 1, ==, test_point_get_y (res_point)); @@ -750,12 +750,12 @@ test_array_of_structure_types (void) egg_dbus_array_seq_add (seq, test_extended_described_point_new ("foo4", point, "ext2")); g_object_unref (point); - g_assert (test_frob_invoke_test_array_of_structure_types_sync (TEST_QUERY_INTERFACE_FROB (object_proxy), - 0, /* flags */ - seq, - &ret_seq, - NULL, - &error)); + g_assert (test_frob_test_array_of_structure_types_sync (TEST_QUERY_INTERFACE_FROB (object_proxy), + 0, /* flags */ + seq, + &ret_seq, + NULL, + &error)); g_assert_no_error (error); g_assert_cmpint (egg_dbus_array_seq_get_size (ret_seq), == , 3); @@ -874,31 +874,31 @@ test_hash_tables (void) egg_dbus_hash_map_insert_float_float (hdd, 0.5, 1.0); egg_dbus_hash_map_insert_float_float (hdd, 2.5, 2.6); - g_assert (test_frob_invoke_test_hash_tables_sync (TEST_QUERY_INTERFACE_FROB (object_proxy), 0, /* flags */ - hss, - hoo, - hii, - hyy, - hnn, - hqq, - huu, - hbb, - hxx, - htt, - hdd, - &ret_hss, - &ret_hoo, - &ret_hii, - &ret_hyy, - &ret_hnn, - &ret_hqq, - &ret_huu, - &ret_hbb, - &ret_hxx, - &ret_htt, - &ret_hdd, - NULL, - &error)); + g_assert (test_frob_test_hash_tables_sync (TEST_QUERY_INTERFACE_FROB (object_proxy), 0, /* flags */ + hss, + hoo, + hii, + hyy, + hnn, + hqq, + huu, + hbb, + hxx, + htt, + hdd, + &ret_hss, + &ret_hoo, + &ret_hii, + &ret_hyy, + &ret_hnn, + &ret_hqq, + &ret_huu, + &ret_hbb, + &ret_hxx, + &ret_htt, + &ret_hdd, + NULL, + &error)); g_assert_no_error (error); g_object_unref (hss); @@ -1098,34 +1098,34 @@ test_hash_tables_of_arrays (void) egg_dbus_array_seq_add (site2_points, test_point_new (2020, 2021)); egg_dbus_hash_map_insert (hash_of_point_arrays, "site2", site2_points); - g_assert (test_frob_invoke_test_hash_tables_of_arrays_sync (TEST_QUERY_INTERFACE_FROB (object_proxy), - 0, /* flags */ - hsas, - hsao, - hsai, - hsay, - hsan, - hsaq, - hsau, - hsab, - hsax, - hsat, - hsad, - hash_of_point_arrays, - &ret_hsas, - &ret_hsao, - &ret_hsai, - &ret_hsay, - &ret_hsan, - &ret_hsaq, - &ret_hsau, - &ret_hsab, - &ret_hsax, - &ret_hsat, - &ret_hsad, - &ret_hash_of_point_arrays, - NULL, - &error)); + g_assert (test_frob_test_hash_tables_of_arrays_sync (TEST_QUERY_INTERFACE_FROB (object_proxy), + 0, /* flags */ + hsas, + hsao, + hsai, + hsay, + hsan, + hsaq, + hsau, + hsab, + hsax, + hsat, + hsad, + hash_of_point_arrays, + &ret_hsas, + &ret_hsao, + &ret_hsai, + &ret_hsay, + &ret_hsan, + &ret_hsaq, + &ret_hsau, + &ret_hsab, + &ret_hsax, + &ret_hsat, + &ret_hsad, + &ret_hash_of_point_arrays, + NULL, + &error)); g_assert_no_error (error); /* free data passed in */ g_object_unref (hsas); @@ -1269,12 +1269,12 @@ test_hash_table_of_structures (void) egg_dbus_hash_map_insert (hash_of_points, "beta", test_point_new (12, 12)); egg_dbus_hash_map_insert (hash_of_points, "gamma", test_point_new (14, 14)); - g_assert (test_frob_invoke_test_hash_table_of_structures_sync (TEST_QUERY_INTERFACE_FROB (object_proxy), - 0, /* flags */ - hash_of_points, - &hash_of_described_points, - NULL, - &error)); + g_assert (test_frob_test_hash_table_of_structures_sync (TEST_QUERY_INTERFACE_FROB (object_proxy), + 0, /* flags */ + hash_of_points, + &hash_of_described_points, + NULL, + &error)); g_assert_no_error (error); dpoint = egg_dbus_hash_map_lookup (hash_of_described_points, "alpha_new"); @@ -1329,12 +1329,12 @@ test_hash_table_of_hash_table_of_structures (void) egg_dbus_hash_map_insert (hash_of_points, "rup", test_point_new (3, 3)); egg_dbus_hash_map_insert (hash_of_hash_of_points, "org2", hash_of_points); - g_assert (test_frob_invoke_test_hash_table_of_hash_tables_of_structures_sync (TEST_QUERY_INTERFACE_FROB (object_proxy), - 0, /* flags */ - hash_of_hash_of_points, - &ret_hash_of_hash_of_points, - NULL, - &error)); + g_assert (test_frob_test_hash_table_of_hash_tables_of_structures_sync (TEST_QUERY_INTERFACE_FROB (object_proxy), + 0, /* flags */ + hash_of_hash_of_points, + &ret_hash_of_hash_of_points, + NULL, + &error)); g_assert_no_error (error); g_object_unref (hash_of_hash_of_points); @@ -1390,12 +1390,12 @@ test_array_of_hash_table_of_structures (void) egg_dbus_hash_map_insert (hash_of_points, "rup", test_point_new (3, 3)); egg_dbus_array_seq_add (list_of_hashes, hash_of_points); - g_assert (test_frob_invoke_test_array_of_hash_tables_of_structures_sync (TEST_QUERY_INTERFACE_FROB (object_proxy), - 0, /* flags */ - list_of_hashes, - &ret_list_of_hashes, - NULL, - &error)); + g_assert (test_frob_test_array_of_hash_tables_of_structures_sync (TEST_QUERY_INTERFACE_FROB (object_proxy), + 0, /* flags */ + list_of_hashes, + &ret_list_of_hashes, + NULL, + &error)); g_assert_no_error (error); g_object_unref (list_of_hashes); @@ -1579,36 +1579,36 @@ test_array_of_arrays (void) g_object_unref (array_uint64); g_object_unref (array_double); - g_assert (test_frob_invoke_test_array_of_arrays_sync (TEST_QUERY_INTERFACE_FROB (object_proxy), - 0, /* flags */ - array_of_array_of_string, - array_of_array_of_point, - array_of_array_of_objpath, - array_of_array_of_int32, - array_of_array_of_byte, - array_of_array_of_int16, - array_of_array_of_uint16, - array_of_array_of_uint32, - array_of_array_of_boolean, - array_of_array_of_int64, - array_of_array_of_uint64, - array_of_array_of_double, - array_of_array_of_array_of_string, - &ret_array_of_array_of_string, - &ret_array_of_array_of_point, - &ret_array_of_array_of_objpath, - &ret_array_of_array_of_int32, - &ret_array_of_array_of_byte, - &ret_array_of_array_of_int16, - &ret_array_of_array_of_uint16, - &ret_array_of_array_of_uint32, - &ret_array_of_array_of_boolean, - &ret_array_of_array_of_int64, - &ret_array_of_array_of_uint64, - &ret_array_of_array_of_double, - &ret_array_of_array_of_array_of_string, - NULL, - &error)); + g_assert (test_frob_test_array_of_arrays_sync (TEST_QUERY_INTERFACE_FROB (object_proxy), + 0, /* flags */ + array_of_array_of_string, + array_of_array_of_point, + array_of_array_of_objpath, + array_of_array_of_int32, + array_of_array_of_byte, + array_of_array_of_int16, + array_of_array_of_uint16, + array_of_array_of_uint32, + array_of_array_of_boolean, + array_of_array_of_int64, + array_of_array_of_uint64, + array_of_array_of_double, + array_of_array_of_array_of_string, + &ret_array_of_array_of_string, + &ret_array_of_array_of_point, + &ret_array_of_array_of_objpath, + &ret_array_of_array_of_int32, + &ret_array_of_array_of_byte, + &ret_array_of_array_of_int16, + &ret_array_of_array_of_uint16, + &ret_array_of_array_of_uint32, + &ret_array_of_array_of_boolean, + &ret_array_of_array_of_int64, + &ret_array_of_array_of_uint64, + &ret_array_of_array_of_double, + &ret_array_of_array_of_array_of_string, + NULL, + &error)); g_assert_no_error (error); g_object_unref (array_of_array_of_string); g_object_unref (array_of_array_of_objpath); @@ -1675,133 +1675,133 @@ test_variant_return (void) error = NULL; - g_assert (test_frob_invoke_test_variant_return_sync (TEST_QUERY_INTERFACE_FROB (object_proxy), - 0, /* flags */ - "y", - &variant, - NULL, - &error)); + g_assert (test_frob_test_variant_return_sync (TEST_QUERY_INTERFACE_FROB (object_proxy), + 0, /* flags */ + "y", + &variant, + NULL, + &error)); g_assert_no_error (error); g_assert (egg_dbus_variant_is_byte (variant)); g_assert_cmpint (egg_dbus_variant_get_byte (variant), ==, 1); g_object_unref (variant); - g_assert (test_frob_invoke_test_variant_return_sync (TEST_QUERY_INTERFACE_FROB (object_proxy), - 0, /* flags */ - "b", - &variant, - NULL, - &error)); + g_assert (test_frob_test_variant_return_sync (TEST_QUERY_INTERFACE_FROB (object_proxy), + 0, /* flags */ + "b", + &variant, + NULL, + &error)); g_assert_no_error (error); g_assert (egg_dbus_variant_is_boolean (variant)); g_assert_cmpint (egg_dbus_variant_get_boolean (variant), ==, TRUE); g_object_unref (variant); - g_assert (test_frob_invoke_test_variant_return_sync (TEST_QUERY_INTERFACE_FROB (object_proxy), - 0, /* flags */ - "n", - &variant, - NULL, - &error)); + g_assert (test_frob_test_variant_return_sync (TEST_QUERY_INTERFACE_FROB (object_proxy), + 0, /* flags */ + "n", + &variant, + NULL, + &error)); g_assert_no_error (error); g_assert (egg_dbus_variant_is_int16 (variant)); g_assert_cmpint (egg_dbus_variant_get_int16 (variant), ==, 2); g_object_unref (variant); - g_assert (test_frob_invoke_test_variant_return_sync (TEST_QUERY_INTERFACE_FROB (object_proxy), - 0, /* flags */ - "q", - &variant, - NULL, - &error)); + g_assert (test_frob_test_variant_return_sync (TEST_QUERY_INTERFACE_FROB (object_proxy), + 0, /* flags */ + "q", + &variant, + NULL, + &error)); g_assert_no_error (error); g_assert (egg_dbus_variant_is_uint16 (variant)); g_assert_cmpuint (egg_dbus_variant_get_uint16 (variant), ==, 3); g_object_unref (variant); - g_assert (test_frob_invoke_test_variant_return_sync (TEST_QUERY_INTERFACE_FROB (object_proxy), - 0, /* flags */ - "i", - &variant, - NULL, - &error)); + g_assert (test_frob_test_variant_return_sync (TEST_QUERY_INTERFACE_FROB (object_proxy), + 0, /* flags */ + "i", + &variant, + NULL, + &error)); g_assert_no_error (error); g_assert (egg_dbus_variant_is_int (variant)); g_assert_cmpint (egg_dbus_variant_get_int (variant), ==, 4); g_object_unref (variant); - g_assert (test_frob_invoke_test_variant_return_sync (TEST_QUERY_INTERFACE_FROB (object_proxy), - 0, /* flags */ - "u", - &variant, - NULL, - &error)); + g_assert (test_frob_test_variant_return_sync (TEST_QUERY_INTERFACE_FROB (object_proxy), + 0, /* flags */ + "u", + &variant, + NULL, + &error)); g_assert_no_error (error); g_assert (egg_dbus_variant_is_uint (variant)); g_assert_cmpuint (egg_dbus_variant_get_uint (variant), ==, 5); g_object_unref (variant); - g_assert (test_frob_invoke_test_variant_return_sync (TEST_QUERY_INTERFACE_FROB (object_proxy), - 0, /* flags */ - "x", - &variant, - NULL, - &error)); + g_assert (test_frob_test_variant_return_sync (TEST_QUERY_INTERFACE_FROB (object_proxy), + 0, /* flags */ + "x", + &variant, + NULL, + &error)); g_assert_no_error (error); g_assert (egg_dbus_variant_is_int64 (variant)); g_assert_cmpint (egg_dbus_variant_get_int64 (variant), ==, 6); g_object_unref (variant); - g_assert (test_frob_invoke_test_variant_return_sync (TEST_QUERY_INTERFACE_FROB (object_proxy), - 0, /* flags */ - "t", - &variant, - NULL, - &error)); + g_assert (test_frob_test_variant_return_sync (TEST_QUERY_INTERFACE_FROB (object_proxy), + 0, /* flags */ + "t", + &variant, + NULL, + &error)); g_assert_no_error (error); g_assert (egg_dbus_variant_is_uint64 (variant)); g_assert_cmpuint (egg_dbus_variant_get_uint64 (variant), ==, 7); g_object_unref (variant); - g_assert (test_frob_invoke_test_variant_return_sync (TEST_QUERY_INTERFACE_FROB (object_proxy), - 0, /* flags */ - "d", - &variant, - NULL, - &error)); + g_assert (test_frob_test_variant_return_sync (TEST_QUERY_INTERFACE_FROB (object_proxy), + 0, /* flags */ + "d", + &variant, + NULL, + &error)); g_assert_no_error (error); g_assert (egg_dbus_variant_is_double (variant)); g_assert_cmpfloat (egg_dbus_variant_get_double (variant), ==, 7.5); g_object_unref (variant); - g_assert (test_frob_invoke_test_variant_return_sync (TEST_QUERY_INTERFACE_FROB (object_proxy), - 0, /* flags */ - "s", - &variant, - NULL, - &error)); + g_assert (test_frob_test_variant_return_sync (TEST_QUERY_INTERFACE_FROB (object_proxy), + 0, /* flags */ + "s", + &variant, + NULL, + &error)); g_assert_no_error (error); g_assert (egg_dbus_variant_is_string (variant)); g_assert_cmpstr (egg_dbus_variant_get_string (variant), ==, "a string"); g_object_unref (variant); - g_assert (test_frob_invoke_test_variant_return_sync (TEST_QUERY_INTERFACE_FROB (object_proxy), - 0, /* flags */ - "o", - &variant, - NULL, - &error)); + g_assert (test_frob_test_variant_return_sync (TEST_QUERY_INTERFACE_FROB (object_proxy), + 0, /* flags */ + "o", + &variant, + NULL, + &error)); g_assert_no_error (error); g_assert (egg_dbus_variant_is_object_path (variant)); g_assert_cmpstr (egg_dbus_variant_get_object_path (variant), ==, "/some/object/path"); g_object_unref (variant); - g_assert (test_frob_invoke_test_variant_return_sync (TEST_QUERY_INTERFACE_FROB (object_proxy), - 0, /* flags */ - "ai", - &variant, - NULL, - &error)); + g_assert (test_frob_test_variant_return_sync (TEST_QUERY_INTERFACE_FROB (object_proxy), + 0, /* flags */ + "ai", + &variant, + NULL, + &error)); g_assert_no_error (error); g_assert (egg_dbus_variant_is_seq (variant)); seq = egg_dbus_variant_get_seq (variant); @@ -1810,12 +1810,12 @@ test_variant_return (void) g_assert_cmpint (seq->data.v_int[1], ==, 5); g_object_unref (variant); - g_assert (test_frob_invoke_test_variant_return_sync (TEST_QUERY_INTERFACE_FROB (object_proxy), - 0, /* flags */ - "as", - &variant, - NULL, - &error)); + g_assert (test_frob_test_variant_return_sync (TEST_QUERY_INTERFACE_FROB (object_proxy), + 0, /* flags */ + "as", + &variant, + NULL, + &error)); g_assert_no_error (error); g_assert (egg_dbus_variant_is_string_array (variant)); strv = egg_dbus_variant_get_string_array (variant); @@ -1824,12 +1824,12 @@ test_variant_return (void) g_assert_cmpstr (strv[1], ==, "another string"); g_object_unref (variant); - g_assert (test_frob_invoke_test_variant_return_sync (TEST_QUERY_INTERFACE_FROB (object_proxy), - 0, /* flags */ - "point", - &variant, - NULL, - &error)); + g_assert (test_frob_test_variant_return_sync (TEST_QUERY_INTERFACE_FROB (object_proxy), + 0, /* flags */ + "point", + &variant, + NULL, + &error)); g_assert_no_error (error); g_assert (egg_dbus_variant_is_structure (variant)); point = TEST_POINT (egg_dbus_variant_get_structure (variant)); @@ -1837,12 +1837,12 @@ test_variant_return (void) g_assert_cmpint (test_point_get_y (point), ==, 2); g_object_unref (variant); - g_assert (test_frob_invoke_test_variant_return_sync (TEST_QUERY_INTERFACE_FROB (object_proxy), - 0, /* flags */ - "dpoint", - &variant, - NULL, - &error)); + g_assert (test_frob_test_variant_return_sync (TEST_QUERY_INTERFACE_FROB (object_proxy), + 0, /* flags */ + "dpoint", + &variant, + NULL, + &error)); g_assert_no_error (error); g_assert (egg_dbus_variant_is_structure (variant)); dpoint = TEST_DESCRIBED_POINT (egg_dbus_variant_get_structure (variant)); @@ -1852,12 +1852,12 @@ test_variant_return (void) g_assert_cmpint (test_point_get_x (point), ==, 3); g_assert_cmpint (test_point_get_y (point), ==, 4); - g_assert (test_frob_invoke_test_variant_return_sync (TEST_QUERY_INTERFACE_FROB (object_proxy), - 0, /* flags */ - "hash_of_points", - &variant, - NULL, - &error)); + g_assert (test_frob_test_variant_return_sync (TEST_QUERY_INTERFACE_FROB (object_proxy), + 0, /* flags */ + "hash_of_points", + &variant, + NULL, + &error)); g_assert_no_error (error); g_assert (egg_dbus_variant_is_map (variant)); hash_of_points = egg_dbus_variant_get_map (variant); @@ -1876,12 +1876,12 @@ test_variant_return (void) g_assert_cmpint (test_point_get_y (point), ==, 8); g_object_unref (variant); - g_assert (test_frob_invoke_test_variant_return_sync (TEST_QUERY_INTERFACE_FROB (object_proxy), - 0, /* flags */ - "unregistered_struct", - &variant, - NULL, - &error)); + g_assert (test_frob_test_variant_return_sync (TEST_QUERY_INTERFACE_FROB (object_proxy), + 0, /* flags */ + "unregistered_struct", + &variant, + NULL, + &error)); g_assert_no_error (error); structure = egg_dbus_variant_get_structure (variant); @@ -1916,12 +1916,12 @@ test_another_interface (void) error = NULL; - g_assert (test_tweak_invoke_i_can_haz_greetingz_sync (TEST_QUERY_INTERFACE_TWEAK (object_proxy), - 0, /* flags */ - "Sup?", - &s, - NULL, - &error)); + g_assert (test_tweak_i_can_haz_greetingz_sync (TEST_QUERY_INTERFACE_TWEAK (object_proxy), + 0, /* flags */ + "Sup?", + &s, + NULL, + &error)); g_assert_no_error (error); g_assert_cmpstr (s, ==, "Word. You haz greetz 'Sup?'. KTHXBYE!"); g_free (s); @@ -1939,10 +1939,10 @@ rw_property_changes_cb (TestTweak *instance, error = NULL; - g_assert (test_tweak_invoke_block_until_rw_property_changes_finish (instance, - &new_prop_value, - res, - &error)); + g_assert (test_tweak_block_until_rw_property_changes_finish (instance, + &new_prop_value, + res, + &error)); g_assert_no_error (error); g_assert_cmpstr (new_prop_value, ==, "A new property value"); *received_async_reply = TRUE; @@ -2064,11 +2064,11 @@ test_properties (void) * this. */ received_async_reply = FALSE; - test_tweak_invoke_block_until_rw_property_changes (TEST_QUERY_INTERFACE_TWEAK (object_proxy), - EGG_DBUS_CALL_FLAGS_BLOCK_IN_MAINLOOP, - NULL, - (GAsyncReadyCallback) rw_property_changes_cb, - &received_async_reply); + test_tweak_block_until_rw_property_changes (TEST_QUERY_INTERFACE_TWEAK (object_proxy), + EGG_DBUS_CALL_FLAGS_BLOCK_IN_MAINLOOP, + NULL, + (GAsyncReadyCallback) rw_property_changes_cb, + &received_async_reply); g_object_set (TEST_QUERY_INTERFACE_TWEAK (object_proxy), "some-read-write-property", "A new property value", NULL); @@ -2088,24 +2088,24 @@ test_properties (void) "notify::foo", (GCallback) foo_notify_cb, &got_foo_notify_event); - g_assert (test_tweak_invoke_change_readable_property_sync (TEST_QUERY_INTERFACE_TWEAK (object_proxy), - EGG_DBUS_CALL_FLAGS_BLOCK_IN_MAINLOOP, - "bar is the new foo", - NULL, - &error)); + g_assert (test_tweak_change_readable_property_sync (TEST_QUERY_INTERFACE_TWEAK (object_proxy), + EGG_DBUS_CALL_FLAGS_BLOCK_IN_MAINLOOP, + "bar is the new foo", + NULL, + &error)); g_assert_no_error (error); g_assert (got_foo_notify_event == TRUE); g_signal_handlers_disconnect_by_func (object_proxy, foo_notify_cb, &got_foo_notify_event); /* Check that we return the right error on unknown properties on known interfaces */ variant = NULL; - g_assert(!egg_dbus_properties_invoke_get_sync (EGG_DBUS_QUERY_INTERFACE_PROPERTIES (object_proxy), - 0, /* flags */ - "com.example.Tweak", - "NonexistantProperty", - &variant, - NULL, - &error)); + g_assert(!egg_dbus_properties_get_sync (EGG_DBUS_QUERY_INTERFACE_PROPERTIES (object_proxy), + 0, /* flags */ + "com.example.Tweak", + "NonexistantProperty", + &variant, + NULL, + &error)); g_assert_error (error, EGG_DBUS_ERROR, EGG_DBUS_ERROR_FAILED); g_assert_cmpstr (error->message, ==, "Remote Exception invoking org.freedesktop.DBus.Properties.Get() on /com/example/TestObject at name com.example.TestService: org.gtk.EggDBus.Error.Failed: Given property does not exist on the given interface"); g_assert (variant == NULL); @@ -2114,13 +2114,13 @@ test_properties (void) /* Check that we return the right error on unknown properties on unknown interfaces */ variant = NULL; - g_assert(!egg_dbus_properties_invoke_get_sync (EGG_DBUS_QUERY_INTERFACE_PROPERTIES (object_proxy), - 0, /* flags */ - "com.example.NonexistantInterface", - "NonexistantProperty", - &variant, - NULL, - &error)); + g_assert(!egg_dbus_properties_get_sync (EGG_DBUS_QUERY_INTERFACE_PROPERTIES (object_proxy), + 0, /* flags */ + "com.example.NonexistantInterface", + "NonexistantProperty", + &variant, + NULL, + &error)); g_assert_error (error, EGG_DBUS_ERROR, EGG_DBUS_ERROR_FAILED); g_assert_cmpstr (error->message, ==, "Remote Exception invoking org.freedesktop.DBus.Properties.Get() on /com/example/TestObject at name com.example.TestService: org.gtk.EggDBus.Error.Failed: Object does not implement given interface"); g_assert (variant == NULL); @@ -2129,12 +2129,12 @@ test_properties (void) /* ditto for GetAll() */ property_bag = NULL; - g_assert(!egg_dbus_properties_invoke_get_all_sync (EGG_DBUS_QUERY_INTERFACE_PROPERTIES (object_proxy), - 0, /* flags */ - "com.example.NonexistantInterface", - &property_bag, - NULL, - &error)); + g_assert(!egg_dbus_properties_get_all_sync (EGG_DBUS_QUERY_INTERFACE_PROPERTIES (object_proxy), + 0, /* flags */ + "com.example.NonexistantInterface", + &property_bag, + NULL, + &error)); g_assert_error (error, EGG_DBUS_ERROR, EGG_DBUS_ERROR_FAILED); g_assert_cmpstr (error->message, ==, "Remote Exception invoking org.freedesktop.DBus.Properties.GetAll() on /com/example/TestObject at name com.example.TestService: org.gtk.EggDBus.Error.Failed: Object does not implement given interface"); g_assert (property_bag == NULL); @@ -2143,13 +2143,13 @@ test_properties (void) /* Check that we return the right error on setting an unknown property on a known interfaces */ variant = egg_dbus_variant_new_for_byte (42); - g_assert(!egg_dbus_properties_invoke_set_sync (EGG_DBUS_QUERY_INTERFACE_PROPERTIES (object_proxy), - 0, /* flags */ - "com.example.Tweak", - "NonexistantProperty", - variant, - NULL, - &error)); + g_assert(!egg_dbus_properties_set_sync (EGG_DBUS_QUERY_INTERFACE_PROPERTIES (object_proxy), + 0, /* flags */ + "com.example.Tweak", + "NonexistantProperty", + variant, + NULL, + &error)); g_assert_error (error, EGG_DBUS_ERROR, EGG_DBUS_ERROR_FAILED); g_assert_cmpstr (error->message, ==, "Remote Exception invoking org.freedesktop.DBus.Properties.Set() on /com/example/TestObject at name com.example.TestService: org.gtk.EggDBus.Error.Failed: Given property does not exist on the given interface"); g_error_free (error); @@ -2158,13 +2158,13 @@ test_properties (void) /* Check that we return the right error on setting an unknown property on a unknown interfaces */ variant = egg_dbus_variant_new_for_byte (42); - g_assert(!egg_dbus_properties_invoke_set_sync (EGG_DBUS_QUERY_INTERFACE_PROPERTIES (object_proxy), - 0, /* flags */ - "com.example.NonexistantInterface", - "NonexistantProperty", - variant, - NULL, - &error)); + g_assert(!egg_dbus_properties_set_sync (EGG_DBUS_QUERY_INTERFACE_PROPERTIES (object_proxy), + 0, /* flags */ + "com.example.NonexistantInterface", + "NonexistantProperty", + variant, + NULL, + &error)); g_assert_error (error, EGG_DBUS_ERROR, EGG_DBUS_ERROR_FAILED); g_assert_cmpstr (error->message, ==, "Remote Exception invoking org.freedesktop.DBus.Properties.Set() on /com/example/TestObject at name com.example.TestService: org.gtk.EggDBus.Error.Failed: Object does not implement given interface"); g_error_free (error); @@ -2307,12 +2307,12 @@ newz_notifz_signal_handler_deadlock_test (TestTweak *tweak, /* test sync method invocation in signal handler */ error = NULL; - g_assert (test_frob_invoke_hello_world_sync (TEST_QUERY_INTERFACE_FROB (object_proxy), - 0, /* flags */ - "Hi!", - &s, - NULL, - &error)); + g_assert (test_frob_hello_world_sync (TEST_QUERY_INTERFACE_FROB (object_proxy), + 0, /* flags */ + "Hi!", + &s, + NULL, + &error)); g_assert_no_error (error); g_assert_cmpstr (s, ==, "You greeted me with 'Hi!'. Thanks!"); g_free (s); @@ -2357,22 +2357,22 @@ test_signals (void) (GCallback) newz_notifz_signal_handler, &twiddle_signal_ret); - g_assert (test_tweak_invoke_broadcastz_newz_sync (TEST_QUERY_INTERFACE_TWEAK (object_proxy), - EGG_DBUS_CALL_FLAGS_BLOCK_IN_MAINLOOP, - "Quick, there's a C compiler fire sale", - NULL, - &error)); + g_assert (test_tweak_broadcastz_newz_sync (TEST_QUERY_INTERFACE_TWEAK (object_proxy), + EGG_DBUS_CALL_FLAGS_BLOCK_IN_MAINLOOP, + "Quick, there's a C compiler fire sale", + NULL, + &error)); g_assert_no_error (error); g_assert (twiddle_signal_ret == NULL); g_assert_cmpstr (tweak_signal_ret, ==, "Word. Broadcastz 'Quick, there's a C compiler fire sale'. KTHXBYE!"); g_free (tweak_signal_ret); tweak_signal_ret = NULL; - g_assert (test_twiddle_invoke_broadcastz_newz_sync (TEST_QUERY_INTERFACE_TWIDDLE (object_proxy), - EGG_DBUS_CALL_FLAGS_BLOCK_IN_MAINLOOP, - "Diamonds in the mine", - NULL, - &error)); + g_assert (test_twiddle_broadcastz_newz_sync (TEST_QUERY_INTERFACE_TWIDDLE (object_proxy), + EGG_DBUS_CALL_FLAGS_BLOCK_IN_MAINLOOP, + "Diamonds in the mine", + NULL, + &error)); g_assert_no_error (error); g_assert (tweak_signal_ret == NULL); g_assert_cmpstr (twiddle_signal_ret, ==, "Sez 'Diamonds in the mine'. KTHXBYE!"); @@ -2395,11 +2395,11 @@ test_signals (void) "newz-notifz", (GCallback) newz_notifz_signal_handler_deadlock_test, &twiddle_signal_ret); - g_assert (test_twiddle_invoke_broadcastz_newz_sync (TEST_QUERY_INTERFACE_TWIDDLE (object_proxy), - EGG_DBUS_CALL_FLAGS_BLOCK_IN_MAINLOOP, - "Deadlock test", - NULL, - &error)); + g_assert (test_twiddle_broadcastz_newz_sync (TEST_QUERY_INTERFACE_TWIDDLE (object_proxy), + EGG_DBUS_CALL_FLAGS_BLOCK_IN_MAINLOOP, + "Deadlock test", + NULL, + &error)); g_assert_no_error (error); g_assert_cmpstr (twiddle_signal_ret, ==, "Sez 'Deadlock test'. KTHXBYE!"); g_free (twiddle_signal_ret); @@ -2426,10 +2426,10 @@ test_signals (void) (GCallback) frob_signal_with_struct_and_hash_cb, &struct_and_hash_signal_received); - g_assert (test_frob_invoke_emit_test_signals_sync (TEST_QUERY_INTERFACE_FROB (object_proxy), - EGG_DBUS_CALL_FLAGS_BLOCK_IN_MAINLOOP, - NULL, - &error)); + g_assert (test_frob_emit_test_signals_sync (TEST_QUERY_INTERFACE_FROB (object_proxy), + EGG_DBUS_CALL_FLAGS_BLOCK_IN_MAINLOOP, + NULL, + &error)); g_assert_no_error (error); g_assert (primitive_types_signal_received == TRUE); @@ -2491,11 +2491,11 @@ test_name_owner_changed (void) g_assert (owner != NULL); /* check that the server agrees */ - g_assert (test_tweak_invoke_get_server_unique_name_sync (TEST_QUERY_INTERFACE_TWEAK (object_proxy), - 0, /* flags */ - &owner_from_server, - NULL, - &error)); + g_assert (test_tweak_get_server_unique_name_sync (TEST_QUERY_INTERFACE_TWEAK (object_proxy), + 0, /* flags */ + &owner_from_server, + NULL, + &error)); g_assert_no_error (error); g_assert_cmpstr (owner, ==, owner_from_server); g_free (owner); @@ -2712,9 +2712,9 @@ long_running_method_expect_cancelled_cb (EggDBusConnection *connection, GError *error; error = NULL; - g_assert (!test_tweak_invoke_long_running_method_finish (TEST_QUERY_INTERFACE_TWEAK (object_proxy), - res, - &error)); + g_assert (!test_tweak_long_running_method_finish (TEST_QUERY_INTERFACE_TWEAK (object_proxy), + res, + &error)); g_assert_error (error, EGG_DBUS_ERROR, EGG_DBUS_ERROR_CANCELLED); g_error_free (error); @@ -2752,12 +2752,12 @@ test_cancellation (void) /* check cancellation works through returned pending_call_id's */ got_callback = FALSE; - pending_call_id = test_tweak_invoke_long_running_method (TEST_QUERY_INTERFACE_TWEAK (object_proxy), - 0, /* flags */ - 1500, - NULL, - (GAsyncReadyCallback) long_running_method_expect_cancelled_cb, - &got_callback); + pending_call_id = test_tweak_long_running_method (TEST_QUERY_INTERFACE_TWEAK (object_proxy), + 0, /* flags */ + 1500, + NULL, + (GAsyncReadyCallback) long_running_method_expect_cancelled_cb, + &got_callback); g_timeout_add (500, cancel_through_pending_call_id_timer_cb, GUINT_TO_POINTER (pending_call_id)); @@ -2767,12 +2767,12 @@ test_cancellation (void) /* check cancellation works through GCancellable */ got_callback = FALSE; cancellable = g_cancellable_new (); - test_tweak_invoke_long_running_method (TEST_QUERY_INTERFACE_TWEAK (object_proxy), - 0, /* flags */ - 1500, - cancellable, - (GAsyncReadyCallback) long_running_method_expect_cancelled_cb, - &got_callback); + test_tweak_long_running_method (TEST_QUERY_INTERFACE_TWEAK (object_proxy), + 0, /* flags */ + 1500, + cancellable, + (GAsyncReadyCallback) long_running_method_expect_cancelled_cb, + &got_callback); g_timeout_add (500, cancel_through_g_cancellable_timer_cb, cancellable); @@ -2796,11 +2796,11 @@ test_timeouts (void) * and the default time out is 25 seconds. */ error = NULL; - g_assert (!test_tweak_invoke_long_running_method_sync (TEST_QUERY_INTERFACE_TWEAK (object_proxy), - 0, /* flags */ - 30 * 1000, - NULL, - &error)); + g_assert (!test_tweak_long_running_method_sync (TEST_QUERY_INTERFACE_TWEAK (object_proxy), + 0, /* flags */ + 30 * 1000, + NULL, + &error)); g_assert_error (error, EGG_DBUS_ERROR, EGG_DBUS_ERROR_NO_REPLY); g_error_free (error); @@ -2808,11 +2808,11 @@ test_timeouts (void) * so the default timeout should be ignored. */ error = NULL; - g_assert (test_tweak_invoke_long_running_method_sync (TEST_QUERY_INTERFACE_TWEAK (object_proxy), - EGG_DBUS_CALL_FLAGS_TIMEOUT_NONE, - 30 * 1000, - NULL, - &error)); + g_assert (test_tweak_long_running_method_sync (TEST_QUERY_INTERFACE_TWEAK (object_proxy), + EGG_DBUS_CALL_FLAGS_TIMEOUT_NONE, + 30 * 1000, + NULL, + &error)); g_assert_no_error (error); } @@ -2842,34 +2842,34 @@ test_error_reporting (void) * proper D-Bus error names as specified by the nick-name. */ error = NULL; - g_assert (!test_tweak_invoke_return_gerror_sync (TEST_QUERY_INTERFACE_TWEAK (object_proxy), - 0, /* flags */ - g_quark_to_string (EGG_DBUS_ERROR), - EGG_DBUS_ERROR_TIMED_OUT, - NULL, - &error)); + g_assert (!test_tweak_return_gerror_sync (TEST_QUERY_INTERFACE_TWEAK (object_proxy), + 0, /* flags */ + g_quark_to_string (EGG_DBUS_ERROR), + EGG_DBUS_ERROR_TIMED_OUT, + NULL, + &error)); g_assert_error (error, EGG_DBUS_ERROR, EGG_DBUS_ERROR_TIMED_OUT); g_assert_cmpstr (error->message, ==, "Remote Exception invoking com.example.Tweak.ReturnGError() on /com/example/TestObject at name com.example.TestService: org.freedesktop.DBus.Error.TimedOut: This is the error you requested (domain='EggDBusError', error_code=23)."); g_error_free (error); error = NULL; - g_assert (!test_tweak_invoke_return_gerror_sync (TEST_QUERY_INTERFACE_TWEAK (object_proxy), - 0, /* flags */ - g_quark_to_string (G_KEY_FILE_ERROR), - G_KEY_FILE_ERROR_GROUP_NOT_FOUND, /* Free the group. Nuke the kernel! */ - NULL, - &error)); + g_assert (!test_tweak_return_gerror_sync (TEST_QUERY_INTERFACE_TWEAK (object_proxy), + 0, /* flags */ + g_quark_to_string (G_KEY_FILE_ERROR), + G_KEY_FILE_ERROR_GROUP_NOT_FOUND, /* Free the group. Nuke the kernel! */ + NULL, + &error)); g_assert_error (error, G_KEY_FILE_ERROR, G_KEY_FILE_ERROR_GROUP_NOT_FOUND); g_assert_cmpstr (error->message, ==, "Remote Exception invoking com.example.Tweak.ReturnGError() on /com/example/TestObject at name com.example.TestService: org.gtk.EggDBus.UnmappedGError.Quark0x672d6b65792d66696c652d6572726f722d717561726b.Code4: This is the error you requested (domain='g-key-file-error-quark', error_code=4)."); g_error_free (error); error = NULL; - g_assert (!test_tweak_invoke_return_gerror_sync (TEST_QUERY_INTERFACE_TWEAK (object_proxy), - 0, /* flags */ - g_quark_to_string (G_IO_ERROR), - G_IO_ERROR_WOULD_RECURSE, - NULL, - &error)); + g_assert (!test_tweak_return_gerror_sync (TEST_QUERY_INTERFACE_TWEAK (object_proxy), + 0, /* flags */ + g_quark_to_string (G_IO_ERROR), + G_IO_ERROR_WOULD_RECURSE, + NULL, + &error)); g_assert_error (error, G_IO_ERROR, G_IO_ERROR_WOULD_RECURSE); g_assert_cmpstr (error->message, ==, "Remote Exception invoking com.example.Tweak.ReturnGError() on /com/example/TestObject at name com.example.TestService: org.gtk.EggDBus.UnmappedGError.Quark0x672d696f2d6572726f722d717561726b.Code25: This is the error you requested (domain='g-io-error-quark', error_code=25)."); g_error_free (error); @@ -2922,12 +2922,12 @@ test_ctypes(void) (GCallback) signal_with_ctype_cb, &got_signal); some_value = 42; - g_assert (test_tweak_invoke_method_with_ctypes_sync (TEST_QUERY_INTERFACE_TWEAK (object_proxy), - EGG_DBUS_CALL_FLAGS_BLOCK_IN_MAINLOOP, - some_value, - &some_better_value, - NULL, - &error)); + g_assert (test_tweak_method_with_ctypes_sync (TEST_QUERY_INTERFACE_TWEAK (object_proxy), + EGG_DBUS_CALL_FLAGS_BLOCK_IN_MAINLOOP, + some_value, + &some_better_value, + NULL, + &error)); g_assert_no_error (error); g_assert_cmpint (some_better_value, ==, some_value + 1); g_assert (got_signal == TRUE); @@ -2965,11 +2965,11 @@ test_user_supplied_structs (void) /* Note, I'm actually not religious; it's just that this whole * god-thing is reasonably well-understood so it's a good example. */ - g_assert (test_twiddle_invoke_get_most_powerful_subject_sync (TEST_QUERY_INTERFACE_TWIDDLE (object_proxy), - 0, /* call_flags */ - &subject, - NULL, - &error)); + g_assert (test_twiddle_get_most_powerful_subject_sync (TEST_QUERY_INTERFACE_TWIDDLE (object_proxy), + 0, /* call_flags */ + &subject, + NULL, + &error)); g_assert_no_error (error); g_assert (TEST_IS_SUBJECT (subject)); g_assert_cmpint (test_subject_get_kind (subject), ==, TEST_SUBJECT_KIND_DEITY); @@ -2978,11 +2978,11 @@ test_user_supplied_structs (void) g_assert_cmpstr (test_subject_get_favorite_color (subject), ==, "infrared"); g_object_unref (subject); /* sacrilegious! sue me! */ - g_assert (test_twiddle_invoke_get_all_subjects_sync (TEST_QUERY_INTERFACE_TWIDDLE (object_proxy), - 0, /* call_flags */ - &list, - NULL, - &error)); + g_assert (test_twiddle_get_all_subjects_sync (TEST_QUERY_INTERFACE_TWIDDLE (object_proxy), + 0, /* call_flags */ + &list, + NULL, + &error)); g_assert_no_error (error); g_assert_cmpint (list->size, ==, 4); @@ -3119,14 +3119,14 @@ test_register_interface (void) egg_dbus_interface_node_info_free (node_info); /* now ask the server to register Frob interface at /foo/bar0 */ - g_assert (test_twiddle_invoke_register_interface_sync (TEST_QUERY_INTERFACE_TWIDDLE (object_proxy), - 0, /* call_flags */ - "/foo/bar0", - TRUE, - FALSE, - FALSE, - NULL, - &error)); + g_assert (test_twiddle_register_interface_sync (TEST_QUERY_INTERFACE_TWIDDLE (object_proxy), + 0, /* call_flags */ + "/foo/bar0", + TRUE, + FALSE, + FALSE, + NULL, + &error)); g_assert_no_error (error); /* we should now have a node "bar0" as a child at "/foo"; verify that */ @@ -3157,12 +3157,12 @@ test_register_interface (void) egg_dbus_interface_node_info_free (node_info); /* various misc checks that the /foo/bar0 object works */ - g_assert (test_frob_invoke_hello_world_sync (TEST_QUERY_INTERFACE_FROB (slash_foo_bar0_object_proxy), - 0, /* flags */ - "Export Dude", - &s, - NULL, - &error)); + g_assert (test_frob_hello_world_sync (TEST_QUERY_INTERFACE_FROB (slash_foo_bar0_object_proxy), + 0, /* flags */ + "Export Dude", + &s, + NULL, + &error)); g_assert_no_error (error); g_assert_cmpstr (s, ==, "You greeted me with 'Export Dude'. Thanks!"); g_free (s); @@ -3173,14 +3173,14 @@ test_register_interface (void) g_free (s); /* now ask the server to register an *additional* interface, the com.example.Tweak interface, at the same path */ - g_assert (test_twiddle_invoke_register_interface_sync (TEST_QUERY_INTERFACE_TWIDDLE (object_proxy), - 0, /* call_flags */ - "/foo/bar0", - FALSE, - TRUE, - FALSE, - NULL, - &error)); + g_assert (test_twiddle_register_interface_sync (TEST_QUERY_INTERFACE_TWIDDLE (object_proxy), + 0, /* call_flags */ + "/foo/bar0", + FALSE, + TRUE, + FALSE, + NULL, + &error)); g_assert_no_error (error); /* check there's now 2 + 3 = 5 interfaces registered */ @@ -3196,12 +3196,12 @@ test_register_interface (void) egg_dbus_interface_node_info_free (node_info); /* misc checks on the object */ - g_assert (test_tweak_invoke_i_can_haz_greetingz_sync (TEST_QUERY_INTERFACE_TWEAK (slash_foo_bar0_object_proxy), - 0, /* flags */ - "Exporting, Sup?", - &s, - NULL, - &error)); + g_assert (test_tweak_i_can_haz_greetingz_sync (TEST_QUERY_INTERFACE_TWEAK (slash_foo_bar0_object_proxy), + 0, /* flags */ + "Exporting, Sup?", + &s, + NULL, + &error)); g_assert_no_error (error); g_assert_cmpstr (s, ==, "Word. You haz greetz 'Exporting, Sup?'. KTHXBYE!"); g_free (s); @@ -3236,14 +3236,14 @@ test_register_interface (void) * (Obviously we need to manually call egg_dbus_object_proxy_invalidate_properties() * since there's no signals (yet?) for when objects/interfaces gets added/removed.) */ - g_assert (test_twiddle_invoke_register_interface_sync (TEST_QUERY_INTERFACE_TWIDDLE (object_proxy), - 0, /* call_flags */ - "/foo/bar0", - FALSE, - TRUE, - FALSE, - NULL, - &error)); + g_assert (test_twiddle_register_interface_sync (TEST_QUERY_INTERFACE_TWIDDLE (object_proxy), + 0, /* call_flags */ + "/foo/bar0", + FALSE, + TRUE, + FALSE, + NULL, + &error)); g_assert_no_error (error); egg_dbus_object_proxy_invalidate_properties (slash_foo_bar0_object_proxy); g_object_get (TEST_QUERY_INTERFACE_TWEAK (slash_foo_bar0_object_proxy), @@ -3253,14 +3253,14 @@ test_register_interface (void) g_free (s); /* Now add yet another interface, the com.example.Twiddle interface, at the same path */ - g_assert (test_twiddle_invoke_register_interface_sync (TEST_QUERY_INTERFACE_TWIDDLE (object_proxy), - 0, /* call_flags */ - "/foo/bar0", - FALSE, - FALSE, - TRUE, - NULL, - &error)); + g_assert (test_twiddle_register_interface_sync (TEST_QUERY_INTERFACE_TWIDDLE (object_proxy), + 0, /* call_flags */ + "/foo/bar0", + FALSE, + FALSE, + TRUE, + NULL, + &error)); g_assert_no_error (error); /* check there's now 3 + 3 = 6 interfaces registered */ @@ -3276,14 +3276,14 @@ test_register_interface (void) egg_dbus_interface_node_info_free (node_info); /* now ask the server to unregister the Frob interface */ - g_assert (test_twiddle_invoke_unregister_interface_sync (TEST_QUERY_INTERFACE_TWIDDLE (object_proxy), - 0, /* call_flags */ - "/foo/bar0", - TRUE, - FALSE, - FALSE, - NULL, - &error)); + g_assert (test_twiddle_unregister_interface_sync (TEST_QUERY_INTERFACE_TWIDDLE (object_proxy), + 0, /* call_flags */ + "/foo/bar0", + TRUE, + FALSE, + FALSE, + NULL, + &error)); g_assert_no_error (error); /* check only 2 + 3 = 5 interfaces are registered */ @@ -3302,11 +3302,11 @@ test_register_interface (void) * that a) egg_dbus_connection_lookup_interface(); and b) unreffing registered interface stubs * will automatically cause them to be unregistered... */ - g_assert (test_twiddle_invoke_unregister_all_interfaces_sync (TEST_QUERY_INTERFACE_TWIDDLE (object_proxy), - 0, /* call_flags */ - "/foo/bar0", - NULL, - &error)); + g_assert (test_twiddle_unregister_all_interfaces_sync (TEST_QUERY_INTERFACE_TWIDDLE (object_proxy), + 0, /* call_flags */ + "/foo/bar0", + NULL, + &error)); g_assert_no_error (error); /* check that zero interfaces are now registered */ diff --git a/src/tests/testserver.c b/src/tests/testserver.c index 11f33bd..afe7d91 100644 --- a/src/tests/testserver.c +++ b/src/tests/testserver.c @@ -52,13 +52,13 @@ main (int argc, char *argv[]) connection = egg_dbus_connection_get_for_bus (EGG_DBUS_BUS_TYPE_SESSION); - if (!egg_dbus_bus_invoke_request_name_sync (egg_dbus_connection_get_bus (connection), - 0, /* call flags */ - "com.example.TestService", - EGG_DBUS_REQUEST_NAME_FLAGS_NONE, - &request_name_reply, - NULL, - &error)) + if (!egg_dbus_bus_request_name_sync (egg_dbus_connection_get_bus (connection), + 0, /* call flags */ + "com.example.TestService", + EGG_DBUS_REQUEST_NAME_FLAGS_NONE, + &request_name_reply, + NULL, + &error)) { g_warning ("error: %s", error->message); g_error_free (error); |