diff options
| author | Slávek Banko <slavek.banko@axis.cz> | 2014-10-03 05:29:56 +0200 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2014-10-03 05:29:56 +0200 |
| commit | ec7b81f4205abd38d6feaa45be397a0eaf797372 (patch) | |
| tree | b1cab477b4342a4e51c6703f371912ca82e40bae | |
| parent | e03192f5e249ab49dbd14672fb99bb258ef67299 (diff) | |
| download | kopete-otr-ec7b81f4205abd38d6feaa45be397a0eaf797372.tar.gz kopete-otr-ec7b81f4205abd38d6feaa45be397a0eaf797372.zip | |
Fix libotr3 detection
Fix FTBFS with libotr3
| -rw-r--r-- | configure.in.in | 11 | ||||
| -rw-r--r-- | src/otrlchatinterface.cpp | 6 |
2 files changed, 12 insertions, 5 deletions
diff --git a/configure.in.in b/configure.in.in index 55b59af..f3e1086 100644 --- a/configure.in.in +++ b/configure.in.in @@ -24,8 +24,9 @@ AC_CHECK_HEADERS([libotr/version.h],, m4_pattern_allow([AM_PATH_LIBOTR]) -AM_PATH_LIBOTR(4.0.0,AC_DEFINE_UNQUOTED(HAVE_LIBOTR_0400, 1, [Defines if your system has libotr greater than or equal to v4.0.0]),) -if test -n "$HAVE_LIBOTR_0400"; then - AM_PATH_LIBOTR(3.1.0,,AC_MSG_ERROR(libotr 3.1.0 or newer is required.)) -fi -AC_SUBST(HAVE_LIBOTR_0400)
\ No newline at end of file +AM_PATH_LIBOTR(4.0.0, + [ AC_DEFINE([HAVE_LIBOTR_0400], 1, [Defines if your system has libotr greater than or equal to v4.0.0]) ], + [ AM_PATH_LIBOTR(3.1.0, + [ AC_DEFINE([HAVE_LIBOTR_0310], 1, [Define if you use libotr3]) ], + [ AC_MSG_ERROR(libotr 3.1.0 or newer is required.) ] ) + ]) diff --git a/src/otrlchatinterface.cpp b/src/otrlchatinterface.cpp index 49895e4..135377b 100644 --- a/src/otrlchatinterface.cpp +++ b/src/otrlchatinterface.cpp @@ -209,7 +209,9 @@ static void gone_secure(void *opdata, ConnContext *context){ OTRPlugin::plugin()->emitGoneSecure( ((Kopete::ChatSession*)opdata), 1 ); } +#ifdef HAVE_LIBOTR_0400 session->setProperty("otr-instag", QString::number(context->their_instance)); +#endif // HAVE_LIBOTR_0400 } /* Actually I've never seen this event but its implemented in case someone should receive it @@ -578,11 +580,13 @@ OtrlChatInterface::OtrlChatInterface(){ otrl_privkey_read_fingerprints(userstate, TQString(TDEGlobal::dirs()->saveLocation("data", "kopete_otr/", true )) + "fingerprints", NULL, NULL); +#ifdef HAVE_LIBOTR_0400 otrl_instag_read(userstate, TQString(TDEGlobal::dirs()->saveLocation("data", "kopete_otr/", true )) + "instags"); unsigned int interval = otrl_message_poll_get_default_interval(userstate); forwardSecrecyTimerStart(interval); connect(&m_forwardSecrecyTimer, SIGNAL(timeout()), this, SLOT(otrlMessagePoll())); +#endif // HAVE_LIBOTR_0400 } @@ -607,7 +611,9 @@ void OtrlChatInterface::forwardSecrecyTimerStop(){ } void OtrlChatInterface::otrlMessagePoll(){ +#ifdef HAVE_LIBOTR_0400 otrl_message_poll(userstate, 0, 0); +#endif // HAVE_LIBOTR_0400 } /********************* Chat section ***************************/ |