Changeset 04026d4

Timestamp:

2006-07-15T17:26:13Z (18 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

0aaca60

Parents:

89a1809

Message:

Fixed a broken call to set_get() (CRASH), shut up a compiler warning in
events_glib and now using the right evaluator for acc->"auto_reconnect".

Files:

• account.c (modified) (1 diff)
• irc.c (modified) (1 diff)
• lib/events_glib.c (modified) (1 diff)
• lib/events_libevent.c (modified) (1 diff)

account.c

@@ -52 +52 @@
         s->flags |= ACC_SET_NOSAVE;
         
-        s = set_add( &a->set, "auto_reconnect", "true", set_eval_account, a );
+        s = set_add( &a->set, "auto_reconnect", "true", set_eval_bool, a );
         
         s = set_add( &a->set, "password", NULL, set_eval_account, a );

irc.c

@@ -624 +624 @@
         char namelist[385] = "";
         struct conversation *c = NULL;
-        char *ops = set_getstr( irc, "ops" );
+        char *ops = set_getstr( &irc->set, "ops" );
         
         /* RFCs say there is no error reply allowed on NAMES, so when the

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 );

lib/events_libevent.c

@@ -101 +101 @@
         
         /* Since the called function might cancel this handler already
-           (which free()s b_ev, we have to remember the ID here. */
+           (which free()s b_ev), we have to remember the ID here. */
         id = b_ev->id;