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/blocking.c1
-rw-r--r--src/xmpp/bookmark.c7
-rw-r--r--src/xmpp/capabilities.c3
-rw-r--r--src/xmpp/capabilities.h1
-rw-r--r--src/xmpp/chat_session.c4
-rw-r--r--src/xmpp/chat_state.c6
-rw-r--r--src/xmpp/connection.c1
-rw-r--r--src/xmpp/contact.c4
-rw-r--r--src/xmpp/contact.h2
-rw-r--r--src/xmpp/form.c1
-rw-r--r--src/xmpp/form.h5
-rw-r--r--src/xmpp/iq.c23
-rw-r--r--src/xmpp/jid.c3
-rw-r--r--src/xmpp/message.c17
-rw-r--r--src/xmpp/muc.c6
-rw-r--r--src/xmpp/muc.h4
-rw-r--r--src/xmpp/presence.c11
-rw-r--r--src/xmpp/roster.c10
-rw-r--r--src/xmpp/roster_list.c6
-rw-r--r--src/xmpp/session.c10
-rw-r--r--src/xmpp/session.h11
-rw-r--r--src/xmpp/stanza.c4
-rw-r--r--src/xmpp/stanza.h1
-rw-r--r--src/xmpp/xmpp.h5
24 files changed, 74 insertions, 72 deletions
diff --git a/src/xmpp/blocking.c b/src/xmpp/blocking.c
index 39cfb65a..a5a920e4 100644
--- a/src/xmpp/blocking.c
+++ b/src/xmpp/blocking.c
@@ -38,6 +38,7 @@
 #ifdef HAVE_LIBMESODE
 #include <mesode.h>
 #endif
+
 #ifdef HAVE_LIBSTROPHE
 #include <strophe.h>
 #endif
diff --git a/src/xmpp/bookmark.c b/src/xmpp/bookmark.c
index 69c74b2e..940b7982 100644
--- a/src/xmpp/bookmark.c
+++ b/src/xmpp/bookmark.c
@@ -43,21 +43,22 @@
 #ifdef HAVE_LIBMESODE
 #include <mesode.h>
 #endif
+
 #ifdef HAVE_LIBSTROPHE
 #include <strophe.h>
 #endif
 
 #include "common.h"
 #include "log.h"
-#include "muc.h"
 #include "event/server_events.h"
+#include "plugins/plugins.h"
+#include "ui/ui.h"
 #include "xmpp/connection.h"
 #include "xmpp/iq.h"
 #include "xmpp/stanza.h"
 #include "xmpp/xmpp.h"
 #include "xmpp/bookmark.h"
-#include "ui/ui.h"
-#include "plugins/plugins.h"
+#include "xmpp/muc.h"
 
 #define BOOKMARK_TIMEOUT 5000
 
diff --git a/src/xmpp/capabilities.c b/src/xmpp/capabilities.c
index 2a8aff0e..4d9c0a36 100644
--- a/src/xmpp/capabilities.c
+++ b/src/xmpp/capabilities.c
@@ -47,17 +47,18 @@
 #ifdef HAVE_LIBMESODE
 #include <mesode.h>
 #endif
+
 #ifdef HAVE_LIBSTROPHE
 #include <strophe.h>
 #endif
 
 #include "common.h"
 #include "log.h"
+#include "plugins/plugins.h"
 #include "xmpp/xmpp.h"
 #include "xmpp/stanza.h"
 #include "xmpp/form.h"
 #include "xmpp/capabilities.h"
-#include "plugins/plugins.h"
 
 static gchar *cache_loc;
 static GKeyFile *cache;
diff --git a/src/xmpp/capabilities.h b/src/xmpp/capabilities.h
index d5d3d777..71fc06f1 100644
--- a/src/xmpp/capabilities.h
+++ b/src/xmpp/capabilities.h
@@ -40,6 +40,7 @@
 #ifdef HAVE_LIBMESODE
 #include <mesode.h>
 #endif
