aniani/profanity
1
0
Fork 0
mirror of https://github.com/profanity-im/profanity.git synced 2024-06-16 21:35:24 +00:00
Code

Fixed OTR dependency when library not present, changed version to 0.4.2

Browse Source
This commit is contained in:
James Booth 2014-05-19 20:41:19 +01:00
parent 3fb5649ccc
commit e10ea1be4e
5 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.ac
View File

@ -1,7 +1,7 @@
# -*- Autoconf -*-
# Process this file with autoconf to produce a configure script.
AC_INIT([profanity], [0.5.0], [boothj5web@gmail.com])
AC_INIT([profanity], [0.4.2], [boothj5web@gmail.com])
AC_CONFIG_SRCDIR([src/main.c])
AC_CONFIG_HEADERS([src/config.h])
AC_CONFIG_AUX_DIR([build-aux])

2
src/command/command.c
View File

@ -41,7 +41,9 @@
#include "jid.h"
#include "log.h"
#include "muc.h"
#ifdef HAVE_LIBOTR
#include "otr/otr.h"
#endif
#include "profanity.h"
#include "tools/autocomplete.h"
#include "tools/parser.h"

4
src/command/commands.c
View File

@ -24,7 +24,9 @@
#include <stdlib.h>
#include <errno.h>
#include <glib.h>
#ifdef HAVE_LIBOTR
#include <libotr/proto.h>
#endif
#include "chat_session.h"
#include "command/commands.h"
@ -39,7 +41,9 @@
#include "jid.h"
#include "log.h"
#include "muc.h"
#ifdef HAVE_LIBOTR
#include "otr/otr.h"
#endif
#include "profanity.h"
#include "tools/autocomplete.h"
#include "tools/parser.h"

2
src/ui/core.c
View File

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

4
tests/otr/mock_otr.c
View File

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