From 1b8630998ec0f5e9d401e2c2030ef1902e3e5ab2 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Mon, 10 Oct 2011 15:14:02 -0400 Subject: [PATCH] Adapt addressbook/libegdbus to the new ESource API. --- addressbook/libegdbus/e-gdbus-book.c | 44 ------------------------------------ addressbook/libegdbus/e-gdbus-book.h | 8 ------- 2 files changed, 52 deletions(-) diff --git a/addressbook/libegdbus/e-gdbus-book.c b/addressbook/libegdbus/e-gdbus-book.c index 367e4a1..2c28388 100644 --- a/addressbook/libegdbus/e-gdbus-book.c +++ b/addressbook/libegdbus/e-gdbus-book.c @@ -42,7 +42,6 @@ enum __BACKEND_ERROR_SIGNAL, __READONLY_SIGNAL, __ONLINE_SIGNAL, - __AUTH_REQUIRED_SIGNAL, __OPENED_SIGNAL, __BACKEND_PROPERTY_CHANGED_SIGNAL, __OPEN_METHOD, @@ -69,7 +68,6 @@ enum __SET_BACKEND_PROPERTY_DONE_SIGNAL, __GET_VIEW_METHOD, __GET_VIEW_DONE_SIGNAL, - __AUTHENTICATE_USER_METHOD, __CANCEL_OPERATION_METHOD, __CANCEL_ALL_METHOD, __CLOSE_METHOD, @@ -125,8 +123,6 @@ E_DECLARE_GDBUS_SIGNAL_EMISSION_HOOK_BOOLEAN (GDBUS_BOOK_INTERFACE_NAME, E_DECLARE_GDBUS_SIGNAL_EMISSION_HOOK_BOOLEAN (GDBUS_BOOK_INTERFACE_NAME, online) E_DECLARE_GDBUS_SIGNAL_EMISSION_HOOK_STRV (GDBUS_BOOK_INTERFACE_NAME, - auth_required) -E_DECLARE_GDBUS_SIGNAL_EMISSION_HOOK_STRV (GDBUS_BOOK_INTERFACE_NAME, opened) E_DECLARE_GDBUS_SIGNAL_EMISSION_HOOK_STRV (GDBUS_BOOK_INTERFACE_NAME, backend_property_changed) @@ -169,7 +165,6 @@ e_gdbus_book_default_init (EGdbusBookIface *iface) E_INIT_GDBUS_SIGNAL_STRING (EGdbusBookIface, "backend_error", backend_error, __BACKEND_ERROR_SIGNAL) E_INIT_GDBUS_SIGNAL_BOOLEAN (EGdbusBookIface, "readonly", readonly, __READONLY_SIGNAL) E_INIT_GDBUS_SIGNAL_BOOLEAN (EGdbusBookIface, "online", online, __ONLINE_SIGNAL) - E_INIT_GDBUS_SIGNAL_STRV (EGdbusBookIface, "auth_required", auth_required, __AUTH_REQUIRED_SIGNAL) E_INIT_GDBUS_SIGNAL_STRV (EGdbusBookIface, "opened", opened, __OPENED_SIGNAL) E_INIT_GDBUS_SIGNAL_STRV (EGdbusBookIface, "backend_property_changed", backend_property_changed, __BACKEND_PROPERTY_CHANGED_SIGNAL) @@ -186,7 +181,6 @@ e_gdbus_book_default_init (EGdbusBookIface *iface) E_INIT_GDBUS_METHOD_ASYNC_STRING__STRING(EGdbusBookIface, "get_backend_property", get_backend_property, __GET_BACKEND_PROPERTY_METHOD, __GET_BACKEND_PROPERTY_DONE_SIGNAL) E_INIT_GDBUS_METHOD_ASYNC_STRV__VOID (EGdbusBookIface, "set_backend_property", set_backend_property, __SET_BACKEND_PROPERTY_METHOD, __SET_BACKEND_PROPERTY_DONE_SIGNAL) E_INIT_GDBUS_METHOD_ASYNC_STRING__STRING(EGdbusBookIface, "get_view", get_view, __GET_VIEW_METHOD, __GET_VIEW_DONE_SIGNAL) - E_INIT_GDBUS_METHOD_STRV (EGdbusBookIface, "authenticate_user", authenticate_user, __AUTHENTICATE_USER_METHOD) E_INIT_GDBUS_METHOD_UINT (EGdbusBookIface, "cancel_operation", cancel_operation, __CANCEL_OPERATION_METHOD) E_INIT_GDBUS_METHOD_VOID (EGdbusBookIface, "cancel_all", cancel_all, __CANCEL_ALL_METHOD) E_INIT_GDBUS_METHOD_VOID (EGdbusBookIface, "close", close, __CLOSE_METHOD) @@ -566,33 +560,6 @@ e_gdbus_book_call_get_view_sync (GDBusProxy *proxy, } void -e_gdbus_book_call_authenticate_user (GDBusProxy *proxy, - const gchar * const *in_credentials, - GCancellable *cancellable, - GAsyncReadyCallback callback, - gpointer user_data) -{ - e_gdbus_proxy_method_call_strv ("authenticate_user", proxy, in_credentials, cancellable, callback, user_data); -} - -gboolean -e_gdbus_book_call_authenticate_user_finish (GDBusProxy *proxy, - GAsyncResult *result, - GError **error) -{ - return e_gdbus_proxy_method_call_finish_void (proxy, result, error); -} - -gboolean -e_gdbus_book_call_authenticate_user_sync (GDBusProxy *proxy, - const gchar * const *in_credentials, - GCancellable *cancellable, - GError **error) -{ - return e_gdbus_proxy_method_call_sync_strv__void ("authenticate_user", proxy, in_credentials, cancellable, error); -} - -void e_gdbus_book_call_cancel_operation (GDBusProxy *proxy, guint in_opid, GCancellable *cancellable, @@ -739,13 +706,6 @@ e_gdbus_book_emit_online (EGdbusBook *object, } void -e_gdbus_book_emit_auth_required (EGdbusBook *object, - const gchar * const *arg_credentials) -{ - g_signal_emit (object, signals[__AUTH_REQUIRED_SIGNAL], 0, arg_credentials); -} - -void e_gdbus_book_emit_opened (EGdbusBook *object, const gchar * const *arg_error) { @@ -762,7 +722,6 @@ e_gdbus_book_emit_backend_property_changed (EGdbusBook *object, E_DECLARE_GDBUS_NOTIFY_SIGNAL_1 (book, backend_error, message, "s") E_DECLARE_GDBUS_NOTIFY_SIGNAL_1 (book, readonly, is_readonly, "b") E_DECLARE_GDBUS_NOTIFY_SIGNAL_1 (book, online, is_online, "b") -E_DECLARE_GDBUS_NOTIFY_SIGNAL_1 (book, auth_required, credentials, "as") E_DECLARE_GDBUS_NOTIFY_SIGNAL_1 (book, opened, error, "as") E_DECLARE_GDBUS_NOTIFY_SIGNAL_1 (book, backend_property_changed, name_value, "as") @@ -781,7 +740,6 @@ E_DECLARE_GDBUS_ASYNC_METHOD_1_WITH_RETURN (book, get_backend_property, prop_nam E_DECLARE_GDBUS_ASYNC_METHOD_1 (book, set_backend_property, prop_name_value, "as") E_DECLARE_GDBUS_ASYNC_METHOD_1_WITH_RETURN (book, get_view, query, "s", view, "s") -E_DECLARE_GDBUS_SYNC_METHOD_1 (book, authenticate_user, credentials, "as") E_DECLARE_GDBUS_SYNC_METHOD_1 (book, cancel_operation, opid, "u") E_DECLARE_GDBUS_SYNC_METHOD_0 (book, cancel_all) @@ -802,7 +760,6 @@ static const GDBusMethodInfo * const e_gdbus_book_method_info_pointers[] = &E_DECLARED_GDBUS_METHOD_INFO_NAME (book, get_backend_property), &E_DECLARED_GDBUS_METHOD_INFO_NAME (book, set_backend_property), &E_DECLARED_GDBUS_METHOD_INFO_NAME (book, get_view), - &E_DECLARED_GDBUS_METHOD_INFO_NAME (book, authenticate_user), &E_DECLARED_GDBUS_METHOD_INFO_NAME (book, cancel_operation), &E_DECLARED_GDBUS_METHOD_INFO_NAME (book, cancel_all), &E_DECLARED_GDBUS_METHOD_INFO_NAME (book, close), @@ -814,7 +771,6 @@ static const GDBusSignalInfo * const e_gdbus_book_signal_info_pointers[] = &E_DECLARED_GDBUS_SIGNAL_INFO_NAME (book, backend_error), &E_DECLARED_GDBUS_SIGNAL_INFO_NAME (book, readonly), &E_DECLARED_GDBUS_SIGNAL_INFO_NAME (book, online), - &E_DECLARED_GDBUS_SIGNAL_INFO_NAME (book, auth_required), &E_DECLARED_GDBUS_SIGNAL_INFO_NAME (book, opened), &E_DECLARED_GDBUS_SIGNAL_INFO_NAME (book, backend_property_changed), diff --git a/addressbook/libegdbus/e-gdbus-book.h b/addressbook/libegdbus/e-gdbus-book.h index 9a6d851..cc04de3 100644 --- a/addressbook/libegdbus/e-gdbus-book.h +++ b/addressbook/libegdbus/e-gdbus-book.h @@ -115,7 +115,6 @@ struct _EGdbusBookIface void (*backend_error) (EGdbusBook *object, const gchar *arg_message); void (*readonly) (EGdbusBook *object, gboolean arg_is_readonly); void (*online) (EGdbusBook *object, gboolean arg_is_online); - void (*auth_required) (EGdbusBook *object, const gchar * const *arg_credentials); void (*opened) (EGdbusBook *object, const gchar * const *arg_error); void (*backend_property_changed) (EGdbusBook *object, const gchar * const *arg_name_value); @@ -156,7 +155,6 @@ struct _EGdbusBookIface gboolean (*handle_get_view) (EGdbusBook *object, GDBusMethodInvocation *invocation, const gchar *in_query); void (*get_view_done) (EGdbusBook *object, guint arg_opid, const GError *arg_error, gchar **out_view); - gboolean (*handle_authenticate_user) (EGdbusBook *object, GDBusMethodInvocation *invocation, const gchar * const *in_credentials); gboolean (*handle_cancel_operation) (EGdbusBook *object, GDBusMethodInvocation *invocation, guint in_opid); gboolean (*handle_cancel_all) (EGdbusBook *object, GDBusMethodInvocation *invocation); gboolean (*handle_close) (EGdbusBook *object, GDBusMethodInvocation *invocation); @@ -216,10 +214,6 @@ void e_gdbus_book_call_get_view (GDBusProxy *proxy, const gchar *in_query, GCan gboolean e_gdbus_book_call_get_view_finish (GDBusProxy *proxy, GAsyncResult *result, gchar **out_view_path, GError **error); gboolean e_gdbus_book_call_get_view_sync (GDBusProxy *proxy, const gchar *in_query, gchar **out_view_path, GCancellable *cancellable, GError **error); -void e_gdbus_book_call_authenticate_user (GDBusProxy *proxy, const gchar * const *in_credentials, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data); -gboolean e_gdbus_book_call_authenticate_user_finish (GDBusProxy *proxy, GAsyncResult *result, GError **error); -gboolean e_gdbus_book_call_authenticate_user_sync (GDBusProxy *proxy, const gchar * const *in_credentials, GCancellable *cancellable, GError **error); - void e_gdbus_book_call_cancel_operation (GDBusProxy *proxy, guint in_opid, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data); gboolean e_gdbus_book_call_cancel_operation_finish (GDBusProxy *proxy, GAsyncResult *result, GError **error); gboolean e_gdbus_book_call_cancel_operation_sync (GDBusProxy *proxy, guint in_opid, GCancellable *cancellable, GError **error); @@ -245,7 +239,6 @@ gboolean e_gdbus_book_call_close_sync (GDBusProxy *proxy, GCancellable *cancella #define e_gdbus_book_complete_get_backend_property e_gdbus_complete_async_method #define e_gdbus_book_complete_set_backend_property e_gdbus_complete_async_method #define e_gdbus_book_complete_get_view e_gdbus_complete_async_method -#define e_gdbus_book_complete_authenticate_user e_gdbus_complete_sync_method_void #define e_gdbus_book_complete_cancel_operation e_gdbus_complete_sync_method_void #define e_gdbus_book_complete_cancel_all e_gdbus_complete_sync_method_void #define e_gdbus_book_complete_close e_gdbus_complete_sync_method_void @@ -267,7 +260,6 @@ void e_gdbus_book_emit_get_view_done (EGdbusBook *object, guint arg_opid, cons void e_gdbus_book_emit_backend_error (EGdbusBook *object, const gchar *arg_message); void e_gdbus_book_emit_readonly (EGdbusBook *object, gboolean arg_is_readonly); void e_gdbus_book_emit_online (EGdbusBook *object, gboolean arg_is_online); -void e_gdbus_book_emit_auth_required (EGdbusBook *object, const gchar * const *arg_credentials); void e_gdbus_book_emit_opened (EGdbusBook *object, const gchar * const *arg_error); void e_gdbus_book_emit_backend_property_changed (EGdbusBook *object, const gchar * const *arg_name_value); -- 2.7.4