Updated for gtk-1.3.11

[clg] / glib / callback.c

diff --git a/glib/callback.c b/glib/callback.c
index 9450ec7..b872b8b 100644 (file)
--- a/glib/callback.c
+++ b/glib/callback.c
@@ -16,9 +16,9 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-/* $Id: callback.c,v 1.3 2001/04/29 20:11:21 espen Exp $ */
+/* $Id: callback.c,v 1.6 2001/12/12 20:24:41 espen Exp $ */
 
-#include <gobject/gobject.h>
+#include <glib-object.h>
 
 #ifdef CMUCL
 #include "lisp.h"
@@ -85,40 +85,17 @@ destroy_notify_address ()
 #endif
 
 
-GList*
-g_object_class_properties (GObjectClass *class)
+GEnumValue*
+g_enum_class_values (GEnumClass *class, guint *n_values)
 {
-  GList *list = NULL;
-  int i;
-
-  for (i = 0; i < class->n_property_specs; i++)
-    list = g_list_append (list, class->property_specs[i]);
-
-  return list;
+  *n_values = class->n_values;
+  return class->values;
 }
 
-#include        <gobject/genums.h>
-GList*
-g_enum_class_values (GEnumClass *class)
+GFlagsValue*
+g_flags_class_values (GFlagsClass *class, guint *n_values)
 {
-  GList *list = NULL;
-  int i;
-
-  for (i = 0; i < class->n_values; i++)
-    list = g_list_append (list, &class->values[i]);
-
-  return list;
-}
-
-GList*
-g_flags_class_values (GFlagsClass *class)
-{
-  GList *list = NULL;
-  int i;
-
-  for (i = 0; i < class->n_values; i++)
-    list = g_list_append (list, &class->values[i]);
-
-  return list;
+  *n_values = class->n_values;
+  return class->values;
 }