move GIOCondition to gmain.h from giochannel.h

GIOCondition has uses outside of GIOChannel, so move it to gmain.h.

https://bugzilla.gnome.org/show_bug.cgi?id=686853

diff --git a/glib/giochannel.h b/glib/giochannel.h
index 24ad5830e2d2902a408f6d5e92f35e8d63207bf6..0e7c77d4c72abf48956749a5b1b074a176f3f1de 100644 (file)
--- a/glib/giochannel.h
+++ b/glib/giochannel.h
@@ -83,16 +83,6 @@ typedef enum
   G_SEEK_END
 } GSeekType;
 
-typedef enum /*< flags >*/
-{
-  G_IO_IN      GLIB_SYSDEF_POLLIN,
-  G_IO_OUT     GLIB_SYSDEF_POLLOUT,
-  G_IO_PRI     GLIB_SYSDEF_POLLPRI,
-  G_IO_ERR     GLIB_SYSDEF_POLLERR,
-  G_IO_HUP     GLIB_SYSDEF_POLLHUP,
-  G_IO_NVAL    GLIB_SYSDEF_POLLNVAL
-} GIOCondition;
-
 typedef enum
 {
   G_IO_FLAG_APPEND = 1 << 0,

diff --git a/glib/gmain.h b/glib/gmain.h
index 90ff11bec18cc5148a6f12e1552e8a9b2cf3b57d..5a6a72a7445463e23244ea7e69c07dead507b03c 100644 (file)
--- a/glib/gmain.h
+++ b/glib/gmain.h
@@ -30,6 +30,17 @@
 
 G_BEGIN_DECLS
 
+typedef enum /*< flags >*/
+{
+  G_IO_IN      GLIB_SYSDEF_POLLIN,
+  G_IO_OUT     GLIB_SYSDEF_POLLOUT,
+  G_IO_PRI     GLIB_SYSDEF_POLLPRI,
+  G_IO_ERR     GLIB_SYSDEF_POLLERR,
+  G_IO_HUP     GLIB_SYSDEF_POLLHUP,
+  G_IO_NVAL    GLIB_SYSDEF_POLLNVAL
+} GIOCondition;
+
+
 /**
  * GMainContext:
  *