Merge branch 'gnome-3-8'

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

diff --git a/src/empathy-event-manager.h b/src/empathy-event-manager.h
index 39aa0c979dc5de1539a110544f94a67e2397c63d..f2878c7ca55eb931df1782648f39bfc389b5f766 100644 (file)
--- a/src/empathy-event-manager.h
+++ b/src/empathy-event-manager.h
@@ -22,10 +22,9 @@
 #ifndef __EMPATHY_EVENT_MANAGER_H__
 #define __EMPATHY_EVENT_MANAGER_H__
 
-#include <glib.h>
 #include <glib-object.h>
 
-#include <libempathy/empathy-contact.h>
+#include "empathy-contact.h"
 
 G_BEGIN_DECLS
 
@@ -50,20 +49,26 @@ 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 {
+    TpAccount *account;
     EmpathyContact *contact;
     EmpathyEventType type;
     gchar *icon_name;
     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;
@@ -74,6 +79,7 @@ void                 empathy_event_activate              (EmpathyEvent        *e
 void                 empathy_event_inhibit_updates       (EmpathyEvent        *event);
 void                 empathy_event_approve               (EmpathyEvent        *event);
 void                 empathy_event_decline               (EmpathyEvent        *event);
+void                 empathy_event_remove                (EmpathyEvent        *event);
 
 G_END_DECLS