Merge branch 'master' of gnunet.org:secushare

4 files changed, 10 insertions, 4 deletions

diff --git a/qml/PlaceThread.qml b/qml/PlaceThread.qml
index 804e9ee..6ac4fe8 100644
--- a/qml/PlaceThread.qml
+++ b/qml/PlaceThread.qml
@@ -38,6 +38,10 @@ Rectangle {
                 anchors.verticalCenter: parent.verticalCenter
                 anchors.left: parent.left
                 anchors.leftMargin: 20
+                //
+                // FIXME: mockup title.. should either be _subject or
+                // first words of first _converse       -lynX
+                //
                 text: qsTr("Forum for clandestine urban art")
                 wrapMode : Text.Wrap
                 elide : Text.ElideRight
@@ -266,4 +270,4 @@ Rectangle {
 
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/social/guest.cpp b/src/social/guest.cpp
index 0dc1b5c..0108598 100644
--- a/src/social/guest.cpp
+++ b/src/social/guest.cpp
@@ -129,7 +129,7 @@ Guest::talkRequest (Message *msg)
 void
 Guest::talkRequest (QString text)
 {
-  Message msg ("_message", QList<Modifier *>(), text, 0);
+  Message msg ("_converse", QList<Modifier *>(), text, 0);
   talkRequest (&msg);
 }
 
diff --git a/src/social/host.cpp b/src/social/host.cpp
index e8f54f7..94a8dee 100644
--- a/src/social/host.cpp
+++ b/src/social/host.cpp
@@ -138,7 +138,7 @@ void
 Host::announce (QString text)
 {
   qDebug () << "Host.announce: " << text;
-  Message msg ("_message", QList<Modifier *>(), text);
+  Message msg ("_converse", QList<Modifier *>(), text);
   announce (&msg);
 }
 
diff --git a/src/social/place.cpp b/src/social/place.cpp
index 06e9c35..b7e5179 100644
--- a/src/social/place.cpp
+++ b/src/social/place.cpp
@@ -245,7 +245,9 @@ Place::insertMessage (Message *msg)
     {
       // Create a placeholder message that will be replaced
       // when the missing message arrives (or not if it's not in a thread).
-      thread = new Message ("_missing");
+      thread = new Message ("_INTERNAL_missing");
+      // methods or variables of the _INTERNAL family must never be sent
+      // over the wire! history replay must ensure that.  -lynX
 
       if (0 < threadId)
       {