Changeset 69cb623 for lib/events_glib.c

Timestamp:

2006-10-15T09:41:12Z (18 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

2529faf

Parents:

695e392 (diff), e97827b (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merging with storage-xml. It seems to be working pretty well, so maybe
this way more people will test it. :-)

File:

• lib/events_glib.c (moved) (moved from protocols/events_glib.c) (1 diff)

lib/events_glib.c

@@ -122 +122 @@
 gint b_timeout_add(gint timeout, b_event_handler func, gpointer data)
 {
-        gint st = g_timeout_add(timeout, func, data);
+        /* GSourceFunc and the BitlBee event handler function aren't
+           really the same, but they're "compatible". ;-) It will do
+           for now, BitlBee only looks at the "data" argument. */
+        gint st = g_timeout_add(timeout, (GSourceFunc) func, data);
         
         event_debug( "b_timeout_add( %d, %d, %d ) = %d\n", timeout, func, data, st );