From 10f556f4127c248d0a25a97d03a0731c554cfa1a Mon Sep 17 00:00:00 2001
From: James Booth <boothj5@gmail.com>
Date: Tue, 13 Aug 2013 22:23:47 +0100
Subject: Added libotr

---
 src/otr.c       | 35 +++++++++++++++++++++++++++++++++++
 src/otr.h       | 28 ++++++++++++++++++++++++++++
 src/profanity.c |  5 ++++-
 3 files changed, 67 insertions(+), 1 deletion(-)
 create mode 100644 src/otr.c
 create mode 100644 src/otr.h

(limited to 'src')

diff --git a/src/otr.c b/src/otr.c
new file mode 100644
index 00000000..7dd6aafd
--- /dev/null
+++ b/src/otr.c
@@ -0,0 +1,35 @@
+/*
+ * otr.c
+ *
+ * Copyright (C) 2012, 2013 James Booth <boothj5@gmail.com>
+ *
+ * This file is part of Profanity.
+ *
+ * Profanity is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Profanity is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Profanity.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include <libotr/proto.h>
+#include <libotr/userstate.h>
+#include <libotr/message.h>
+#include <libotr/privkey.h>
+
+#include "ui/ui.h"
+
+void
+otr_init(void)
+{
+    cons_debug("otr_init()");
+    OTRL_INIT;
+}
diff --git a/src/otr.h b/src/otr.h
new file mode 100644
index 00000000..772c0f34
--- /dev/null
+++ b/src/otr.h
@@ -0,0 +1,28 @@
+/*
+ * otr.h
+ *
+ * Copyright (C) 2012, 2013 James Booth <boothj5@gmail.com>
+ *
+ * This file is part of Profanity.
+ *
+ * Profanity is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Profanity is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Profanity.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#ifndef OTR_H
+#define OTR_H
+
+void otr_init(void);
+
+#endif
diff --git a/src/profanity.c b/src/profanity.c
index 9c729ca1..ded96890 100644
--- a/src/profanity.c
+++ b/src/profanity.c
@@ -19,7 +19,6 @@
  * along with Profanity.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-
 #include "config.h"
 
 #include <locale.h>
@@ -40,6 +39,7 @@
 #include "contact.h"
 #include "log.h"
 #include "muc.h"
+#include "otr.h"
 #include "resource.h"
 #include "ui/notifier.h"
 #include "ui/ui.h"
@@ -632,6 +632,9 @@ _init(const int disable_tls, char *log_level)
     log_info("Initialising contact list");
     roster_init();
     muc_init();
+#ifdef HAVE_LIBOTR
+    otr_init();
+#endif
     atexit(_shutdown);
 }
 
-- 
cgit 1.4.1-2-gfad0