From ad12bcec870cf2c7aff57c42465cd50b104e84a4 Mon Sep 17 00:00:00 2001 From: Alberto Mardegan Date: Tue, 11 May 2010 16:25:10 +0300 Subject: [PATCH] Use SignonAuthSessionState from signond-dev package --- configure.ac | 3 ++- libsignon-glib.pc.in | 1 + libsignon-glib/signon-auth-session.c | 4 ++-- libsignon-glib/signon-auth-session.h | 35 ++--------------------------------- 4 files changed, 7 insertions(+), 36 deletions(-) diff --git a/configure.ac b/configure.ac index 4b03f53..6233927 100644 --- a/configure.ac +++ b/configure.ac @@ -10,7 +10,8 @@ PKG_CHECK_MODULES( glib-2.0 gobject-2.0 dbus-1 - dbus-glib-1); + dbus-glib-1 + signond); AC_SUBST(DEPS_CFLAGS) AC_SUBST(DEPS_LIBS) diff --git a/libsignon-glib.pc.in b/libsignon-glib.pc.in index 23f0d26..c419a9e 100644 --- a/libsignon-glib.pc.in +++ b/libsignon-glib.pc.in @@ -7,6 +7,7 @@ pluginlibdir=@pluginlibdir@ Name: libsignon-glib Description: A low-level library for managing account credentials. Version: @VERSION@ +Requires: signond Libs: -L${libdir} -lsignon-glib Cflags: -I${includedir} diff --git a/libsignon-glib/signon-auth-session.c b/libsignon-glib/signon-auth-session.c index 2448009..d00f573 100644 --- a/libsignon-glib/signon-auth-session.c +++ b/libsignon-glib/signon-auth-session.c @@ -523,7 +523,7 @@ auth_session_query_available_mechanisms_ready_cb (gpointer object, const GError g_signal_emit (self, auth_session_signals[STATE_CHANGED], 0, - (gint)AS_STATE_PROCESS_PENDING, + SIGNON_AUTH_SESSION_STATE_PROCESS_PENDING, auth_session_process_pending_message); } @@ -581,7 +581,7 @@ auth_session_process_ready_cb (gpointer object, const GError *error, gpointer us g_signal_emit (self, auth_session_signals[STATE_CHANGED], 0, - (gint)AS_STATE_PROCESS_PENDING, + SIGNON_AUTH_SESSION_STATE_PROCESS_PENDING, auth_session_process_pending_message); } diff --git a/libsignon-glib/signon-auth-session.h b/libsignon-glib/signon-auth-session.h index f9407fb..f826a1d 100644 --- a/libsignon-glib/signon-auth-session.h +++ b/libsignon-glib/signon-auth-session.h @@ -34,39 +34,8 @@ G_BEGIN_DECLS #define SIGNON_SESSION_DATA_SECRET "Secret" #define SIGNON_SESSION_DATA_REALM "Realm" -enum AuthSessionState { - SessionNotStarted = 0, /**< No message. */ - HostResolving, /**< Resolving remote server host name. */ - ServerConnecting, /**< Connecting to remote server. */ - DataSending, /**< Sending data to remote server. */ - ReplyWaiting, /**< Waiting reply from remote server. */ - UserPending, /**< Waiting response from user. */ - UiRefreshing, /**< Refreshing ui request. */ - ProcessPending, /**< Waiting another process to start. */ - SessionStarted, /**< Authentication session is started. */ - ProcessCanceling, /**< Canceling.current process: is this really needed??? */ - ProcessDone, /** < ???? Is this really needed > */ - CustomState, /**< Custom message. */ - MaxState, -}; - -typedef enum -{ - AS_STATE_NOT_STARTED = 0, /**< No message. */ - AS_STATE_HOST_RESOLVING, /**< Resolving remote server host name. */ - AS_STATE_SERVER_CONNECTING, /**< Connecting to remote server. */ - AS_STATE_DATA_SENDING, /**< Sending data to remote server. */ - AS_STATE_DATA_WAITING, /**< Waiting reply from remote server. */ - AS_STATE_USER_PENDING, - AS_STATE_UI_REFRESHING, - AS_STATE_PROCESS_PENDING, - AS_STATE_SESSION_STARTED, - AS_STATE_PROCESS_CANCELLING, - AS_STATE_PROCESS_DONE, - AS_STATE_CUSTOM_STATE, - AS_STATE_MAX_STATE, -} SessionObjectState; - +/* SignonAuthSessionState is defined in signoncommon.h */ +#include #define SIGNON_TYPE_AUTH_SESSION (signon_auth_session_get_type ()) #define SIGNON_AUTH_SESSION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SIGNON_TYPE_AUTH_SESSION, SignonAuthSession)) -- 2.7.4