From d484744a3353e2f2df9acbc5ebebd68019b7b7e5 Mon Sep 17 00:00:00 2001 From: Brian Tarricone Date: Sat, 4 Oct 2008 10:31:08 +0000 Subject: * xfce4-session/{sm-layer.c,xfsm-client.[ch],xfsm-manager.c}: Turn XfsmClient into a GObject. Second step for bug 798 and a D-Bus interface. (Old svn revision: 28029) --- xfce4-session/xfsm-client.h | 36 +++++++++++++++++++++--------------- 1 file changed, 21 insertions(+), 15 deletions(-) (limited to 'xfce4-session/xfsm-client.h') diff --git a/xfce4-session/xfsm-client.h b/xfce4-session/xfsm-client.h index a06387d9..f81078a2 100644 --- a/xfce4-session/xfsm-client.h +++ b/xfce4-session/xfsm-client.h @@ -22,8 +22,16 @@ #ifndef __XFSM_CLIENT_H__ #define __XFSM_CLIENT_H__ +#include + #include +G_BEGIN_DECLS + +#define XFSM_TYPE_CLIENT (xfsm_client_get_type ()) +#define XFSM_CLIENT(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), XFSM_TYPE_CLIENT, XfsmClient)) +#define XFSM_IS_CLIENT(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), XFSM_TYPE_CLIENT)) + typedef struct _XfsmClient XfsmClient; typedef enum @@ -37,27 +45,25 @@ typedef enum XFSM_CLIENT_WAITFORPHASE2, XFSM_CLIENT_DISCONNECTED, } XfsmClientState; - -struct _XfsmClient -{ - XfsmClientState state; - const gchar *id; - XfsmProperties *properties; - SmsConn sms_conn; - guint save_timeout_id; - gpointer manager; /* (XfsmManager *) */ -}; +GType xfsm_client_get_type (void) G_GNUC_CONST; +XfsmClient *xfsm_client_new (SmsConn sms_conn); -#define XFSM_CLIENT(c) ((XfsmClient *) (c)) +void xfsm_client_set_initial_properties (XfsmClient *client, + XfsmProperties *properties); +XfsmClientState xfsm_client_get_state (XfsmClient *client); +void xfsm_client_set_state (XfsmClient *client, + XfsmClientState state); -XfsmClient *xfsm_client_new (SmsConn sms_conn); +G_CONST_RETURN gchar *xfsm_client_get_id (XfsmClient *client); -void xfsm_client_free (XfsmClient *client); +SmsConn xfsm_client_get_sms_connection (XfsmClient *client); -void xfsm_client_set_initial_properties (XfsmClient *client, - XfsmProperties *properties); +XfsmProperties *xfsm_client_get_properties (XfsmClient *client); +XfsmProperties *xfsm_client_steal_properties (XfsmClient *client); + +G_END_DECLS #endif /* !__XFSM_CLIENT_H__ */ -- cgit v1.2.1