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/xmpp/connection.c | |
| parent | bcfbbac49a0b031a16f61204955861fd2f7c6db8 (diff) | |
| parent | 424f52c3fa0665babd9550cff75e7384ae3a369c (diff) | |
| download | profani-tty-60f94722d469d24b51634ad09134ce5424e4219f.tar.gz | |
Merge branch 'master' into pgp
Diffstat (limited to 'src/xmpp/connection.c')
| -rw-r--r-- | src/xmpp/connection.c | 4 |
1 files changed, 2 insertions, 2 deletions
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) { |