Merge branch 'master' into dummy_chan

2014-04-15 04:45:59 +02:00
parent cfca16bbec 804b686f1c
commit 0d9c1ba313
1 changed files with 13 additions and 5 deletions
@@ -577,14 +577,22 @@ void XmppComponent::send_muc_leave(std::string&& muc_name, std::string&& nick, X
  presence["from"] = muc_name + "@" + this->served_hostname + "/" + nick;
  presence["type"] = "unavailable";
  const std::string message_str = std::get<0>(message);
-  if (!message_str.empty() || self)
+  XmlNode x("x");
+  x["xmlns"] = MUC_USER_NS;
+  if (self)
    {
      XmlNode status("status");
-      if (!message_str.empty())
-        status.set_inner(message_str);
-      if (self)
      status["code"] = "110";
      status.close();
+      x.add_child(std::move(status));
+    }
+  x.close();
+  presence.add_child(std::move(x));
+  if (!message_str.empty())
+    {
+      XmlNode status("status");
+      status.set_inner(message_str);
+      status.close();
      presence.add_child(std::move(status));
    }
  presence.close();