about summary refs log tree commit diff stats
path: root/src/xmpp/connection.c
diff options
context:
space:
mode:
authorJames Booth <boothj5@gmail.com>2015-03-08 21:51:50 +0000
committerJames Booth <boothj5@gmail.com>2015-03-08 21:51:50 +0000
commit945f29873ec6fb275cdaac72f1e6f143650464b5 (patch)
tree08116e2b1e5505aee66b432c8863a85888fb7a51 /src/xmpp/connection.c
parent232bf9b7fc80b0f2013359f002d38bc7a4d9c50f (diff)
parentd89112e13894d4d6a23846997ea7ef0c42674fe4 (diff)
downloadprofani-tty-945f29873ec6fb275cdaac72f1e6f143650464b5.tar.gz
Merge remote-tracking branch 'oliverlemoal/xep-0280' into xep-0280
Diffstat (limited to 'src/xmpp/connection.c')
-rw-r--r--src/xmpp/connection.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/xmpp/connection.c b/src/xmpp/connection.c
index 375dfcba..d6a492ab 100644
--- 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) {