about summary refs log tree commit diff stats
path: root/src/xmpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/xmpp')
-rw-r--r--src/xmpp/bookmark.c6
-rw-r--r--src/xmpp/capabilities.c14
-rw-r--r--src/xmpp/capabilities.h6
-rw-r--r--src/xmpp/connection.c12
-rw-r--r--src/xmpp/connection.h6
-rw-r--r--src/xmpp/form.c6
-rw-r--r--src/xmpp/form.h7
-rw-r--r--src/xmpp/iq.c14
-rw-r--r--src/xmpp/message.c8
-rw-r--r--src/xmpp/presence.c6
-rw-r--r--src/xmpp/roster.c6
-rw-r--r--src/xmpp/stanza.c6
-rw-r--r--src/xmpp/stanza.h6
-rw-r--r--src/xmpp/xmpp.h8
14 files changed, 59 insertions, 52 deletions
diff --git a/src/xmpp/bookmark.c b/src/xmpp/bookmark.c
index 65b265c5..a853062b 100644
--- a/src/xmpp/bookmark.c
+++ b/src/xmpp/bookmark.c
@@ -32,7 +32,7 @@
  *
  */
 
-#include "prof_config.h"
+#include "config.h"
 
 #include <assert.h>
 #include <stdio.h>
@@ -40,10 +40,10 @@
 #include <string.h>
 #include <glib.h>
 
-#ifdef PROF_HAVE_LIBMESODE
+#ifdef HAVE_LIBMESODE
 #include <mesode.h>
 #endif
-#ifdef PROF_HAVE_LIBSTROPHE
+#ifdef HAVE_LIBSTROPHE
 #include <strophe.h>
 #endif
 
diff --git a/src/xmpp/capabilities.c b/src/xmpp/capabilities.c
index 46df6e0e..db840246 100644
--- a/src/xmpp/capabilities.c
+++ b/src/xmpp/capabilities.c
@@ -32,9 +32,9 @@
  *
  */
 
-#include "prof_config.h"
+#include "config.h"
 
-#ifdef PROF_HAVE_GIT_VERSION
+#ifdef HAVE_GIT_VERSION
 #include "gitversion.h"
 #endif
 
@@ -44,10 +44,10 @@
 #include <glib.h>
 #include <glib/gstdio.h>
 
-#ifdef PROF_HAVE_LIBMESODE
+#ifdef HAVE_LIBMESODE
 #include <mesode.h>
 #endif
-#ifdef PROF_HAVE_LIBSTROPHE
+#ifdef HAVE_LIBSTROPHE
 #include <strophe.h>
 #endif
 
@@ -565,9 +565,9 @@ caps_create_query_response_stanza(xmpp_ctx_t *const ctx)
     xmpp_stanza_set_attribute(identity, "type", "console");
 
     GString *name_str = g_string_new("Profanity ");
