diff options
| -rw-r--r-- | bitlbee.h | 2 | ||||
| -rw-r--r-- | irc_send.c | 3 | ||||
| -rw-r--r-- | lib/events_glib.c | 8 | ||||
| -rw-r--r-- | protocols/yahoo/yahoo2.h | 2 |
4 files changed, 5 insertions, 10 deletions
@@ -92,8 +92,6 @@ extern "C" { #define g_io_add_watch_full __PLEASE_USE_B_INPUT_ADD__ #undef g_source_remove #define g_source_remove __PLEASE_USE_B_EVENT_REMOVE__ -#undef g_source_remove_by_user_data -#define g_source_remove_by_user_data __PLEASE_USE_B_SOURCE_REMOVE_BY_USER_DATA__ #undef g_main_run #define g_main_run __PLEASE_USE_B_MAIN_RUN__ #undef g_main_quit @@ -174,11 +174,10 @@ void irc_send_join(irc_channel_t *ic, irc_user_t *iu) irc_write(irc, ":%s!%s@%s JOIN :%s", iu->nick, iu->user, iu->host, ic->name); if (iu == irc->user) { - irc_write(irc, ":%s MODE %s +%s", irc->root->host, ic->name, ic->mode); - irc_send_names(ic); if (ic->topic && *ic->topic) { irc_send_topic(ic, FALSE); } + irc_send_names(ic); } } diff --git a/lib/events_glib.c b/lib/events_glib.c index 404031e8..dca704e1 100644 --- a/lib/events_glib.c +++ b/lib/events_glib.c @@ -81,7 +81,7 @@ static gboolean gaim_io_invoke(GIOChannel *source, GIOCondition condition, gpoin gaim_cond |= B_EV_IO_WRITE; } - event_debug("gaim_io_invoke( %d, %d, 0x%x )\n", g_io_channel_unix_get_fd(source), condition, data); + event_debug("gaim_io_invoke( %d, %d, %p )\n", g_io_channel_unix_get_fd(source), condition, data); st = closure->function(closure->data, g_io_channel_unix_get_fd(source), gaim_cond); @@ -100,7 +100,7 @@ static gboolean gaim_io_invoke(GIOChannel *source, GIOCondition condition, gpoin static void gaim_io_destroy(gpointer data) { - event_debug("gaim_io_destroy( 0x%x )\n", data); + event_debug("gaim_io_destroy( 0%p )\n", data); g_free(data); } @@ -126,7 +126,7 @@ gint b_input_add(gint source, b_input_condition condition, b_event_handler funct st = g_io_add_watch_full(channel, G_PRIORITY_DEFAULT, cond, gaim_io_invoke, closure, gaim_io_destroy); - event_debug("b_input_add( %d, %d, 0x%x, 0x%x ) = %d (%p)\n", source, condition, function, data, st, closure); + event_debug("b_input_add( %d, %d, %p, %p ) = %d (%p)\n", source, condition, function, data, st, closure); g_io_channel_unref(channel); return st; @@ -139,7 +139,7 @@ gint b_timeout_add(gint timeout, b_event_handler func, gpointer data) 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); + event_debug("b_timeout_add( %d, %p, %p ) = %d\n", timeout, func, data, st); return st; } diff --git a/protocols/yahoo/yahoo2.h b/protocols/yahoo/yahoo2.h index 464672a1..b9d0e176 100644 --- a/protocols/yahoo/yahoo2.h +++ b/protocols/yahoo/yahoo2.h @@ -32,8 +32,6 @@ extern "C" { #define free(x) g_free(x) #undef malloc #define malloc(x) g_malloc(x) -#undef calloc -#define calloc(x, y) g_calloc(x, y) #undef realloc #define realloc(x, y) g_realloc(x, y) #undef strdup |