Fix and cleanup watch functionality

1 files changed, 3 insertions, 19 deletions

diff --git a/common/glib-ectomy.h b/common/glib-ectomy.h
index af6f4fbb..16f4810d 100644
--- a/common/glib-ectomy.h
+++ b/common/glib-ectomy.h
@@ -36,25 +36,9 @@ typedef struct _GIOChannel {
 
 typedef gboolean (*GSourceFunc) (gpointer data);
 
-struct timeout {
-	guint id;
-	guint interval;
-	struct timeval expiration;
-	gpointer data;
-	GSourceFunc function;
-};
-
-typedef struct _GMainContext {
-	guint next_id;
-	glong timeout;
-	struct slist *ltimeout;
-	struct slist *processed;
-} GMainContext;
-
-typedef struct _GMainLoop {
-	int bail;
-	GMainContext *context;
-} GMainLoop;
+typedef struct _GMainContext GMainContext;
+
+typedef struct _GMainLoop GMainLoop;
 
 typedef enum {
 	G_IO_ERROR_NONE,