+
 #ifdef HAVE_LIBSTROPHE
 #include <strophe.h>
 #endif
diff --git a/src/xmpp/chat_session.c b/src/xmpp/chat_session.c
index 7e844871..61d7018c 100644
--- a/src/xmpp/chat_session.c
+++ b/src/xmpp/chat_session.c
@@ -38,10 +38,10 @@
 
 #include <glib.h>
 
-#include "chat_session.h"
-#include "config/preferences.h"
 #include "log.h"
+#include "config/preferences.h"
 #include "xmpp/xmpp.h"
+#include "xmpp/chat_session.h"
 
 static GHashTable *sessions;
 
diff --git a/src/xmpp/chat_state.c b/src/xmpp/chat_state.c
index 66c24265..ad78c3b9 100644
--- a/src/xmpp/chat_state.c
+++ b/src/xmpp/chat_state.c
@@ -37,12 +37,12 @@
 
 #include <glib.h>
 
-#include "chat_state.h"
-#include "xmpp/chat_session.h"
+#include "config/preferences.h"
 #include "ui/window_list.h"
 #include "ui/win_types.h"
 #include "xmpp/xmpp.h"
-#include "config/preferences.h"
+#include "xmpp/chat_state.h"
+#include "xmpp/chat_session.h"
 
 #define PAUSED_TIMEOUT 10.0
 #define INACTIVE_TIMEOUT 30.0
diff --git a/src/xmpp/connection.c b/src/xmpp/connection.c
index c590b7ba..8a963bb4 100644
--- a/src/xmpp/connection.c
+++ b/src/xmpp/connection.c
@@ -41,6 +41,7 @@
 #ifdef HAVE_LIBMESODE
 #include <mesode.h>
 #endif
+
 #ifdef HAVE_LIBSTROPHE
 #include <strophe.h>
 #endif
diff --git a/src/xmpp/contact.c b/src/xmpp/contact.c
index 000d7668..d50af5cd 100644
--- a/src/xmpp/contact.c
+++ b/src/xmpp/contact.c
@@ -38,10 +38,10 @@
 
 #include <glib.h>
 
-#include "contact.h"
 #include "common.h"
-#include "resource.h"
 #include "tools/autocomplete.h"
