Mercurial > ~mikael > mcabber > hg

diff mcabber/mcabber/main.c @ 1941:2256d0626730

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Modularize fifo system (Myhailo Danylenko) Merge patch from isbear's mcabber-experimental repository.
author Mikael Berthe <mikael@lilotux.net>
date Sun, 27 Feb 2011 17:42:27 +0100
parents 7eadf86039e6
children 7f7c6b87f1b1
line wrap: on
line diff
--- a/mcabber/mcabber/main.c	Sun Feb 27 17:24:11 2011 +0100
+++ b/mcabber/mcabber/main.c	Sun Feb 27 17:42:27 2011 +0100
@@ -41,11 +41,14 @@
 #include "utils.h"
 #include "pgp.h"
 #include "otr.h"
-#include "fifo.h"
 #include "xmpp.h"
 #include "help.h"
 #include "events.h"
 
+#ifndef MODULES_ENABLE
+# include "fifo.h"
+#endif
+
 #ifdef MODULES_ENABLE
 # include "compl.h"
 # include "modules.h"
@@ -77,7 +80,9 @@
 
 static void mcabber_terminate(const char *msg)
 {
+#ifndef MODULES_ENABLE
   fifo_deinit();
+#endif
   xmpp_disconnect();
   scr_terminate_curses();
 
@@ -449,8 +454,10 @@
 
   chatstates_disabled = settings_opt_get_int("disable_chatstates");
 
+#ifndef MODULES_ENABLE
   /* Initialize FIFO named pipe */
   fifo_init();
+#endif
 
   /* Load previous roster state */
   hlog_load_state();
@@ -498,7 +505,9 @@
 #ifdef MODULES_ENABLE
   modules_deinit();
 #endif
+#ifndef MODULES_ENABLE
   fifo_deinit();
+#endif
 #ifdef HAVE_LIBOTR
   otr_terminate();
 #endif