Changeset 3fc6c32

Timestamp:

2010-10-16T22:58:21Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

83e47ec

Parents:

9c9a29c

Message:

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.

Files:

• irc.c (modified) (1 diff)
• unix.c (modified) (1 diff)

irc.c

@@ -165 +165 @@
         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 )

unix.c

@@ -74 +74 @@
         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