Use a flat namespace for internal includes

[empathy.git] / src / empathy-event-manager.h

diff --git a/src/empathy-event-manager.h b/src/empathy-event-manager.h
index 16d97c6dffb06f83fe71716430babf24ae82b31e..511a5ed5785f26b8e62f88dda9986582559aa232 100644 (file)
--- a/src/empathy-event-manager.h
+++ b/src/empathy-event-manager.h
@@ -25,7 +25,7 @@
 #include <glib.h>
 #include <glib-object.h>
 
-#include <libempathy/empathy-contact.h>
+#include "empathy-contact.h"
 
 G_BEGIN_DECLS
 
@@ -50,12 +50,14 @@ struct _EmpathyEventManagerClass {
 
 typedef enum {
     EMPATHY_EVENT_TYPE_CHAT,
-    EMPATHY_EVENT_TYPE_VOIP,
+    EMPATHY_EVENT_TYPE_CALL,
     EMPATHY_EVENT_TYPE_TRANSFER,
     EMPATHY_EVENT_TYPE_SUBSCRIPTION,
-    EMPATHY_EVENT_TYPE_PRESENCE,
+    EMPATHY_EVENT_TYPE_PRESENCE_ONLINE,
+    EMPATHY_EVENT_TYPE_PRESENCE_OFFLINE,
     EMPATHY_EVENT_TYPE_INVITATION,
     EMPATHY_EVENT_TYPE_AUTH,
+    EMPATHY_EVENT_TYPE_MENTIONED,
 } EmpathyEventType;
 
 typedef struct {
@@ -66,6 +68,8 @@ typedef struct {
     gchar *header;
     gchar *message;
     gboolean must_ack;
+    GObject *handler_instance;
+    guint roster_view_id;
 } EmpathyEvent;
 
 GType                empathy_event_manager_get_type      (void) G_GNUC_CONST;