# HG changeset patch
# User Roeland Jago Douma <roeland@famdouma.nl>
# Date 1381856838 -7200
# Node ID adfd962e1343ab22af2cd6f3f7b3f16b1e19b032
# Parent  1bd9978ed5d068ac032946ce2aa6b77083a577e5
Allow the user to enable/disable carbons from the command line

diff -r 1bd9978ed5d0 -r adfd962e1343 mcabber/mcabber/carbons.c
--- a/mcabber/mcabber/carbons.c	Tue Oct 15 18:55:18 2013 +0200
+++ b/mcabber/mcabber/carbons.c	Tue Oct 15 19:07:18 2013 +0200
@@ -8,8 +8,8 @@
 static int _carbons_available = 0;
 static int _carbons_enabled = 0;
 
-static LmHandlerResult cb_carbons_enable(LmMessageHandler *h, LmConnection *c,
-                                         LmMessage *m, gpointer user_data);
+static LmHandlerResult cb_carbons(LmMessageHandler *h, LmConnection *c,
+                                  LmMessage *m, gpointer user_data);
 
 
 void carbons_init()
@@ -31,7 +31,14 @@
 
 void carbons_enable()
 {
+  //We cannot enable carbons if there is no carbons support
   if (_carbons_available == 0) {
+    scr_LogPrint(LPRINT_NORMAL, "Carbons not available on this server!");
+    return;
+  }
+
+  //We only have to enable carbons once
+  if (_carbons_enabled == 1) {
     return;
   }
 
@@ -44,10 +51,8 @@
                                     LM_MESSAGE_SUB_TYPE_SET);
 
   enable = lm_message_node_add_child(iq->node, "enable", NULL);
-
   lm_message_node_set_attribute(enable, "xmlns", NS_CARBONS_2);
-
-  handler = lm_message_handler_new(cb_carbons_enable, NULL, NULL);
+  handler = lm_message_handler_new(cb_carbons, NULL, NULL);
 
   if (!lm_connection_send_with_reply(lconnection, iq, handler, &error)) {
     scr_LogPrint(LPRINT_DEBUG, "Error sending IQ request: %s.", error->message);
@@ -60,9 +65,37 @@
 
 void carbons_disable()
 {
+  //We cannot disable carbons if there is no carbon support on the server
   if (_carbons_available == 0) {
+    scr_LogPrint(LPRINT_NORMAL, "Carbons not available on this server!");
     return;
   }
+
+  //We can only disable carbons if they are disabled
+  if (_carbons_enabled == 0) {
+    return;
+  } 
+
+  LmMessage *iq;
+  LmMessageNode *disable;
+  LmMessageHandler *handler;
+  GError *error = NULL;
+
+  iq = lm_message_new_with_sub_type(NULL, LM_MESSAGE_TYPE_IQ,
+                                    LM_MESSAGE_SUB_TYPE_SET);
+
+  disable = lm_message_node_add_child(iq->node, "disable", NULL);
+  lm_message_node_set_attribute(disable, "xmlns", NS_CARBONS_2);
+  handler = lm_message_handler_new(cb_carbons, NULL, NULL);
+
+  if (!lm_connection_send_with_reply(lconnection, iq, handler, &error)) {
+    scr_LogPrint(LPRINT_DEBUG, "Error sending IQ request: %s.", error->message);
+    g_error_free(error);
+  }
+
+  lm_message_handler_unref(handler);
+  lm_message_unref(iq);
+ 
 }
 
 void carbons_info()
@@ -78,8 +111,8 @@
   }
 }
 
-static LmHandlerResult cb_carbons_enable(LmMessageHandler *h, LmConnection *c,
-                                         LmMessage *m, gpointer user_data)
+static LmHandlerResult cb_carbons(LmMessageHandler *h, LmConnection *c,
+                                  LmMessage *m, gpointer user_data)
 {
   if (lm_message_get_sub_type(m) == LM_MESSAGE_SUB_TYPE_RESULT) {
     _carbons_enabled = _carbons_enabled == 0 ? 1 : 0;
diff -r 1bd9978ed5d0 -r adfd962e1343 mcabber/mcabber/commands.c
--- a/mcabber/mcabber/commands.c	Tue Oct 15 18:55:18 2013 +0200
+++ b/mcabber/mcabber/commands.c	Tue Oct 15 19:07:18 2013 +0200
@@ -4164,9 +4164,9 @@
   if (!strcasecmp(arg, "info")) {
     carbons_info();
   } else if (!strcasecmp(arg, "enable")) {
-
+    carbons_enable();
   } else if (!strcasecmp(arg, "disable")) {
-
+    carbons_disable();
   }
 }