diff options
| author | Wilmer van der Gaast <wilmer@gaast.net> | 2006-07-15 19:26:13 +0200 |
|---|---|---|
| committer | Wilmer van der Gaast <wilmer@gaast.net> | 2006-07-15 19:26:13 +0200 |
| commit | 04026d44c29f2b7d64f81bb2d2d061a7d111662f (patch) | |
| tree | bd4f55e783f4fa55ef9834d19cc60a6bf732bf9e | |
| parent | 89a180978d3e5d81300b82923e8a208ee085d754 (diff) | |
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".
| -rw-r--r-- | account.c | 2 | ||||
| -rw-r--r-- | irc.c | 2 | ||||
| -rw-r--r-- | lib/events_glib.c | 5 | ||||
| -rw-r--r-- | lib/events_libevent.c | 2 |
4 files changed, 7 insertions, 4 deletions
@@ -51,7 +51,7 @@ account_t *account_add( irc_t *irc, struct prpl *prpl, char *user, char *pass ) s = set_add( &a->set, "auto_connect", "true", set_eval_account, a ); 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 ); s->flags |= ACC_SET_NOSAVE; @@ -623,7 +623,7 @@ void irc_names( irc_t *irc, char *channel ) user_t *u; 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 channel is invalid, just give an empty reply. */ diff --git a/lib/events_glib.c b/lib/events_glib.c index 620720cd..38938380 100644 --- a/lib/events_glib.c +++ b/lib/events_glib.c @@ -121,7 +121,10 @@ gint b_input_add(gint source, b_input_condition condition, b_event_handler funct 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 ); diff --git a/lib/events_libevent.c b/lib/events_libevent.c index 1119c2ab..f2b4d15c 100644 --- a/lib/events_libevent.c +++ b/lib/events_libevent.c @@ -100,7 +100,7 @@ static void b_event_passthrough( int fd, short event, void *data ) event_debug( "b_event_passthrough( %d, %d, 0x%x ) (%d)\n", fd, event, (int) data, b_ev->id ); /* 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; if( quitting ) |