Added timeout-add and idle-add

[clg] / glib / callback.c

diff --git a/glib/callback.c b/glib/callback.c
index 846c5d17cf3c509d0e54b4cf2383c192505ffb37..1fa8cc1df254638ff18aa0d3407243cfc5ba4c10 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.1 2000-11-09 20:29:19 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"
@@ -65,13 +65,13 @@ void destroy_notify (gpointer data)
 }
 
 GClosure*
-g_lisp_callback_closure (guint callback_id)
+g_lisp_callback_closure_new (guint callback_id)
 {
   GClosure *closure;
 
   closure = g_closure_new_simple (sizeof (GClosure), (gpointer)callback_id);
   g_closure_set_marshal (closure, lisp_callback_marshal);
-  g_closure_add_fnotify (closure, (gpointer)callback_id, closure_destroy_notify);
+  g_closure_add_finalize_notifier (closure, (gpointer)callback_id, closure_destroy_notify);
   
   return closure;
 }
@@ -83,3 +83,19 @@ destroy_notify_address ()
   return (void*)destroy_notify;
 }
 #endif
+
+
+GEnumValue*
+g_enum_class_values (GEnumClass *class, guint *n_values)
+{
+  *n_values = class->n_values;
+  return class->values;
+}
+
+GFlagsValue*
+g_flags_class_values (GFlagsClass *class, guint *n_values)
+{
+  *n_values = class->n_values;
+  return class->values;
+}
+