first step to remove libmesode

Signed-off-by: Steffen Jaeckel <jaeckel-floss@eyet-services.de>

src/command/cmd_funcs.c

@@ -177,7 +177,6 @@ cmd_execute_connect(ProfWin* window, const char* const account)
 gboolean
 cmd_tls_certpath(ProfWin* window, const char* const command, gchar** args)
 {
-#ifdef HAVE_LIBMESODE
     if (g_strcmp0(args[1], "set") == 0) {
         if (args[2] == NULL) {
             cons_bad_cmd_usage(command);
@@ -212,16 +211,11 @@ cmd_tls_certpath(ProfWin* window, const char* const command, gchar** args)
         cons_bad_cmd_usage(command);
         return TRUE;
     }
-#else
-    cons_show("Certificate path setting only supported when built with libmesode.");
-    return TRUE;
-#endif
 }
 
 gboolean
 cmd_tls_trust(ProfWin* window, const char* const command, gchar** args)
 {
-#ifdef HAVE_LIBMESODE
     jabber_conn_status_t conn_status = connection_get_status();
     if (conn_status != JABBER_CONNECTED) {
         cons_show("You are currently not connected.");
@@ -245,16 +239,11 @@ cmd_tls_trust(ProfWin* window, const char* const command, gchar** args)
     tlscerts_add(cert);
     tlscerts_free(cert);
     return TRUE;
-#else
-    cons_show("Manual certificate trust only supported when built with libmesode.");
-    return TRUE;
-#endif
 }
 
 gboolean
 cmd_tls_trusted(ProfWin* window, const char* const command, gchar** args)
 {
-#ifdef HAVE_LIBMESODE
     GList* certs = tlscerts_list();
     GList* curr = certs;
 
@@ -272,16 +261,11 @@ cmd_tls_trusted(ProfWin* window, const char* const command, gchar** args)
     }
     g_list_free_full(certs, (GDestroyNotify)tlscerts_free);
     return TRUE;
-#else
-    cons_show("Manual certificate trust only supported when built with libmesode.");
-    return TRUE;
-#endif
 }
 
 gboolean
 cmd_tls_revoke(ProfWin* window, const char* const command, gchar** args)
 {
-#ifdef HAVE_LIBMESODE
     if (args[1] == NULL) {
         cons_bad_cmd_usage(command);
     } else {
@@ -293,16 +277,11 @@ cmd_tls_revoke(ProfWin* window, const char* const command, gchar** args)
         }
     }
     return TRUE;
-#else
-    cons_show("Manual certificate trust only supported when built with libmesode.");
-    return TRUE;
-#endif
 }
 
 gboolean
 cmd_tls_cert(ProfWin* window, const char* const command, gchar** args)
 {
-#ifdef HAVE_LIBMESODE
     if (args[1]) {
         TLSCertificate* cert = tlscerts_get_trusted(args[1]);
         if (!cert) {
@@ -332,10 +311,6 @@ cmd_tls_cert(ProfWin* window, const char* const command, gchar** args)
         tlscerts_free(cert);
         return TRUE;
     }
-#else
-    cons_show("Certificate fetching not supported.");
-    return TRUE;
-#endif
 }
 
 gboolean

src/main.c

@@ -125,12 +125,7 @@ main(int argc, char** argv)
 
         g_print("Build information:\n");
 
-#ifdef HAVE_LIBMESODE
-        g_print("XMPP library: libmesode\n");
-#endif
-#ifdef HAVE_LIBSTROPHE
         g_print("XMPP library: libstrophe\n");
-#endif
 
         if (is_notify_enabled()) {
             g_print("Desktop notification support: Enabled\n");

src/xmpp/blocking.c

@@ -38,13 +38,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#ifdef HAVE_LIBMESODE
-#include <mesode.h>
-#endif
-
-#ifdef HAVE_LIBSTROPHE
 #include <strophe.h>
-#endif
 
 #include <glib.h>
 

src/xmpp/bookmark.c

@@ -41,13 +41,7 @@
 #include <string.h>
 #include <glib.h>
 
-#ifdef HAVE_LIBMESODE
-#include <mesode.h>
-#endif
-
-#ifdef HAVE_LIBSTROPHE
 #include <strophe.h>
-#endif
 
 #include "common.h"
 #include "log.h"

src/xmpp/capabilities.c

@@ -45,13 +45,7 @@
 #include <glib.h>
 #include <glib/gstdio.h>
 
-#ifdef HAVE_LIBMESODE
-#include <mesode.h>
-#endif
-
-#ifdef HAVE_LIBSTROPHE
 #include <strophe.h>
-#endif
 
 #include "common.h"
 #include "log.h"

src/xmpp/capabilities.h

@@ -38,13 +38,7 @@
 
 #include "config.h"
 
-#ifdef HAVE_LIBMESODE
-#include <mesode.h>
-#endif
-
-#ifdef HAVE_LIBSTROPHE
 #include <strophe.h>
-#endif
 
 #include "xmpp/xmpp.h"
 

src/xmpp/connection.c

@@ -43,13 +43,7 @@
 #include <glib.h>
 #include <glib/gstdio.h>
 
-#ifdef HAVE_LIBMESODE
-#include <mesode.h>
-#endif
-
-#ifdef HAVE_LIBSTROPHE
 #include <strophe.h>
-#endif
 
 #include "common.h"
 #include "log.h"

src/xmpp/form.c

@@ -38,13 +38,7 @@
 #include <string.h>
 #include <stdlib.h>
 
-#ifdef HAVE_LIBMESODE
-#include <mesode.h>
-#endif
-
-#ifdef HAVE_LIBSTROPHE
 #include <strophe.h>
-#endif
 
 #include <glib.h>
 

src/xmpp/form.h

@@ -36,13 +36,7 @@
 #ifndef XMPP_FORM_H
 #define XMPP_FORM_H
 
-#ifdef HAVE_LIBMESODE
-#include <mesode.h>
-#endif
-
-#ifdef HAVE_LIBSTROPHE
 #include <strophe.h>
-#endif
 
 #include "xmpp/xmpp.h"
 

src/xmpp/iq.c

@@ -44,13 +44,7 @@
 #include <stdio.h>
 #include <glib.h>
 
-#ifdef HAVE_LIBMESODE
-#include <mesode.h>
-#endif
-
-#ifdef HAVE_LIBSTROPHE
 #include <strophe.h>
-#endif
 
 #include "profanity.h"
 #include "log.h"

src/xmpp/message.c

@@ -39,13 +39,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#ifdef HAVE_LIBMESODE
-#include <mesode.h>
-#endif
-
-#ifdef HAVE_LIBSTROPHE
 #include <strophe.h>
-#endif
 
 #include "profanity.h"
 #include "log.h"

src/xmpp/presence.c

@@ -42,13 +42,7 @@
 #include <glib.h>
 #include <glib/gprintf.h>
 
-#ifdef HAVE_LIBMESODE
-#include <mesode.h>
-#endif
-
-#ifdef HAVE_LIBSTROPHE
 #include <strophe.h>
-#endif
 
 #include "profanity.h"
 #include "log.h"

src/xmpp/roster.c

@@ -41,13 +41,7 @@
 
 #include <glib.h>
 
-#ifdef HAVE_LIBMESODE
-#include <mesode.h>
-#endif
-
-#ifdef HAVE_LIBSTROPHE
 #include <strophe.h>
-#endif
 
 #include "profanity.h"
 #include "log.h"

src/xmpp/stanza.c

@@ -48,13 +48,7 @@
 
 #include <glib.h>
 
-#ifdef HAVE_LIBMESODE
-#include <mesode.h>
-#endif
-
-#ifdef HAVE_LIBSTROPHE
 #include <strophe.h>
-#endif
 
 #include "common.h"
 #include "log.h"

src/xmpp/stanza.h

@@ -38,13 +38,7 @@
 
 #include "config.h"
 
-#ifdef HAVE_LIBMESODE
-#include <mesode.h>
-#endif
-
-#ifdef HAVE_LIBSTROPHE
 #include <strophe.h>
-#endif
 
 #include <xmpp/xmpp.h>
 

src/xmpp/xmpp.h

@@ -40,13 +40,7 @@
 
 #include "config.h"
 
-#ifdef HAVE_LIBMESODE
-#include <mesode.h>
-#endif
-
-#ifdef HAVE_LIBSTROPHE
 #include <strophe.h>
-#endif
 
 #include "config/accounts.h"
 #include "config/tlscerts.h"