tidy up event code

darcs-hash:20070204183000-c9803-a0097fea720448ab40a782a07e9aea6098f8cbcc.gz

2 files changed, 11 insertions, 15 deletions

diff --git a/agent/event.c b/agent/event.c
index 53b78bf..159bf05 100644
--- a/agent/event.c
+++ b/agent/event.c
@@ -16,12 +16,6 @@ _nice_event_new (NiceEventType type)
 void
 nice_event_free (NiceEvent *ev)
 {
-  switch (ev->type)
-    {
-      case EVENT_CANDIDATE_SELECTED:
-        break;
-    }
-
   g_slice_free (NiceEvent, ev);
 }
 
diff --git a/agent/event.h b/agent/event.h
index 6ccf02b..74ab2e9 100644
--- a/agent/event.h
+++ b/agent/event.h
@@ -4,13 +4,16 @@
 
 #include <glib.h>
 
+#include "candidate.h"
+
 G_BEGIN_DECLS
 
 typedef enum _NiceEventType NiceEventType;
 
 enum _NiceEventType
 {
-  EVENT_CANDIDATE_SELECTED,
+  NICE_EVENT_COMPONENT_CONNECTED,
+  NICE_EVENT_CANDIDATE_SELECTED,
 };
 
 
@@ -22,15 +25,14 @@ struct _NiceEvent
 
   union {
     struct {
-      NiceAddress *addr;
-      guint candidate_id;
-    } request_port;
+      guint stream_id;
+      guint component_id;
+      NiceAddress addr;
+    } component_connected;
     struct {
-      NiceAddress *from;
-      guint from_port;
-      NiceAddress *to;
-      guint to_port;
-    } request_stun_query;
+      NiceCandidate *local;
+      NiceCandidate *remote;
+    } candidate_selected;
   };
 };