Merge remote-tracking branch 'origin/plugins' into plugins

profanity.spec

@@ -1,5 +1,5 @@
 Name:		profanity
-Version:	0.4.1
+Version:	0.5.0
 Release:	2%{?dist}
 Summary:	A console based XMPP client
 

src/command/command.c

@@ -26,6 +26,10 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include <glib.h>
+
+#include "prof_config.h"
+
 #include "chat_session.h"
 #include "command/command.h"
 #include "command/commands.h"
@@ -40,7 +44,9 @@
 #include "log.h"
 #include "muc.h"
 #include "plugins/plugins.h"
+#ifdef PROF_HAVE_LIBOTR
 #include "otr/otr.h"
+#endif
 #include "profanity.h"
 #include "tools/autocomplete.h"
 #include "tools/parser.h"
@@ -617,7 +623,7 @@ static struct cmd_t command_defs[] =
           "policy - manual, opportunistic or always.",
           "secret [secret]- Verify a contacts identity using a shared secret.",
           "question [question] [answer] - Verify a contacts identity using a question and expected anwser, if the question has spaces, surround with double quotes.",
-          "answer [anwser] - Respond to a question answer verification request with your answer.",
+          "answer [answer] - Respond to a question answer verification request with your answer.",
           NULL } } },
 
     { "/outtype",
@@ -1516,7 +1522,7 @@ _cmd_complete_parameters(char *input, int *size)
             }
         }
 
-    // otherwise autocomple using roster
+    // otherwise autocomplete using roster
     } else {
         gchar *contact_choices[] = { "/msg", "/info", "/status" };
         for (i = 0; i < ARRAY_SIZE(contact_choices); i++) {

src/command/commands.c

@@ -20,11 +20,15 @@
  *
  */
 
+#include "prof_config.h"
+
 #include <string.h>
 #include <stdlib.h>
 #include <errno.h>
 #include <glib.h>
+#ifdef PROF_HAVE_LIBOTR
 #include <libotr/proto.h>
+#endif
 
 #include "chat_session.h"
 #include "command/commands.h"
@@ -39,7 +43,9 @@
 #include "jid.h"
 #include "log.h"
 #include "muc.h"
+#ifdef PROF_HAVE_LIBOTR
 #include "otr/otr.h"
+#endif
 #include "profanity.h"
 #include "plugins/plugins.h"
 #include "tools/autocomplete.h"

src/profanity.c

@@ -107,7 +107,7 @@ prof_run(const int disable_tls, char *log_level, char *account_name)
 
             ui_handle_special_keys(&ch, inp, size);
             ui_update_screen();
-#ifdef HAVE_LIBOTR
+#ifdef PROF_HAVE_LIBOTR
             otr_poll();
 #endif
             jabber_process_events();

src/server_events.c

@@ -23,6 +23,8 @@
 #include <string.h>
 #include <stdlib.h>
 
+#include "prof_config.h"
+
 #include "chat_session.h"
 #include "log.h"
 #include "muc.h"

src/ui/core.c

@@ -48,7 +48,9 @@
 #include "jid.h"
 #include "log.h"
 #include "muc.h"
+#ifdef PROF_HAVE_LIBOTR
 #include "otr/otr.h"
+#endif
 #include "ui/ui.h"
 #include "ui/titlebar.h"
 #include "ui/statusbar.h"

src/ui/titlebar.c

@@ -23,6 +23,8 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include "prof_config.h"
+
 #include "common.h"
 #include "config/theme.h"
 #include "config/preferences.h"

tests/otr/mock_otr.c

@@ -6,9 +6,15 @@
 #include <string.h>
 #include <glib.h>
 
+
+#include "prof_config.h"
+
+#ifdef PROF_HAVE_LIBOTR
 #include "otr/otr.h"
+#endif
 #include "config/account.h"
 
+#ifdef PROF_HAVE_LIBOTR
 static void
 _mock_otr_keygen(ProfAccount *account)
 {
@@ -88,3 +94,4 @@ otr_start_query_returns(char *query)
     otr_start_query = _mock_otr_start_query;
     will_return(_mock_otr_start_query, query);
 }
+#endif