Revert "Box GPollFD to make it introspectable"

This reverts commit 932f4250b88a50059330a9df8224feeab6b0ffd7.

This got pushed accidentally and has not been accepted yet. It's also not clear
whether we want this in the first place.

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

diff --git a/docs/reference/gobject/gobject-sections.txt b/docs/reference/gobject/gobject-sections.txt
index 5d142dd..abcf248 100644 (file)
--- a/docs/reference/gobject/gobject-sections.txt
+++ b/docs/reference/gobject/gobject-sections.txt
@@ -373,7 +373,6 @@ G_TYPE_KEY_FILE
 G_TYPE_MAIN_CONTEXT
 G_TYPE_MAIN_LOOP
 G_TYPE_SOURCE
-G_TYPE_POLLFD
 GStrv
 
 <SUBSECTION Standard>
@@ -399,7 +398,6 @@ g_gtype_get_type
 g_main_context_get_type
 g_main_loop_get_type
 g_source_get_type
-g_pollfd_get_type
 g_bytes_get_type
 g_key_file_get_type
 </SECTION>

diff --git a/gobject/gboxed.c b/gobject/gboxed.c
index c45e1cd..b5c6029 100644 (file)
--- a/gobject/gboxed.c
+++ b/gobject/gboxed.c
@@ -77,15 +77,6 @@ value_free (GValue *value)
   g_free (value);
 }
 
-static GPollFD *
-pollfd_copy (GPollFD *src)
-{
-  GPollFD *dest = g_new0 (GPollFD, 1);
-  /* just a couple of integers */
-  memcpy (dest, src, sizeof (GPollFD));
-  return dest;
-}
-
 void
 _g_boxed_type_init (void)
 {
@@ -159,7 +150,6 @@ G_DEFINE_BOXED_TYPE (GKeyFile, g_key_file, g_key_file_ref, g_key_file_unref)
 G_DEFINE_BOXED_TYPE (GMainLoop, g_main_loop, g_main_loop_ref, g_main_loop_unref)
 G_DEFINE_BOXED_TYPE (GMainContext, g_main_context, g_main_context_ref, g_main_context_unref)
 G_DEFINE_BOXED_TYPE (GSource, g_source, g_source_ref, g_source_unref)
-G_DEFINE_BOXED_TYPE (GPollFD, g_pollfd, pollfd_copy, g_free)
 
 /* This one can't use G_DEFINE_BOXED_TYPE (GStrv, g_strv, g_strdupv, g_strfreev) */
 GType

diff --git a/gobject/glib-types.h b/gobject/glib-types.h
index 27a515f..50bc033 100644 (file)
--- a/gobject/glib-types.h
+++ b/gobject/glib-types.h
@@ -228,15 +228,6 @@ typedef gsize GType;
 #define G_TYPE_SOURCE (g_source_get_type ())
 
 /**
- * G_TYPE_POLLFD:
- *
- * The #GType for a boxed type holding a #GPollFD.
- *
- * Since: 2.36
- */
-#define G_TYPE_POLLFD (g_pollfd_get_type ())
-
-/**
  * G_TYPE_KEY_FILE:
  *
  * The #GType for a boxed type holding a #GKeyFile.
@@ -270,8 +261,6 @@ GLIB_AVAILABLE_IN_2_30
 GType   g_main_context_get_type    (void) G_GNUC_CONST;
 GLIB_AVAILABLE_IN_2_30
 GType   g_source_get_type          (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_2_36
-GType   g_pollfd_get_type          (void) G_GNUC_CONST;
 
 GLIB_DEPRECATED_FOR('G_TYPE_VARIANT')
 GType   g_variant_get_gtype        (void) G_GNUC_CONST;

diff --git a/gobject/gobject.symbols b/gobject/gobject.symbols
index 1a052fd..b5fa09e 100644 (file)
--- a/gobject/gobject.symbols
+++ b/gobject/gobject.symbols
@@ -33,7 +33,6 @@ g_key_file_get_type
 g_main_loop_get_type
 g_main_context_get_type
 g_source_get_type
-g_pollfd_get_type
 g_closure_get_type
 g_value_get_type
 g_value_array_get_type