[glib/wip/gsubprocess-desrt: 1/3] Revert GObject wrapping of GSpawnFlags



commit c753fa55d4df5dfa77439f5543f5e80be3fdebe0
Author: Ryan Lortie <desrt desrt ca>
Date:   Tue Aug 14 18:31:47 2012 -0400

    Revert GObject wrapping of GSpawnFlags

 glib/gspawn.h        |    1 -
 gobject/genums.c     |   26 --------------------------
 gobject/genums.h     |    3 ---
 gobject/glib-types.h |    2 --
 4 files changed, 0 insertions(+), 32 deletions(-)
---
diff --git a/glib/gspawn.h b/glib/gspawn.h
index 0d1277f..4036fa6 100644
--- a/glib/gspawn.h
+++ b/glib/gspawn.h
@@ -181,7 +181,6 @@ typedef enum
   G_SPAWN_CHILD_INHERITS_STDIN   = 1 << 5,
   G_SPAWN_FILE_AND_ARGV_ZERO     = 1 << 6,
   G_SPAWN_SEARCH_PATH_FROM_ENVP  = 1 << 7
-  /* Note if you add a value here, update gobject/genums.c too */
 } GSpawnFlags;
 
 GQuark g_spawn_error_quark (void);
diff --git a/gobject/genums.c b/gobject/genums.c
index 96332af..1b3411f 100644
--- a/gobject/genums.c
+++ b/gobject/genums.c
@@ -619,29 +619,3 @@ g_value_get_flags (const GValue *value)
   
   return value->data[0].v_ulong;
 }
-
-GType
-g_spawn_flags_get_type (void)
-{
-  static volatile gsize g_define_type_id__volatile = 0;
-
-  if (g_once_init_enter (&g_define_type_id__volatile))
-    {
-      static const GFlagsValue values[] = {
-        { G_SPAWN_LEAVE_DESCRIPTORS_OPEN, "G_SPAWN_LEAVE_DESCRIPTORS_OPEN", "leave-descriptors-open" },
-        { G_SPAWN_DO_NOT_REAP_CHILD, "G_SPAWN_DO_NOT_REAP_CHILD", "do-not-reap-child" },
-        { G_SPAWN_SEARCH_PATH, "G_SPAWN_SEARCH_PATH", "search-path" },
-        { G_SPAWN_STDOUT_TO_DEV_NULL, "G_SPAWN_STDOUT_TO_DEV_NULL", "stdout-to-dev-null" },
-        { G_SPAWN_STDERR_TO_DEV_NULL, "G_SPAWN_STDERR_TO_DEV_NULL", "stderr-to-dev-null" },
-        { G_SPAWN_CHILD_INHERITS_STDIN, "G_SPAWN_CHILD_INHERITS_STDIN", "child-inherits-stdin" },
-        { G_SPAWN_FILE_AND_ARGV_ZERO, "G_SPAWN_FILE_AND_ARGV_ZERO", "file-and-argv-zero" },
-        { G_SPAWN_SEARCH_PATH_FROM_ENVP, "G_SPAWN_SEARCH_PATH_FROM_ENVP", "search-path-from-envp" },
-        { 0, NULL, NULL }
-      };
-      GType g_define_type_id =
-        g_flags_register_static (g_intern_static_string ("GSpawnFlags"), values);
-      g_once_init_leave (&g_define_type_id__volatile, g_define_type_id);
-    }
-
-  return g_define_type_id__volatile;
-}
diff --git a/gobject/genums.h b/gobject/genums.h
index 38938b3..bf8a419 100644
--- a/gobject/genums.h
+++ b/gobject/genums.h
@@ -256,9 +256,6 @@ void	g_flags_complete_type_info (GType	       g_flags_type,
 				    GTypeInfo	      *info,
 				    const GFlagsValue *const_values);
 
-#define G_TYPE_SPAWN_FLAGS (g_spawn_flags_get_type ())
-GType   g_spawn_flags_get_type (void) G_GNUC_CONST;
-
 G_END_DECLS
 
 #endif /* __G_ENUMS_H__ */
diff --git a/gobject/glib-types.h b/gobject/glib-types.h
index 4bdad3a..e262534 100644
--- a/gobject/glib-types.h
+++ b/gobject/glib-types.h
@@ -255,8 +255,6 @@ GType   g_source_get_type          (void) G_GNUC_CONST;
 GLIB_DEPRECATED_FOR('G_TYPE_VARIANT')
 GType   g_variant_get_gtype        (void) G_GNUC_CONST;
 
-GType   g_spawn_flags_get_type     (void) G_GNUC_CONST;
-
 /**
  * GStrv:
  *



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]