# HG changeset patch
# User Mikael Berthe <mikael@lilotux.net>
# Date 1270298247 -7200
# Node ID 663cd6c38cdcd38c75b7f2b67bee8f0230fa03b7
# Parent  6352c9a79845d4401f8ba62801ca7b844e6840b7# Parent  189c2a5a4e6639b98c79e891d0215bbe6a03a8cf
Merge main and crew

diff -r 6352c9a79845 -r 663cd6c38cdc mcabber/mcabber/xmpp_helper.c
--- a/mcabber/mcabber/xmpp_helper.c	Sat Apr 03 14:32:09 2010 +0200
+++ b/mcabber/mcabber/xmpp_helper.c	Sat Apr 03 14:37:27 2010 +0200
@@ -77,29 +77,29 @@
 static GSList *xmpp_additional_features = NULL;
 static char *ver, *ver_notavail;
 
-void xmpp_add_feature (const char *xmlns)
+void xmpp_add_feature(const char *xmlns)
 {
   if (xmlns) {
     ver = NULL;
     ver_notavail = NULL;
     xmpp_additional_features = g_slist_append(xmpp_additional_features,
-                                              g_strdup (xmlns));
+                                              g_strdup(xmlns));
   }
 }
 
-void xmpp_del_feature (const char *xmlns)
+void xmpp_del_feature(const char *xmlns)
 {
   GSList *feature = xmpp_additional_features;
   while (feature) {
     if (!strcmp(feature->data, xmlns)) {
       ver = NULL;
       ver_notavail = NULL;
-      g_free (feature->data);
+      g_free(feature->data);
       xmpp_additional_features = g_slist_delete_link(xmpp_additional_features,
                                                      feature);
       return;
     }
-    feature = g_slist_next (feature);
+    feature = g_slist_next(feature);
   }
 }
 #endif
@@ -225,7 +225,7 @@
   caps_add_feature("", NS_MUC);
   // advertise ChatStates only if they aren't disabled
   if (!settings_opt_get_int("disable_chatstates"))
-   caps_add_feature("", NS_CHATSTATES);
+    caps_add_feature("", NS_CHATSTATES);
   caps_add_feature("", NS_TIME);
   caps_add_feature("", NS_XMPP_TIME);
   caps_add_feature("", NS_VERSION);
@@ -235,13 +235,13 @@
   if (!settings_opt_get_int("iq_last_disable") &&
       (!settings_opt_get_int("iq_last_disable_when_notavail") ||
        status != notavail))
-   caps_add_feature("", NS_LAST);
+    caps_add_feature("", NS_LAST);
 #ifdef MODULES_ENABLE
   {
     GSList *el = xmpp_additional_features;
     while (el) {
       caps_add_feature("", el->data);
-      el = g_slist_next (el);
+      el = g_slist_next(el);
     }
   }
 #endif