[ekiga] Chat stack: name the default payload "text/plain" instead of "bare"

[Julien Puydt <jpuydt src gnome org>]

commit 2e34fb0b910808abff7c6f64c670560b9f103e28
Author: Julien Puydt <jpuydt free fr>
Date:   Mon Mar 3 12:00:30 2014 +0100

    Chat stack: name the default payload "text/plain" instead of "bare"

 lib/engine/chat/conversation.h              |    4 ++--
 lib/engine/components/opal/sip-endpoint.cpp |   10 +++++-----
 lib/engine/gui/gtk-frontend/chat-area.cpp   |   10 ++++++----
 plugins/loudmouth/loudmouth-heap-roster.cpp |    2 +-
 4 files changed, 14 insertions(+), 12 deletions(-)
---
diff --git a/lib/engine/chat/conversation.h b/lib/engine/chat/conversation.h
index 12cb312..7dfb4ff 100644
--- a/lib/engine/chat/conversation.h
+++ b/lib/engine/chat/conversation.h
@@ -46,8 +46,8 @@ namespace Ekiga {
     /* who? */
     const std::string name;
     /* For the payload the idea is:
-     * payload["bare"] for a bare text message for example
-     * paylord["xhtml"] for a XHTML-enhanced message
+     * payload["text/plain"] for a bare text message for example
+     * paylord["text/xhtml"] for a XHTML-enhanced message
      *
      * A gui trying to show a message would so something like:
      * iter = payload.find('xhtml')
diff --git a/lib/engine/components/opal/sip-endpoint.cpp b/lib/engine/components/opal/sip-endpoint.cpp
index a74ca31..9b485d9 100644
--- a/lib/engine/components/opal/sip-endpoint.cpp
+++ b/lib/engine/components/opal/sip-endpoint.cpp
@@ -197,7 +197,7 @@ Opal::Sip::EndPoint::send_message (const std::string & _uri,
                                   const Ekiga::Message::payload_type payload)
 {
   // FIXME: here we should check which kind of payload we have
-  Ekiga::Message::payload_type::const_iterator iter = payload.find("bare");
+  Ekiga::Message::payload_type::const_iterator iter = payload.find("text/plain");
   if (!_uri.empty () && (_uri.find ("sip:") == 0 || _uri.find (':') == string::npos) && iter != payload.end 
()) {
     OpalIM im;
     im.m_to = PURL (_uri);
@@ -815,8 +815,8 @@ Opal::Sip::EndPoint::OnReceivedMESSAGE (OpalTransport & transport,
   std::string message_uri = (const char *) uri.AsString ();
   std::string _message = (const char *) pdu.GetEntityBody ();
   Ekiga::Message::payload_type payload;
-  // FIXME: we push as 'bare' without really knowing
-  payload.insert (std::make_pair ("bare", _message));
+  // FIXME: we push as 'text/plain' without really knowing
+  payload.insert (std::make_pair ("text/plain", _message));
   GTimeVal current;
   g_get_current_time (&current);
   gchar* time = g_time_val_to_iso8601 (&current);
@@ -850,8 +850,8 @@ Opal::Sip::EndPoint::OnMESSAGECompleted (const SIPMessage::Params & params,
   else
     reason_shown += SIP_PDU::GetStatusCodeDescription (reason);  // too many to translate them with _()...
   Ekiga::Message::payload_type payload;
-  // FIXME: we push as 'bare' without really knowing...
-  payload.insert (std::make_pair ("bare", reason_shown));
+  // FIXME: we push as 'text/plain' without really knowing...
+  payload.insert (std::make_pair ("text/plain", reason_shown));
   GTimeVal current;
   g_get_current_time (&current);
   gchar* time = g_time_val_to_iso8601 (&current);
diff --git a/lib/engine/gui/gtk-frontend/chat-area.cpp b/lib/engine/gui/gtk-frontend/chat-area.cpp
index b465bbd..8d7ec8f 100644
--- a/lib/engine/gui/gtk-frontend/chat-area.cpp
+++ b/lib/engine/gui/gtk-frontend/chat-area.cpp
@@ -546,8 +546,8 @@ message_activated_cb (G_GNUC_UNUSED GtkWidget *w,
     body = gtk_text_buffer_get_text (GTK_TEXT_BUFFER (buffer), &start_iter, &end_iter, TRUE);
 
     Ekiga::Message::payload_type message;
-    // FIXME: perhaps we have more than bare!
-    message.insert(std::make_pair("bare", body));
+    // FIXME: perhaps we have more than plain!
+    message.insert(std::make_pair("text/plain", body));
     if (self->priv->conversation->send_message (message))
       gtk_text_buffer_delete (GTK_TEXT_BUFFER (buffer), &start_iter, &end_iter);
 
@@ -572,12 +572,14 @@ on_message_received (ChatArea* self,
   if (message.name == "") {
 
 
-    Ekiga::Message::payload_type::const_iterator iter = message.payload.find ("bare");
+    Ekiga::Message::payload_type::const_iterator iter
+      = message.payload.find ("text/plain");
     if (iter != message.payload.end ())
       chat_area_add_notice (self, iter->second.c_str ());
   } else {
 
-    Ekiga::Message::payload_type::const_iterator iter = message.payload.find ("bare");
+    Ekiga::Message::payload_type::const_iterator iter
+      = message.payload.find ("text/plain");
     if (iter != message.payload.end ())
       chat_area_add_message (self, message.name.c_str (), iter->second.c_str ());
   }
diff --git a/plugins/loudmouth/loudmouth-heap-roster.cpp b/plugins/loudmouth/loudmouth-heap-roster.cpp
index 68bce15..c58140e 100644
--- a/plugins/loudmouth/loudmouth-heap-roster.cpp
+++ b/plugins/loudmouth/loudmouth-heap-roster.cpp
@@ -234,7 +234,7 @@ LM::HeapRoster::handle_message (LmConnection* /*connection*/,
 
       result = LM_HANDLER_RESULT_REMOVE_MESSAGE;
       Ekiga::Message::payload_type payload;
-      payload["bare"] = lm_message_node_get_value (body);
+      payload["text/plain"] = lm_message_node_get_value (body);
       dialect->push_message (item, payload);
     }
     // it could also be an avatar or a pubsub event or...