1 files changed, 2 insertions, 97 deletions
diff --git a/src/ck-event-logger.h b/src/ck-event-logger.h
index c49136e..d4645f7 100644
--- a/src/ck-event-logger.h
+++ b/src/ck-event-logger.h
@@ -22,6 +22,7 @@
 #define __CK_EVENT_LOGGER_H
 
 #include <glib-object.h>
+#include "ck-log-event.h"
 
 G_BEGIN_DECLS
 
@@ -47,98 +48,6 @@ typedef struct
 
 typedef enum
 {
-        CK_EVENT_LOGGER_EVENT_START = 0,
-        CK_EVENT_LOGGER_EVENT_STOP,
-        CK_EVENT_LOGGER_EVENT_SYSTEM_SHUTDOWN,
-        CK_EVENT_LOGGER_EVENT_SYSTEM_RUNLEVEL_CHANGED,
-        CK_EVENT_LOGGER_EVENT_SEAT_ADDED,
-        CK_EVENT_LOGGER_EVENT_SEAT_REMOVED,
-        CK_EVENT_LOGGER_EVENT_SEAT_SESSION_ADDED,
-        CK_EVENT_LOGGER_EVENT_SEAT_SESSION_REMOVED,
-        CK_EVENT_LOGGER_EVENT_SEAT_DEVICE_ADDED,
-        CK_EVENT_LOGGER_EVENT_SEAT_DEVICE_REMOVED,
-        CK_EVENT_LOGGER_EVENT_SEAT_ACTIVE_SESSION_CHANGED,
-} CkEventLoggerEventType;
-
-typedef struct
-{
-        char *seat_id;
-        int   seat_kind;
-} CkEventLoggerSeatAddedEvent;
-
-typedef struct
-{
-        char *seat_id;
-        int   seat_kind;
-} CkEventLoggerSeatRemovedEvent;
-
-typedef struct
-{
-        char    *seat_id;
-        char    *session_id;
-        char    *session_type;
-        char    *session_x11_display;
-        char    *session_x11_display_device;
-        char    *session_display_device;
-        char    *session_remote_host_name;
-        gboolean session_is_local;
-        guint    session_unix_user;
-        char    *session_creation_time;
-} CkEventLoggerSeatSessionAddedEvent;
-
-typedef struct
-{
-        char    *seat_id;
-        char    *session_id;
-        char    *session_type;
-        char    *session_x11_display;
-        char    *session_x11_display_device;
-        char    *session_display_device;
-        char    *session_remote_host_name;
-        gboolean session_is_local;
-        guint    session_unix_user;
-        char    *session_creation_time;
-} CkEventLoggerSeatSessionRemovedEvent;
-
-typedef struct
-{
-        char    *seat_id;
-        char    *session_id;
-} CkEventLoggerSeatActiveSessionChangedEvent;
-
-typedef struct
-{
-        char *seat_id;
-        char *device_type;
-        char *device_id;
-} CkEventLoggerSeatDeviceAddedEvent;
-
-typedef struct
-{
-        char *seat_id;
-        char *device_type;
-        char *device_id;
-} CkEventLoggerSeatDeviceRemovedEvent;
-
-typedef struct
-{
-        union {
-                CkEventLoggerSeatAddedEvent seat_added;
-                CkEventLoggerSeatRemovedEvent seat_removed;
-                CkEventLoggerSeatSessionAddedEvent seat_session_added;
-                CkEventLoggerSeatSessionRemovedEvent seat_session_removed;
-                CkEventLoggerSeatActiveSessionChangedEvent seat_active_session_changed;
-                CkEventLoggerSeatDeviceAddedEvent seat_device_added;
-                CkEventLoggerSeatDeviceRemovedEvent seat_device_removed;
-        } event;
-
-        GTimeVal               timestamp;
-        CkEventLoggerEventType type;
-} CkEventLoggerEvent;
-
-
-typedef enum
-{
          CK_EVENT_LOGGER_ERROR_GENERAL
 } CkEventLoggerError;
 
@@ -149,13 +58,9 @@ GType                ck_event_logger_get_type            (void);
 CkEventLogger      * ck_event_logger_new                 (const char         *filename);
 
 gboolean             ck_event_logger_queue_event         (CkEventLogger      *event_logger,
-                                                          CkEventLoggerEvent *event,
+                                                          CkLogEvent         *event,
                                                           GError            **error);
 
-CkEventLoggerEvent * ck_event_logger_event_copy          (CkEventLoggerEvent *event);
-void                 ck_event_logger_event_free          (CkEventLoggerEvent *event);
-
-
 G_END_DECLS
 
 #endif /* __CK_EVENT_LOGGER_H */