-    g_string_append(name_str, PROF_PACKAGE_VERSION);
-    if (strcmp(PROF_PACKAGE_STATUS, "development") == 0) {
-#ifdef PROF_HAVE_GIT_VERSION
+    g_string_append(name_str, PACKAGE_VERSION);
+    if (strcmp(PACKAGE_STATUS, "development") == 0) {
+#ifdef HAVE_GIT_VERSION
         g_string_append(name_str, "dev.");
         g_string_append(name_str, PROF_GIT_BRANCH);
         g_string_append(name_str, ".");
diff --git a/src/xmpp/capabilities.h b/src/xmpp/capabilities.h
index 1c01ed4c..929e21dd 100644
--- a/src/xmpp/capabilities.h
+++ b/src/xmpp/capabilities.h
@@ -35,12 +35,12 @@
 #ifndef XMPP_CAPABILITIES_H
 #define XMPP_CAPABILITIES_H
 
-#include "prof_config.h"
+#include "config.h"
 
-#ifdef PROF_HAVE_LIBMESODE
+#ifdef HAVE_LIBMESODE
 #include <mesode.h>
 #endif
-#ifdef PROF_HAVE_LIBSTROPHE
+#ifdef HAVE_LIBSTROPHE
 #include <strophe.h>
 #endif
 
diff --git a/src/xmpp/connection.c b/src/xmpp/connection.c
index 0959470a..e760a0b7 100644
--- a/src/xmpp/connection.c
+++ b/src/xmpp/connection.c
@@ -32,16 +32,16 @@
  *
  */
 
-#include "prof_config.h"
+#include "config.h"
 
 #include <assert.h>
 #include <string.h>
 #include <stdlib.h>
 
-#ifdef PROF_HAVE_LIBMESODE
+#ifdef HAVE_LIBMESODE
 #include <mesode.h>
 #endif
-#ifdef PROF_HAVE_LIBSTROPHE
+#ifdef HAVE_LIBSTROPHE
 #include <strophe.h>
 #endif
 
@@ -425,7 +425,7 @@ _connection_free_session_data(void)
     presence_clear_sub_requests();
 }
 
-#ifdef PROF_HAVE_LIBMESODE
+#ifdef HAVE_LIBMESODE
 static int
 _connection_certfail_cb(xmpp_tlscert_t *xmpptlscert, const char *const errormsg)
 {
@@ -544,7 +544,7 @@ _jabber_connect(const char *const fulljid, const char *const passwd, const char
         xmpp_conn_set_flags(jabber_conn.conn, XMPP_CONN_FLAG_DISABLE_TLS);
     }
 
-#ifdef PROF_HAVE_LIBMESODE
+#ifdef HAVE_LIBMESODE
     char *cert_path = prefs_get_string(PREF_TLS_CERTPATH);
     if (cert_path) {
         xmpp_conn_tlscert_path(jabber_conn.conn, cert_path);
@@ -552,7 +552,7 @@ _jabber_connect(const char *const fulljid, const char *const passwd, const char
     prefs_free_string(cert_path);
 #endif
 
-#ifdef PROF_HAVE_LIBMESODE
+#ifdef HAVE_LIBMESODE
     int connect_status = xmpp_connect_client(
         jabber_conn.conn,
         altdomain,
diff --git a/src/xmpp/connection.h b/src/xmpp/connection.h
index 857fc88b..9d15bc96 100644
--- a/src/xmpp/connection.h
+++ b/src/xmpp/connection.h
@@ -35,12 +35,12 @@
 #ifndef XMPP_CONNECTION_H
 #define XMPP_CONNECTION_H
 
-#include "prof_config.h"
+#include "config.h"
 
-#ifdef PROF_HAVE_LIBMESODE
+#ifdef HAVE_LIBMESODE
 #include <mesode.h>
 #endif
-#ifdef PROF_HAVE_LIBSTROPHE
+#ifdef HAVE_LIBSTROPHE
 #include <strophe.h>
 #endif
 
diff --git a/src/xmpp/form.c b/src/xmpp/form.c
index f6724160..41c76803 100644
--- a/src/xmpp/form.c
+++ b/src/xmpp/form.c
@@ -32,15 +32,15 @@
  *
  */
 
-#include "prof_config.h"
+#include "config.h"
 
 #include <string.h>
 #include <stdlib.h>
 
-#ifdef PROF_HAVE_LIBMESODE
+#ifdef HAVE_LIBMESODE
 #include <mesode.h>
 #endif
-#ifdef PROF_HAVE_LIBSTROPHE
+#ifdef HAVE_LIBSTROPHE
 #include <strophe.h>
 #endif
 
diff --git a/src/xmpp/form.h b/src/xmpp/form.h
index 208143f6..8d0dac02 100644
--- a/src/xmpp/form.h
+++ b/src/xmpp/form.h
@@ -37,6 +37,13 @@
 
 #include "xmpp/xmpp.h"
 
+#ifdef HAVE_LIBMESODE
+#include <mesode.h>
+#endif
+#ifdef HAVE_LIBSTROPHE
+#include <strophe.h>
+#endif
+
 DataForm* form_create(xmpp_stanza_t *const stanza);
 xmpp_stanza_t* form_create_submission(DataForm *form);
 
diff --git a/src/xmpp/iq.c b/src/xmpp/iq.c
index 67c8daaf..17f129b0 100644
--- a/src/xmpp/iq.c
+++ b/src/xmpp/iq.c
@@ -32,9 +32,9 @@
  *
  */
 
-#include "prof_config.h"
+#include "config.h"
 
-#ifdef PROF_HAVE_GIT_VERSION
+#ifdef HAVE_GIT_VERSION
 #include "gitversion.h"
 #endif
 
@@ -43,10 +43,10 @@
 #include <stdio.h>
 #include <glib.h>
 
-#ifdef PROF_HAVE_LIBMESODE
+#ifdef HAVE_LIBMESODE
 #include <mesode.h>
 #endif
-#ifdef PROF_HAVE_LIBSTROPHE
+#ifdef HAVE_LIBSTROPHE
 #include <strophe.h>
 #endif
 
@@ -1131,9 +1131,9 @@ _version_get_handler(xmpp_stanza_t *const stanza)
         xmpp_stanza_t *version = xmpp_stanza_new(ctx);
         xmpp_stanza_set_name(version, "version");
         xmpp_stanza_t *version_txt = xmpp_stanza_new(ctx);
-        GString *version_str = g_string_new(PROF_PACKAGE_VERSION);
-        if (strcmp(PROF_PACKAGE_STATUS, "development") == 0) {
-#ifdef PROF_HAVE_GIT_VERSION
+        GString *version_str = g_string_new(PACKAGE_VERSION);
+        if (strcmp(PACKAGE_STATUS, "development") == 0) {
+#ifdef HAVE_GIT_VERSION
             g_string_append(version_str, "dev.");
             g_string_append(version_str, PROF_GIT_BRANCH);
             g_string_append(version_str, ".");
diff --git a/src/xmpp/message.c b/src/xmpp/message.c
index 5878a0d5..bdcceb5e 100644
--- a/src/xmpp/message.c
+++ b/src/xmpp/message.c
@@ -32,15 +32,15 @@
  *
  */
 
-#include "prof_config.h"
+#include "config.h"
 
 #include <stdlib.h>
 #include <string.h>
 
-#ifdef PROF_HAVE_LIBMESODE
+#ifdef HAVE_LIBMESODE
 #include <mesode.h>
 #endif
-#ifdef PROF_HAVE_LIBSTROPHE
+#ifdef HAVE_LIBSTROPHE
 #include <strophe.h>
 #endif
 
@@ -198,7 +198,7 @@ message_send_chat_pgp(const char *const barejid, const char *const msg)
     char *id = create_unique_id("msg");
 
     xmpp_stanza_t *message = NULL;
-#ifdef PROF_HAVE_LIBGPGME
+#ifdef HAVE_LIBGPGME
     char *account_name = jabber_get_account_name();
     ProfAccount *account = accounts_get_account(account_name);
     if (account->pgp_keyid) {
diff --git a/src/xmpp/presence.c b/src/xmpp/presence.c
index 888e936d..24d2729a 100644
--- a/src/xmpp/presence.c
+++ b/src/xmpp/presence.c
@@ -32,7 +32,7 @@
  *
  */
 
-#include "prof_config.h"
+#include "config.h"
 
 #include <assert.h>
 #include <stdlib.h>
@@ -41,10 +41,10 @@
 #include <glib.h>
 #include <glib/gprintf.h>
 
-#ifdef PROF_HAVE_LIBMESODE
+#ifdef HAVE_LIBMESODE
 #include <mesode.h>
 #endif
-#ifdef PROF_HAVE_LIBSTROPHE
+#ifdef HAVE_LIBSTROPHE
 #include <strophe.h>
 #endif
 
diff --git a/src/xmpp/roster.c b/src/xmpp/roster.c
index 9605f611..05afdcd8 100644
--- a/src/xmpp/roster.c
+++ b/src/xmpp/roster.c
@@ -32,7 +32,7 @@
  *
  */
 
-#include "prof_config.h"
+#include "config.h"
 
 #include <assert.h>
 #include <stdlib.h>
@@ -40,10 +40,10 @@
 
 #include <glib.h>
 
-#ifdef PROF_HAVE_LIBMESODE
+#ifdef HAVE_LIBMESODE
 #include <mesode.h>
 #endif
-#ifdef PROF_HAVE_LIBSTROPHE
+#ifdef HAVE_LIBSTROPHE
 #include <strophe.h>
 #endif
 
diff --git a/src/xmpp/stanza.c b/src/xmpp/stanza.c
index dc4c3bbd..618c455f 100644
--- a/src/xmpp/stanza.c
+++ b/src/xmpp/stanza.c
@@ -32,17 +32,17 @@
  *
  */
 
-#include "prof_config.h"
+#include "config.h"
 
 #include <stdlib.h>
 #include <string.h>
 
 #include <glib.h>
 
-#ifdef PROF_HAVE_LIBMESODE
+#ifdef HAVE_LIBMESODE
 #include <mesode.h>
 #endif
-#ifdef PROF_HAVE_LIBSTROPHE
+#ifdef HAVE_LIBSTROPHE
 #include <strophe.h>
 #endif
 
diff --git a/src/xmpp/stanza.h b/src/xmpp/stanza.h
index 1e375783..b4a51580 100644
--- a/src/xmpp/stanza.h
+++ b/src/xmpp/stanza.h
@@ -35,12 +35,12 @@
 #ifndef XMPP_STANZA_H
 #define XMPP_STANZA_H
 
-#include "prof_config.h"
+#include "config.h"
 
-#ifdef PROF_HAVE_LIBMESODE
+#ifdef HAVE_LIBMESODE
 #include <mesode.h>
 #endif
-#ifdef PROF_HAVE_LIBSTROPHE
+#ifdef HAVE_LIBSTROPHE
 #include <strophe.h>
 #endif
 
diff --git a/src/xmpp/xmpp.h b/src/xmpp/xmpp.h
index 8a7d4850..9dcc1798 100644
--- a/src/xmpp/xmpp.h
+++ b/src/xmpp/xmpp.h
@@ -35,12 +35,12 @@
 #ifndef XMPP_XMPP_H
 #define XMPP_XMPP_H
 
-#include "prof_config.h"
+#include "config.h"
 
-#ifdef PROF_HAVE_LIBMESODE
+#ifdef HAVE_LIBMESODE
 #include <mesode.h>
 #endif
-#ifdef PROF_HAVE_LIBSTROPHE
+#ifdef HAVE_LIBSTROPHE
 #include <strophe.h>
 #endif
 
@@ -155,7 +155,7 @@ char* jabber_get_account_name(void);
 GList* jabber_get_available_resources(void);
 char* jabber_create_uuid(void);
 void jabber_free_uuid(char *uuid);
-#ifdef PROF_HAVE_LIBMESODE
+#ifdef HAVE_LIBMESODE
 TLSCertificate* jabber_get_tls_peer_cert(void);
 #endif
 gboolean jabber_conn_is_secured(void);
generated by cgit-pink 1.4.1-2-gfad0 (git 2.36.2.497.gbbea4dcf42) at 2024-10-07 02:59:34 +0000