[evolution-data-server/account-mgmt: 12/38] Adapt addressbook/libegdbus to the new ESource API.
- From: Matthew Barnes <mbarnes src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution-data-server/account-mgmt: 12/38] Adapt addressbook/libegdbus to the new ESource API.
- Date: Fri, 11 Nov 2011 01:25:21 +0000 (UTC)
commit 1a8d5a21b4eedcab57ff07f17cc14be0b6cede01
Author: Matthew Barnes <mbarnes redhat com>
Date: Mon Oct 10 15:14:02 2011 -0400
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, 0 insertions(+), 52 deletions(-)
---
diff --git a/addressbook/libegdbus/e-gdbus-book.c b/addressbook/libegdbus/e-gdbus-book.c
index 5dd4b37..5b3441b 100644
--- a/addressbook/libegdbus/e-gdbus-book.c
+++ b/addressbook/libegdbus/e-gdbus-book.c
@@ -38,7 +38,6 @@ enum
__BACKEND_ERROR_SIGNAL,
__READONLY_SIGNAL,
__ONLINE_SIGNAL,
- __AUTH_REQUIRED_SIGNAL,
__OPENED_SIGNAL,
__BACKEND_PROPERTY_CHANGED_SIGNAL,
__OPEN_METHOD,
@@ -65,7 +64,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,
@@ -121,8 +119,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)
@@ -165,7 +161,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)
@@ -182,7 +177,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)
@@ -562,33 +556,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,
@@ -735,13 +702,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)
{
@@ -758,7 +718,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")
@@ -777,7 +736,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)
@@ -798,7 +756,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),
@@ -810,7 +767,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);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]