summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorpsyc://loupsycedyglgamf.onion/~lynX <BM-NB7xa9gEpmJgYp9PVnEdACiZcGmmEJcY>2016-03-11 01:36:43 +0100
committerpsyc://loupsycedyglgamf.onion/~lynX <BM-NB7xa9gEpmJgYp9PVnEdACiZcGmmEJcY>2016-03-11 01:36:43 +0100
commit14870dcfe0203f72dc3372ff8afce90bc8b94818 (patch)
treecba97f4e6a2b7994a7025b9d2ecc9ff4476138ce
parent9263e378512cf8586611eaf178213ec76715c22f (diff)
downloadsecushare-14870dcfe0203f72dc3372ff8afce90bc8b94818.tar.gz
secushare-14870dcfe0203f72dc3372ff8afce90bc8b94818.zip
notes and protocol name fixes
-rw-r--r--qml/PlaceThread.qml6
-rw-r--r--src/social/guest.cpp2
-rw-r--r--src/social/host.cpp2
-rw-r--r--src/social/place.cpp4
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 {
38 anchors.verticalCenter: parent.verticalCenter 38 anchors.verticalCenter: parent.verticalCenter
39 anchors.left: parent.left 39 anchors.left: parent.left
40 anchors.leftMargin: 20 40 anchors.leftMargin: 20
41 //
42 // FIXME: mockup title.. should either be _subject or
43 // first words of first _converse -lynX
44 //
41 text: qsTr("Forum for clandestine urban art") 45 text: qsTr("Forum for clandestine urban art")
42 wrapMode : Text.Wrap 46 wrapMode : Text.Wrap
43 elide : Text.ElideRight 47 elide : Text.ElideRight
@@ -266,4 +270,4 @@ Rectangle {
266 270
267 } 271 }
268 } 272 }
269} \ No newline at end of file 273}
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)
129void 129void
130Guest::talkRequest (QString text) 130Guest::talkRequest (QString text)
131{ 131{
132 Message msg ("_message", QList<Modifier *>(), text, 0); 132 Message msg ("_converse", QList<Modifier *>(), text, 0);
133 talkRequest (&msg); 133 talkRequest (&msg);
134} 134}
135 135
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
138Host::announce (QString text) 138Host::announce (QString text)
139{ 139{
140 qDebug () << "Host.announce: " << text; 140 qDebug () << "Host.announce: " << text;
141 Message msg ("_message", QList<Modifier *>(), text); 141 Message msg ("_converse", QList<Modifier *>(), text);
142 announce (&msg); 142 announce (&msg);
143} 143}
144 144
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)
245 { 245 {
246 // Create a placeholder message that will be replaced 246 // Create a placeholder message that will be replaced
247 // when the missing message arrives (or not if it's not in a thread). 247 // when the missing message arrives (or not if it's not in a thread).
248 thread = new Message ("_missing"); 248 thread = new Message ("_INTERNAL_missing");
249 // methods or variables of the _INTERNAL family must never be sent
250 // over the wire! history replay must ensure that. -lynX
249 251
250 if (0 < threadId) 252 if (0 < threadId)
251 { 253 {