Stop calling nogaim_init() on every incoming connection (unless we're

using libpurple). This was leaking memory and indirectly caused the bug
fixed by the previous revision.

2 files changed, 11 insertions, 0 deletions

diff --git a/irc.c b/irc.c
index 579fb8cf..3044c593 100644
--- a/irc.c
+++ b/irc.c
@@ -164,7 +164,11 @@ irc_t *irc_new( int fd )
 	g_free( myhost );
 	g_free( host );
 	
+	/* libpurple doesn't like fork()s after initializing itself, so this
+	   is the right moment to initialize it. */
+#ifdef WITH_PURPLE
 	nogaim_init();
+#endif
 	
 	for( l = irc_plugins; l; l = l->next )
 	{
diff --git a/unix.c b/unix.c
index ad21c716..07215c07 100644
--- a/unix.c
+++ b/unix.c
@@ -73,6 +73,13 @@ int main( int argc, char *argv[] )
 	
 	b_main_init();
 	
+	/* libpurple doesn't like fork()s after initializing itself, so if
+	   we use it, do this init a little later (in case we're running in
+	   ForkDaemon mode). */
+#ifndef WITH_PURPLE
+	nogaim_init();
+#endif
+	
  	/* Ugly Note: libotr and gnutls both use libgcrypt. libgcrypt
  	   has a process-global config state whose initialization happpens
  	   twice if libotr and gnutls are used together. libotr installs custom