Merge remote-tracking branch 'oliverlemoal/xep-0280' into xep-0280

2015-03-08 21:51:50 +00:00
parent 232bf9b7fc d89112e138
commit 945f29873e
17 changed files with 167 additions and 2 deletions
--- a/src/xmpp/connection.c
+++ b/src/xmpp/connection.c
@@ -466,6 +466,11 @@ _connection_handler(xmpp_conn_t * const conn,

        roster_request();
        bookmark_request();
+
+        if (prefs_get_boolean(PREF_CARBONS)){
+            iq_enable_carbons();
+        }
+        
        jabber_conn.conn_status = JABBER_CONNECTED;

        if (prefs_get_reconnect() != 0) {