+#include "xmpp/resource.h"
+#include "xmpp/contact.h"
 
 struct p_contact_t {
     char *barejid;
diff --git a/src/xmpp/contact.h b/src/xmpp/contact.h
index 6a13d01e..8e71faef 100644
--- a/src/xmpp/contact.h
+++ b/src/xmpp/contact.h
@@ -35,8 +35,8 @@
 #ifndef XMPP_CONTACT_H
 #define XMPP_CONTACT_H
 
-#include "resource.h"
 #include "tools/autocomplete.h"
+#include "xmpp/resource.h"
 
 typedef struct p_contact_t *PContact;
 
diff --git a/src/xmpp/form.c b/src/xmpp/form.c
index bc0c9da9..3619f95b 100644
--- a/src/xmpp/form.c
+++ b/src/xmpp/form.c
@@ -40,6 +40,7 @@
 #ifdef HAVE_LIBMESODE
 #include <mesode.h>
 #endif
+
 #ifdef HAVE_LIBSTROPHE
 #include <strophe.h>
 #endif
diff --git a/src/xmpp/form.h b/src/xmpp/form.h
index f9740d68..5ce9ce31 100644
--- a/src/xmpp/form.h
+++ b/src/xmpp/form.h
@@ -35,15 +35,16 @@
 #ifndef XMPP_FORM_H
 #define XMPP_FORM_H
 
-#include "xmpp/xmpp.h"
-
 #ifdef HAVE_LIBMESODE
 #include <mesode.h>
 #endif
+
 #ifdef HAVE_LIBSTROPHE
 #include <strophe.h>
 #endif
 
+#include "xmpp/xmpp.h"
+
 DataForm* form_create(xmpp_stanza_t *const stanza);
 xmpp_stanza_t* form_create_submission(DataForm *form);
 char* form_get_form_type_field(DataForm *form);
diff --git a/src/xmpp/iq.c b/src/xmpp/iq.c
index c5f75ed0..3a29fbfc 100644
--- a/src/xmpp/iq.c
+++ b/src/xmpp/iq.c
@@ -46,30 +46,31 @@
 #ifdef HAVE_LIBMESODE
 #include <mesode.h>
 #endif
+
 #ifdef HAVE_LIBSTROPHE
 #include <strophe.h>
 #endif
 
-#include "log.h"
-#include "muc.h"
 #include "profanity.h"
-#include "ui/ui.h"
-#include "ui/window_list.h"
+#include "log.h"
 #include "config/preferences.h"
 #include "event/server_events.h"
+#include "plugins/plugins.h"
+#include "tools/http_upload.h"
+#include "ui/ui.h"
+#include "ui/window_list.h"
+#include "xmpp/xmpp.h"
+#include "xmpp/connection.h"
+#include "xmpp/session.h"
+#include "xmpp/iq.h"
 #include "xmpp/capabilities.h"
 #include "xmpp/blocking.h"
 #include "xmpp/session.h"
 #include "xmpp/stanza.h"
 #include "xmpp/form.h"
-#include "roster_list.h"
-#include "xmpp/xmpp.h"
-#include "xmpp/connection.h"
-#include "xmpp/session.h"
-#include "xmpp/iq.h"
+#include "xmpp/roster_list.h"
 #include "xmpp/roster.h"
-#include "plugins/plugins.h"
-#include "tools/http_upload.h"
+#include "xmpp/muc.h"
 
 typedef struct p_room_info_data_t {
     char *room;
diff --git a/src/xmpp/jid.c b/src/xmpp/jid.c
index 1fe5d8f5..fb4361d7 100644
--- a/src/xmpp/jid.c
+++ b/src/xmpp/jid.c
@@ -37,9 +37,8 @@
 
 #include <glib.h>
 
-#include "jid.h"
-
 #include "common.h"
+#include "xmpp/jid.h"
 
 Jid*
 jid_create(const gchar *const str)
diff --git a/src/xmpp/message.c b/src/xmpp/message.c
index 9b485954..fc314e30 100644
--- a/src/xmpp/message.c
+++ b/src/xmpp/message.c
@@ -40,26 +40,27 @@
 #ifdef HAVE_LIBMESODE
 #include <mesode.h>
 #endif
+
 #ifdef HAVE_LIBSTROPHE
 #include <strophe.h>
 #endif
 
-#include "chat_session.h"
-#include "config/preferences.h"
-#include "log.h"
-#include "muc.h"
 #include "profanity.h"
-#include "ui/ui.h"
+#include "log.h"
+#include "config/preferences.h"
 #include "event/server_events.h"
+#include "pgp/gpg.h"
+#include "plugins/plugins.h"
+#include "ui/ui.h"
+#include "xmpp/chat_session.h"
+#include "xmpp/muc.h"
 #include "xmpp/session.h"
 #include "xmpp/message.h"
 #include "xmpp/roster.h"
-#include "roster_list.h"
+#include "xmpp/roster_list.h"
 #include "xmpp/stanza.h"
 #include "xmpp/connection.h"
 #include "xmpp/xmpp.h"
-#include "pgp/gpg.h"
-#include "plugins/plugins.h"
 
 static int _message_handler(xmpp_conn_t *const conn, xmpp_stanza_t *const stanza, void *const userdata);
 
diff --git a/src/xmpp/muc.c b/src/xmpp/muc.c
index 83766c80..b7c9884e 100644
--- a/src/xmpp/muc.c
+++ b/src/xmpp/muc.c
@@ -38,13 +38,13 @@
 
 #include <glib.h>
 
-#include "xmpp/contact.h"
 #include "common.h"
-#include "xmpp/jid.h"
 #include "tools/autocomplete.h"
 #include "ui/ui.h"
 #include "ui/window_list.h"
-#include "muc.h"
+#include "xmpp/jid.h"
+#include "xmpp/muc.h"
+#include "xmpp/contact.h"
 
 typedef struct _muc_room_t {
     char *room; // e.g. test@conference.server
diff --git a/src/xmpp/muc.h b/src/xmpp/muc.h
index b5d9a38b..84be1dd2 100644
--- a/src/xmpp/muc.h
+++ b/src/xmpp/muc.h
@@ -37,10 +37,10 @@
 
 #include <glib.h>
 
-#include "xmpp/contact.h"
-#include "xmpp/jid.h"
 #include "tools/autocomplete.h"
 #include "ui/win_types.h"
+#include "xmpp/contact.h"
+#include "xmpp/jid.h"
 
 typedef enum {
     MUC_ROLE_NONE,
diff --git a/src/xmpp/presence.c b/src/xmpp/presence.c
index eed95fe1..84f2873e 100644
--- a/src/xmpp/presence.c
+++ b/src/xmpp/presence.c
@@ -44,24 +44,25 @@
 #ifdef HAVE_LIBMESODE
 #include <mesode.h>
 #endif
+
 #ifdef HAVE_LIBSTROPHE
 #include <strophe.h>
 #endif
 
+#include "profanity.h"
+#include "log.h"
 #include "common.h"
 #include "config/preferences.h"
-#include "log.h"
-#include "muc.h"
-#include "profanity.h"
-#include "ui/ui.h"
 #include "event/server_events.h"
+#include "plugins/plugins.h"
+#include "ui/ui.h"
 #include "xmpp/connection.h"
 #include "xmpp/capabilities.h"
 #include "xmpp/session.h"
 #include "xmpp/stanza.h"
 #include "xmpp/iq.h"
 #include "xmpp/xmpp.h"
-#include "plugins/plugins.h"
+#include "xmpp/muc.h"
 
 static Autocomplete sub_requests_ac;
 
diff --git a/src/xmpp/roster.c b/src/xmpp/roster.c
index 0449499b..7955aef3 100644
--- a/src/xmpp/roster.c
+++ b/src/xmpp/roster.c
@@ -43,26 +43,26 @@
 #ifdef HAVE_LIBMESODE
 #include <mesode.h>
 #endif
+
 #ifdef HAVE_LIBSTROPHE
 #include <strophe.h>
 #endif
 
+#include "profanity.h"
 #include "log.h"
+#include "config/preferences.h"
 #include "plugins/plugins.h"
-#include "profanity.h"
-#include "ui/ui.h"
 #include "event/server_events.h"
 #include "event/client_events.h"
 #include "tools/autocomplete.h"
-#include "config/preferences.h"
+#include "ui/ui.h"
 #include "xmpp/session.h"
 #include "xmpp/iq.h"
 #include "xmpp/connection.h"
 #include "xmpp/roster.h"
-#include "roster_list.h"
+#include "xmpp/roster_list.h"
 #include "xmpp/stanza.h"
 #include "xmpp/xmpp.h"
-#include "plugins/plugins.h"
 
 // callback data for group commands
 typedef struct _group_data {
diff --git a/src/xmpp/roster_list.c b/src/xmpp/roster_list.c
index 789449c2..057146a2 100644
--- a/src/xmpp/roster_list.c
+++ b/src/xmpp/roster_list.c
@@ -39,12 +39,12 @@
 #include <glib.h>
 #include <assert.h>
 
-#include "roster_list.h"
+#include "config/preferences.h"
+#include "tools/autocomplete.h"
+#include "xmpp/roster_list.h"
 #include "xmpp/resource.h"
 #include "xmpp/contact.h"
 #include "xmpp/jid.h"
-#include "tools/autocomplete.h"
-#include "config/preferences.h"
 
 typedef struct prof_roster_t {
     // contacts, indexed on barejid
diff --git a/src/xmpp/session.c b/src/xmpp/session.c
index 6dc94aef..5c9c3b4c 100644
--- a/src/xmpp/session.c
+++ b/src/xmpp/session.c
@@ -38,14 +38,11 @@
 #include <string.h>
 #include <stdlib.h>
 
-#include "chat_session.h"
+#include "profanity.h"
+#include "log.h"
 #include "common.h"
 #include "config/preferences.h"
-#include "jid.h"
-#include "log.h"
-#include "muc.h"
 #include "plugins/plugins.h"
-#include "profanity.h"
 #include "event/server_events.h"
 #include "xmpp/bookmark.h"
 #include "xmpp/blocking.h"
@@ -58,6 +55,9 @@
 #include "xmpp/roster.h"
 #include "xmpp/stanza.h"
 #include "xmpp/xmpp.h"
+#include "xmpp/muc.h"
+#include "xmpp/chat_session.h"
+#include "xmpp/jid.h"
 
 // for auto reconnect
 static struct {
diff --git a/src/xmpp/session.h b/src/xmpp/session.h
index dcd276b3..1bc67b63 100644
--- a/src/xmpp/session.h
+++ b/src/xmpp/session.h
@@ -35,16 +35,7 @@
 #ifndef XMPP_SESSION_H
 #define XMPP_SESSION_H
 
-#include "config.h"
-
-#ifdef HAVE_LIBMESODE
-#include <mesode.h>
-#endif
-#ifdef HAVE_LIBSTROPHE
-#include <strophe.h>
-#endif
-
-#include "resource.h"
+#include <glib.h>
 
 void session_login_success(gboolean secured);
 void session_login_failed(void);
diff --git a/src/xmpp/stanza.c b/src/xmpp/stanza.c
index 9174bcd2..971b7bfc 100644
--- a/src/xmpp/stanza.c
+++ b/src/xmpp/stanza.c
@@ -47,6 +47,7 @@
 #ifdef HAVE_LIBMESODE
 #include <mesode.h>
 #endif
+
 #ifdef HAVE_LIBSTROPHE
 #include <strophe.h>
 #endif
@@ -58,8 +59,7 @@
 #include "xmpp/capabilities.h"
 #include "xmpp/connection.h"
 #include "xmpp/form.h"
-
-#include "muc.h"
+#include "xmpp/muc.h"
 
 #if 0
 xmpp_stanza_t*
diff --git a/src/xmpp/stanza.h b/src/xmpp/stanza.h
index 49be2d56..bc649107 100644
--- a/src/xmpp/stanza.h
+++ b/src/xmpp/stanza.h
@@ -40,6 +40,7 @@
 #ifdef HAVE_LIBMESODE
 #include <mesode.h>
 #endif
+
 #ifdef HAVE_LIBSTROPHE
 #include <strophe.h>
 #endif
diff --git a/src/xmpp/xmpp.h b/src/xmpp/xmpp.h
index b883c139..c34ee60a 100644
--- a/src/xmpp/xmpp.h
+++ b/src/xmpp/xmpp.h
@@ -40,16 +40,17 @@
 #ifdef HAVE_LIBMESODE
 #include <mesode.h>
 #endif
+
 #ifdef HAVE_LIBSTROPHE
 #include <strophe.h>
 #endif
 
 #include "config/accounts.h"
 #include "config/tlscerts.h"
-#include "contact.h"
-#include "jid.h"
 #include "tools/autocomplete.h"
 #include "tools/http_upload.h"
+#include "xmpp/contact.h"
+#include "xmpp/jid.h"
 
 #define JABBER_PRIORITY_MIN -128
 #define JABBER_PRIORITY_MAX 127
generated by cgit-pink 1.4.1-2-gfad0 (git 2.36.2.497.gbbea4dcf42) at 2024-07-02 16:08:11 +0000