diff options
author | James Booth <boothj5@gmail.com> | 2015-04-19 16:56:11 +0100 |
---|---|---|
committer | James Booth <boothj5@gmail.com> | 2015-04-19 16:56:11 +0100 |
commit | 60f94722d469d24b51634ad09134ce5424e4219f (patch) | |
tree | 2fd013b6078c72e33447ee7b9c9cdf9ec9090493 /src | |
parent | bcfbbac49a0b031a16f61204955861fd2f7c6db8 (diff) | |
parent | 424f52c3fa0665babd9550cff75e7384ae3a369c (diff) | |
download | profani-tty-60f94722d469d24b51634ad09134ce5424e4219f.tar.gz |
Merge branch 'master' into pgp
Diffstat (limited to 'src')
-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 |
8 files changed, 7 insertions, 7 deletions
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" |