diff options
| author | James Booth <boothj5@gmail.com> | 2013-02-03 22:46:32 +0000 |
|---|---|---|
| committer | James Booth <boothj5@gmail.com> | 2013-02-03 22:46:32 +0000 |
| commit | 2ee0c4d328b0c25c1cfcfe09cb68192a37d1fac1 (patch) | |
| tree | a2922112dd919b5332f1fec3e5160da250169234 /src | |
| parent | 0b40de5a4f2c4f887e3ab086a87c641fc6538c4d (diff) | |
| download | profani-tty-2ee0c4d328b0c25c1cfcfe09cb68192a37d1fac1.tar.gz | |
Moved caps_init() out of xmpp.h
Diffstat (limited to 'src')
| -rw-r--r-- | src/profanity.c | 1 | ||||
| -rw-r--r-- | src/xmpp/capabilities.h | 1 | ||||
| -rw-r--r-- | src/xmpp/connection.c | 2 | ||||
| -rw-r--r-- | src/xmpp/xmpp.h | 1 |
4 files changed, 3 insertions, 2 deletions
diff --git a/src/profanity.c b/src/profanity.c index 9bc260a8..30a438e1 100644 --- a/src/profanity.c +++ b/src/profanity.c @@ -506,7 +506,6 @@ _init(const int disable_tls, char *log_level) theme_init(theme); g_free(theme); ui_init(); - caps_init(); jabber_init(disable_tls); cmd_init(); log_info("Initialising contact list"); diff --git a/src/xmpp/capabilities.h b/src/xmpp/capabilities.h index b837fcdd..d4d3d524 100644 --- a/src/xmpp/capabilities.h +++ b/src/xmpp/capabilities.h @@ -27,6 +27,7 @@ #include "xmpp/xmpp.h" +void caps_init(void); void caps_add(const char * const caps_str, const char * const client); gboolean caps_contains(const char * const caps_str); char* caps_create_sha1_str(xmpp_stanza_t * const query); diff --git a/src/xmpp/connection.c b/src/xmpp/connection.c index 2bb92694..995617a1 100644 --- a/src/xmpp/connection.c +++ b/src/xmpp/connection.c @@ -34,6 +34,7 @@ #include "log.h" #include "muc.h" #include "profanity.h" +#include "xmpp/capabilities.h" #include "xmpp/connection.h" #include "xmpp/iq.h" #include "xmpp/message.h" @@ -92,6 +93,7 @@ jabber_init(const int disable_tls) jabber_conn.presence_message = NULL; jabber_conn.tls_disabled = disable_tls; presence_init(); + caps_init(); } void diff --git a/src/xmpp/xmpp.h b/src/xmpp/xmpp.h index 644bba48..9ecdd5ba 100644 --- a/src/xmpp/xmpp.h +++ b/src/xmpp/xmpp.h @@ -84,7 +84,6 @@ void presence_update(jabber_presence_t status, const char * const msg, int idle); // caps functions -void caps_init(void); Capabilities* caps_get(const char * const caps_str); void caps_close(void); |