Adapt calendar/libegdbus to the new ESource API.

diff --git a/calendar/libegdbus/e-gdbus-cal.c b/calendar/libegdbus/e-gdbus-cal.c
index f10cec5..26b82bb 100644 (file)
--- a/calendar/libegdbus/e-gdbus-cal.c
+++ b/calendar/libegdbus/e-gdbus-cal.c
@@ -45,7 +45,6 @@ enum
        __BACKEND_ERROR_SIGNAL,
        __READONLY_SIGNAL,
        __ONLINE_SIGNAL,
-       __AUTH_REQUIRED_SIGNAL,
        __OPENED_SIGNAL,
        __FREE_BUSY_DATA_SIGNAL,
        __BACKEND_PROPERTY_CHANGED_SIGNAL,
@@ -85,7 +84,6 @@ enum
        __GET_TIMEZONE_DONE_SIGNAL,
        __ADD_TIMEZONE_METHOD,
        __ADD_TIMEZONE_DONE_SIGNAL,
-       __AUTHENTICATE_USER_METHOD,
        __CANCEL_OPERATION_METHOD,
        __CANCEL_ALL_METHOD,
        __CLOSE_METHOD,
@@ -141,8 +139,6 @@ E_DECLARE_GDBUS_SIGNAL_EMISSION_HOOK_BOOLEAN (GDBUS_CAL_INTERFACE_NAME,
 E_DECLARE_GDBUS_SIGNAL_EMISSION_HOOK_BOOLEAN (GDBUS_CAL_INTERFACE_NAME,
                                               online)
 E_DECLARE_GDBUS_SIGNAL_EMISSION_HOOK_STRV (GDBUS_CAL_INTERFACE_NAME,
-                                           auth_required)
-E_DECLARE_GDBUS_SIGNAL_EMISSION_HOOK_STRV (GDBUS_CAL_INTERFACE_NAME,
                                            opened)
 E_DECLARE_GDBUS_SIGNAL_EMISSION_HOOK_STRV (GDBUS_CAL_INTERFACE_NAME,
                                            free_busy_data)
@@ -199,7 +195,6 @@ e_gdbus_cal_default_init (EGdbusCalIface *iface)
        E_INIT_GDBUS_SIGNAL_STRING              (EGdbusCalIface, "backend_error",       backend_error,  __BACKEND_ERROR_SIGNAL)
        E_INIT_GDBUS_SIGNAL_BOOLEAN             (EGdbusCalIface, "readonly",            readonly,       __READONLY_SIGNAL)
        E_INIT_GDBUS_SIGNAL_BOOLEAN             (EGdbusCalIface, "online",              online,         __ONLINE_SIGNAL)
-       E_INIT_GDBUS_SIGNAL_STRV                (EGdbusCalIface, "auth_required",       auth_required,  __AUTH_REQUIRED_SIGNAL)
        E_INIT_GDBUS_SIGNAL_STRV                (EGdbusCalIface, "opened",              opened,         __OPENED_SIGNAL)
        E_INIT_GDBUS_SIGNAL_STRV                (EGdbusCalIface, "free_busy_data",      free_busy_data, __FREE_BUSY_DATA_SIGNAL)
        E_INIT_GDBUS_SIGNAL_STRV                (EGdbusCalIface, "backend_property_changed",    backend_property_changed,       __BACKEND_PROPERTY_CHANGED_SIGNAL)
@@ -223,7 +218,6 @@ e_gdbus_cal_default_init (EGdbusCalIface *iface)
        E_INIT_GDBUS_METHOD_ASYNC_STRING__STRING(EGdbusCalIface, "get_view",                    get_view, __GET_VIEW_METHOD, __GET_VIEW_DONE_SIGNAL)
        E_INIT_GDBUS_METHOD_ASYNC_STRING__STRING(EGdbusCalIface, "get_timezone",                get_timezone, __GET_TIMEZONE_METHOD, __GET_TIMEZONE_DONE_SIGNAL)
        E_INIT_GDBUS_METHOD_ASYNC_STRING__VOID  (EGdbusCalIface, "add_timezone",                add_timezone, __ADD_TIMEZONE_METHOD, __ADD_TIMEZONE_DONE_SIGNAL)
-       E_INIT_GDBUS_METHOD_STRV                (EGdbusCalIface, "authenticate_user",           authenticate_user, __AUTHENTICATE_USER_METHOD)
        E_INIT_GDBUS_METHOD_UINT                (EGdbusCalIface, "cancel_operation",            cancel_operation, __CANCEL_OPERATION_METHOD)
        E_INIT_GDBUS_METHOD_VOID                (EGdbusCalIface, "cancel_all",                  cancel_all, __CANCEL_ALL_METHOD)
        E_INIT_GDBUS_METHOD_VOID                (EGdbusCalIface, "close",                       close, __CLOSE_METHOD)
@@ -1058,33 +1052,6 @@ e_gdbus_cal_call_add_timezone_sync (GDBusProxy *proxy,
 }
 
 void
-e_gdbus_cal_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_cal_call_authenticate_user_finish (GDBusProxy *proxy,
-                                           GAsyncResult *result,
-                                           GError **error)
-{
-       return e_gdbus_proxy_method_call_finish_void (proxy, result, error);
-}
-
-gboolean
-e_gdbus_cal_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_cal_call_cancel_operation (GDBusProxy *proxy,
                                    guint in_opid,
                                    GCancellable *cancellable,
@@ -1245,13 +1212,6 @@ e_gdbus_cal_emit_online (EGdbusCal *object,
 }
 
 void
-e_gdbus_cal_emit_auth_required (EGdbusCal *object,
-                                const gchar * const *arg_credentials)
-{
-       g_signal_emit (object, signals[__AUTH_REQUIRED_SIGNAL], 0, arg_credentials);
-}
-
-void
 e_gdbus_cal_emit_opened (EGdbusCal *object,
                          const gchar * const *arg_error)
 {
@@ -1275,7 +1235,6 @@ e_gdbus_cal_emit_backend_property_changed (EGdbusCal *object,
 E_DECLARE_GDBUS_NOTIFY_SIGNAL_1 (cal, backend_error, message, "s")
 E_DECLARE_GDBUS_NOTIFY_SIGNAL_1 (cal, readonly, is_readonly, "b")
 E_DECLARE_GDBUS_NOTIFY_SIGNAL_1 (cal, online, is_online, "b")
-E_DECLARE_GDBUS_NOTIFY_SIGNAL_1 (cal, auth_required, credentials, "as")
 E_DECLARE_GDBUS_NOTIFY_SIGNAL_1 (cal, opened, error, "as")
 E_DECLARE_GDBUS_NOTIFY_SIGNAL_1 (cal, free_busy_data, free_busy_data, "as")
 E_DECLARE_GDBUS_NOTIFY_SIGNAL_1 (cal, backend_property_changed, name_value, "as")
@@ -1301,7 +1260,6 @@ E_DECLARE_GDBUS_ASYNC_METHOD_1_WITH_RETURN        (cal, get_view, sexp, "s", view_path,
 E_DECLARE_GDBUS_ASYNC_METHOD_1_WITH_RETURN     (cal, get_timezone, tzid, "s", tzobject, "s")
 E_DECLARE_GDBUS_ASYNC_METHOD_1                 (cal, add_timezone, tzobject, "s")
 
-E_DECLARE_GDBUS_SYNC_METHOD_1                  (cal, authenticate_user, credentials, "as")
 E_DECLARE_GDBUS_SYNC_METHOD_1                  (cal, cancel_operation, opid, "u")
 E_DECLARE_GDBUS_SYNC_METHOD_0 (cal,
                                cancel_all)
@@ -1328,7 +1286,6 @@ static const GDBusMethodInfo * const e_gdbus_cal_method_info_pointers[] =
        &E_DECLARED_GDBUS_METHOD_INFO_NAME (cal, get_view),
        &E_DECLARED_GDBUS_METHOD_INFO_NAME (cal, get_timezone),
        &E_DECLARED_GDBUS_METHOD_INFO_NAME (cal, add_timezone),
-       &E_DECLARED_GDBUS_METHOD_INFO_NAME (cal, authenticate_user),
        &E_DECLARED_GDBUS_METHOD_INFO_NAME (cal, cancel_operation),
        &E_DECLARED_GDBUS_METHOD_INFO_NAME (cal, cancel_all),
        &E_DECLARED_GDBUS_METHOD_INFO_NAME (cal, close),
@@ -1340,7 +1297,6 @@ static const GDBusSignalInfo * const e_gdbus_cal_signal_info_pointers[] =
        &E_DECLARED_GDBUS_SIGNAL_INFO_NAME (cal, backend_error),
        &E_DECLARED_GDBUS_SIGNAL_INFO_NAME (cal, readonly),
        &E_DECLARED_GDBUS_SIGNAL_INFO_NAME (cal, online),
-       &E_DECLARED_GDBUS_SIGNAL_INFO_NAME (cal, auth_required),
        &E_DECLARED_GDBUS_SIGNAL_INFO_NAME (cal, opened),
        &E_DECLARED_GDBUS_SIGNAL_INFO_NAME (cal, free_busy_data),
        &E_DECLARED_GDBUS_SIGNAL_INFO_NAME (cal, backend_property_changed),

diff --git a/calendar/libegdbus/e-gdbus-cal.h b/calendar/libegdbus/e-gdbus-cal.h
index 7220f64..53762d0 100644 (file)
--- a/calendar/libegdbus/e-gdbus-cal.h
+++ b/calendar/libegdbus/e-gdbus-cal.h
@@ -106,7 +106,6 @@ struct _EGdbusCalIface
        void    (*backend_error)                        (EGdbusCal *object, const gchar *arg_message);
        void    (*readonly)                             (EGdbusCal *object, gboolean arg_is_readonly);
        void    (*online)                               (EGdbusCal *object, gboolean arg_is_online);
-       void    (*auth_required)                        (EGdbusCal *object, const gchar * const *arg_credentials);
        void    (*opened)                               (EGdbusCal *object, const gchar * const *arg_error);
        void    (*free_busy_data)                       (EGdbusCal *object, const gchar * const *arg_free_busy);
        void    (*backend_property_changed)             (EGdbusCal *object, const gchar * const *arg_name_value);
@@ -166,7 +165,6 @@ struct _EGdbusCalIface
        gboolean (*handle_add_timezone)                 (EGdbusCal *object, GDBusMethodInvocation *invocation, const gchar *in_tzobject);
        void     (*add_timezone_done)                   (EGdbusCal *object, guint arg_opid, const GError *arg_error);
 
-       gboolean (*handle_authenticate_user)            (EGdbusCal *object, GDBusMethodInvocation *invocation, const gchar * const *in_credentials);
        gboolean (*handle_cancel_operation)             (EGdbusCal *object, GDBusMethodInvocation *invocation, guint in_opid);
        gboolean (*handle_cancel_all)                   (EGdbusCal *object, GDBusMethodInvocation *invocation);
        gboolean (*handle_close)                        (EGdbusCal *object, GDBusMethodInvocation *invocation);
@@ -261,10 +259,6 @@ void               e_gdbus_cal_call_add_timezone                   (GDBusProxy *proxy, const gchar *in_tzobje
 gboolean       e_gdbus_cal_call_add_timezone_finish            (GDBusProxy *proxy, GAsyncResult *result, GError **error);
 gboolean       e_gdbus_cal_call_add_timezone_sync              (GDBusProxy *proxy, const gchar *in_tzobject, GCancellable *cancellable, GError **error);
 
-void           e_gdbus_cal_call_authenticate_user              (GDBusProxy *proxy, const gchar * const *in_credentials, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data);
-gboolean       e_gdbus_cal_call_authenticate_user_finish       (GDBusProxy *proxy, GAsyncResult *result, GError **error);
-gboolean       e_gdbus_cal_call_authenticate_user_sync         (GDBusProxy *proxy, const gchar * const *in_credentials, GCancellable *cancellable, GError **error);
-
 void           e_gdbus_cal_call_cancel_operation               (GDBusProxy *proxy, guint in_opid, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data);
 gboolean       e_gdbus_cal_call_cancel_operation_finish        (GDBusProxy *proxy, GAsyncResult *result, GError **error);
 gboolean       e_gdbus_cal_call_cancel_operation_sync          (GDBusProxy *proxy, guint in_opid, GCancellable *cancellable, GError **error);
@@ -296,7 +290,6 @@ gboolean    e_gdbus_cal_call_close_sync                     (GDBusProxy *proxy, GCancellable *cancell
 #define e_gdbus_cal_complete_get_view                  e_gdbus_complete_async_method
 #define e_gdbus_cal_complete_get_timezone              e_gdbus_complete_async_method
 #define e_gdbus_cal_complete_add_timezone              e_gdbus_complete_async_method
-#define e_gdbus_cal_complete_authenticate_user         e_gdbus_complete_sync_method_void
 #define e_gdbus_cal_complete_cancel_operation          e_gdbus_complete_sync_method_void
 #define e_gdbus_cal_complete_cancel_all                        e_gdbus_complete_sync_method_void
 #define e_gdbus_cal_complete_close                     e_gdbus_complete_sync_method_void
@@ -325,7 +318,6 @@ void e_gdbus_cal_emit_add_timezone_done                     (EGdbusCal *object, guint arg_opid, co
 void e_gdbus_cal_emit_backend_error    (EGdbusCal *object, const gchar *arg_message);
 void e_gdbus_cal_emit_readonly         (EGdbusCal *object, gboolean arg_is_readonly);
 void e_gdbus_cal_emit_online           (EGdbusCal *object, gint arg_is_online);
-void e_gdbus_cal_emit_auth_required    (EGdbusCal *object, const gchar * const *arg_credentials);
 void e_gdbus_cal_emit_opened           (EGdbusCal *object, const gchar * const *arg_error);
 void e_gdbus_cal_emit_free_busy_data   (EGdbusCal *object, const gchar * const *arg_free_busy);
 void e_gdbus_cal_emit_backend_property_changed (EGdbusCal *object, const gchar * const *arg_name_value);