Removed #AX_PREFIX_CONFIG_H

This commit is contained in:
James Booth
2016-03-31 21:05:02 +01:00
parent c91ce78a04
commit 9b177a9e01
50 changed files with 246 additions and 239 deletions

View File

@@ -7,7 +7,7 @@
#include <cmocka.h>
#include <sys/stat.h>
#include "prof_config.h"
#include "config.h"
#include "proftest.h"
#include "test_connect.h"

View File

@@ -798,7 +798,7 @@ void cmd_account_set_priority_updates_presence_when_account_connected_with_prese
will_return(jabber_get_account_name, "a_account");
#ifdef PROF_HAVE_LIBGPGME
#ifdef HAVE_LIBGPGME
ProfAccount *account = account_new("a_account", "a_jid", NULL, NULL, TRUE, NULL, 5222, "a_resource",
NULL, NULL, 10, 10, 10, 10, 10, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);

View File

@@ -6,9 +6,9 @@
#include <string.h>
#include <glib.h>
#include "prof_config.h"
#include "config.h"
#ifdef PROF_HAVE_LIBOTR
#ifdef HAVE_LIBOTR
#include <libotr/proto.h>
#include "otr/otr.h"
#endif
@@ -24,7 +24,7 @@
#define CMD_OTR "/otr"
#ifdef PROF_HAVE_LIBOTR
#ifdef HAVE_LIBOTR
void cmd_otr_shows_usage_when_no_args(void **state)
{
gchar *args[] = { NULL };

View File

@@ -1,6 +1,6 @@
#include "prof_config.h"
#include "config.h"
#ifdef PROF_HAVE_LIBOTR
#ifdef HAVE_LIBOTR
void cmd_otr_shows_usage_when_no_args(void **state);
void cmd_otr_shows_usage_when_invalid_subcommand(void **state);
void cmd_otr_log_shows_usage_when_no_args(void **state);

View File

@@ -6,7 +6,7 @@
#include <string.h>
#include <glib.h>
#include "prof_config.h"
#include "config.h"
#include "command/commands.h"
@@ -14,7 +14,7 @@
#define CMD_PGP "/pgp"
#ifdef PROF_HAVE_LIBGPGME
#ifdef HAVE_LIBGPGME
void cmd_pgp_shows_usage_when_no_args(void **state)
{
gchar *args[] = { NULL };

View File

@@ -1,6 +1,6 @@
#include "prof_config.h"
#include "config.h"
#ifdef PROF_HAVE_LIBGPGME
#ifdef HAVE_LIBGPGME
void cmd_pgp_shows_usage_when_no_args(void **state);
void cmd_pgp_start_shows_message_when_disconnected(void **state);
void cmd_pgp_start_shows_message_when_disconnecting(void **state);

View File

@@ -1,4 +1,4 @@
#include "prof_config.h"
#include "config.h"
#include <glib.h>
#include <wchar.h>
@@ -8,7 +8,7 @@
#include "ui/window.h"
#include "ui/ui.h"
#ifdef PROF_HAVE_LIBOTR
#ifdef HAVE_LIBOTR
#include "otr/otr.h"
#endif
@@ -67,7 +67,7 @@ void ui_resize(void) {}
void ui_focus_win(ProfWin *win) {}
#ifdef PROF_HAVE_LIBOTR
#ifdef HAVE_LIBOTR
void chatwin_otr_secured(ProfChatWin *chatwin, gboolean trusted) {}
void chatwin_otr_unsecured(ProfChatWin *chatwin) {}
void chatwin_otr_trust(ProfChatWin *chatwin) {}

View File

@@ -7,7 +7,7 @@
#include <cmocka.h>
#include <sys/stat.h>
#include "prof_config.h"
#include "config.h"
#include "chat_session.h"
#include "helpers.h"
#include "test_autocomplete.h"
@@ -355,7 +355,7 @@ int main(int argc, char* argv[]) {
unit_test(cmd_account_set_eval_password_when_password_set),
unit_test(cmd_account_set_muc_sets_muc),
unit_test(cmd_account_set_nick_sets_nick),
#ifdef PROF_HAVE_LIBOTR
#ifdef HAVE_LIBOTR
unit_test(cmd_account_show_message_for_missing_otr_policy),
unit_test(cmd_account_show_message_for_invalid_otr_policy),
unit_test(cmd_account_set_otr_sets_otr),
@@ -504,7 +504,7 @@ int main(int argc, char* argv[]) {
unit_test(cmd_bookmark_remove_removes_bookmark),
unit_test(cmd_bookmark_remove_shows_message_when_no_bookmark),
#ifdef PROF_HAVE_LIBOTR
#ifdef HAVE_LIBOTR
unit_test(cmd_otr_shows_usage_when_no_args),
unit_test(cmd_otr_shows_usage_when_invalid_subcommand),
unit_test(cmd_otr_log_shows_usage_when_no_args),
@@ -556,7 +556,7 @@ int main(int argc, char* argv[]) {
unit_test(cmd_otr_shows_message_when_otr_unsupported),
#endif
#ifdef PROF_HAVE_LIBGPGME
#ifdef HAVE_LIBGPGME
unit_test(cmd_pgp_shows_usage_when_no_args),
unit_test(cmd_pgp_start_shows_message_when_disconnected),
unit_test(cmd_pgp_start_shows_message_when_disconnecting),