# HG changeset patch # User andrew.victor@mxit.com # Date 1318972300 0 # Node ID a78523019e7a6989f6108372b06b3afe973a2a9b # Parent a5f50581b7c0cc1b8133524e239f5d41c7d6def6 IRC: Move the "inpa" input watcher into protocol_data. diff -r a5f50581b7c0 -r a78523019e7a libpurple/protocols/irc/irc.c --- a/libpurple/protocols/irc/irc.c Tue Oct 18 21:02:58 2011 +0000 +++ b/libpurple/protocols/irc/irc.c Tue Oct 18 21:11:40 2011 +0000 @@ -500,7 +500,7 @@ irc->fd = source; if (do_login(gc)) { - gc->inpa = purple_input_add(irc->fd, PURPLE_INPUT_READ, irc_input_cb, gc); + irc->inpa = purple_input_add(irc->fd, PURPLE_INPUT_READ, irc_input_cb, gc); } } @@ -526,8 +526,10 @@ if (irc->gsc || (irc->fd >= 0)) irc_cmd_quit(irc, "quit", NULL, NULL); - if (gc->inpa) - purple_input_remove(gc->inpa); + if (irc->inpa) { + purple_input_remove(irc->inpa); + irc->inpa = 0; + } g_free(irc->inbuf); if (irc->gsc) { diff -r a5f50581b7c0 -r a78523019e7a libpurple/protocols/irc/irc.h --- a/libpurple/protocols/irc/irc.h Tue Oct 18 21:02:58 2011 +0000 +++ b/libpurple/protocols/irc/irc.h Tue Oct 18 21:11:40 2011 +0000 @@ -54,6 +54,7 @@ GHashTable *cmds; char *server; int fd; + guint inpa; guint timer; guint who_channel_timer; GHashTable *buddies;