diff options
| -rw-r--r-- | Makefile.am | 4 | ||||
| -rw-r--r-- | src/event/server_events.c (renamed from src/server_events.c) | 0 | ||||
| -rw-r--r-- | src/event/server_events.h (renamed from src/server_events.h) | 0 | ||||
| -rw-r--r-- | src/xmpp/bookmark.c | 2 | ||||
| -rw-r--r-- | src/xmpp/connection.c | 4 | ||||
| -rw-r--r-- | src/xmpp/iq.c | 2 | ||||
| -rw-r--r-- | src/xmpp/message.c | 2 | ||||
| -rw-r--r-- | src/xmpp/presence.c | 2 | ||||
| -rw-r--r-- | src/xmpp/roster.c | 2 | ||||
| -rw-r--r-- | tests/test_server_events.c | 2 |
10 files changed, 10 insertions, 10 deletions
diff --git a/Makefile.am b/Makefile.am index e14010a7..f3341d04 100644 --- a/Makefile.am +++ b/Makefile.am @@ -13,7 +13,7 @@ core_sources = \ src/xmpp/roster.c src/xmpp/roster.h \ src/xmpp/bookmark.c src/xmpp/bookmark.h \ src/xmpp/form.c src/xmpp/form.h \ - src/server_events.c src/server_events.h \ + src/event/server_events.c src/event/server_events.h \ src/ui/ui.h src/ui/window.c src/ui/window.h src/ui/core.c \ src/ui/titlebar.c src/ui/statusbar.c src/ui/inputwin.c \ src/ui/titlebar.h src/ui/statusbar.h src/ui/inputwin.h \ @@ -61,7 +61,7 @@ tests_sources = \ src/ui/buffer.c \ src/ui/titlebar.c src/ui/statusbar.c src/ui/inputwin.c \ src/ui/titlebar.h src/ui/statusbar.h src/ui/inputwin.h \ - src/server_events.c src/server_events.h \ + src/event/server_events.c src/event/server_events.h \ tests/xmpp/stub_xmpp.c \ tests/ui/stub_ui.c \ tests/pgp/stub_gpg.c \ diff --git a/src/server_events.c b/src/event/server_events.c index fe942680..fe942680 100644 --- a/src/server_events.c +++ b/src/event/server_events.c diff --git a/src/server_events.h b/src/event/server_events.h index 85d75ac3..85d75ac3 100644 --- a/src/server_events.h +++ b/src/event/server_events.h diff --git a/src/xmpp/bookmark.c b/src/xmpp/bookmark.c index 1cf11f93..9e7bf62b 100644 --- a/src/xmpp/bookmark.c +++ b/src/xmpp/bookmark.c @@ -42,7 +42,7 @@ #include "common.h" #include "log.h" #include "muc.h" -#include "server_events.h" +#include "event/server_events.h" #include "xmpp/connection.h" #include "xmpp/stanza.h" #include "xmpp/xmpp.h" diff --git a/src/xmpp/connection.c b/src/xmpp/connection.c index d6a492ab..c51652fa 100644 --- a/src/xmpp/connection.c +++ b/src/xmpp/connection.c @@ -45,7 +45,7 @@ #include "log.h" #include "muc.h" #include "profanity.h" -#include "server_events.h" +#include "event/server_events.h" #include "xmpp/bookmark.h" #include "xmpp/capabilities.h" #include "xmpp/connection.h" @@ -470,7 +470,7 @@ _connection_handler(xmpp_conn_t * const conn, if (prefs_get_boolean(PREF_CARBONS)){ iq_enable_carbons(); } - + jabber_conn.conn_status = JABBER_CONNECTED; if (prefs_get_reconnect() != 0) { diff --git a/src/xmpp/iq.c b/src/xmpp/iq.c index 2cbed0dd..adee07b8 100644 --- a/src/xmpp/iq.c +++ b/src/xmpp/iq.c @@ -48,7 +48,7 @@ #include "muc.h" #include "profanity.h" #include "config/preferences.h" -#include "server_events.h" +#include "event/server_events.h" #include "xmpp/capabilities.h" #include "xmpp/connection.h" #include "xmpp/stanza.h" diff --git a/src/xmpp/message.c b/src/xmpp/message.c index 9b5419f4..c06ff89d 100644 --- a/src/xmpp/message.c +++ b/src/xmpp/message.c @@ -42,7 +42,7 @@ #include "log.h" #include "muc.h" #include "profanity.h" -#include "server_events.h" +#include "event/server_events.h" #include "xmpp/connection.h" #include "xmpp/message.h" #include "xmpp/roster.h" diff --git a/src/xmpp/presence.c b/src/xmpp/presence.c index 07ac05dd..98c5109e 100644 --- a/src/xmpp/presence.c +++ b/src/xmpp/presence.c @@ -44,7 +44,7 @@ #include "log.h" #include "muc.h" #include "profanity.h" -#include "server_events.h" +#include "event/server_events.h" #include "xmpp/capabilities.h" #include "xmpp/connection.h" #include "xmpp/stanza.h" diff --git a/src/xmpp/roster.c b/src/xmpp/roster.c index 6de370aa..2e9d461b 100644 --- a/src/xmpp/roster.c +++ b/src/xmpp/roster.c @@ -41,7 +41,7 @@ #include "log.h" #include "profanity.h" -#include "server_events.h" +#include "event/server_events.h" #include "tools/autocomplete.h" #include "xmpp/connection.h" #include "xmpp/roster.h" diff --git a/tests/test_server_events.c b/tests/test_server_events.c index ce54b4f2..5df7c243 100644 --- a/tests/test_server_events.c +++ b/tests/test_server_events.c @@ -6,7 +6,7 @@ #include <string.h> #include <glib.h> -#include "server_events.h" +#include "event/server_events.h" #include "roster_list.h" #include "chat_session.h" #include "config/preferences.h" |