adium: 4b2771e6: Undoing a bad merge from earlier.

[zacw at adiumx.com]

-----------------------------------------------------------------
Revision: 4b2771e6aa0081e393e002954c3bebfb1027f22c
Ancestor: 452913279ba5990ea46635e9b867aa680769da7e
Author: zacw at adiumx.com
Date: 2009-04-14T06:44:43
Branch: im.pidgin.adium
URL: http://d.pidgin.im/viewmtn/revision/info/4b2771e6aa0081e393e002954c3bebfb1027f22c

Modified files:
        libpurple/protocols/irc/msgs.c

ChangeLog: 

Undoing a bad merge from earlier.

-------------- next part --------------
============================================================
--- libpurple/protocols/irc/msgs.c	81c93b2b9b0c5d0000d11497f6c6bc4d9edaaf1b
+++ libpurple/protocols/irc/msgs.c	65021d750bfe76ab23587833fcb3877817b7ee2e
@@ -129,7 +129,6 @@ static void irc_connected(struct irc_con
 	irc_blist_timeout(irc);
 	if (!irc->timer)
 		irc->timer = purple_timeout_add_seconds(45, (GSourceFunc)irc_blist_timeout, (gpointer)irc);
-		irc->timer = purple_timeout_add(45000, (GSourceFunc)irc_blist_timeout, (gpointer)irc);
 	if (!irc->who_channel_timer)
 		irc->who_channel_timer = purple_timeout_add_seconds(300, (GSourceFunc)irc_who_channel_timeout, (gpointer)irc);
 }