1 files changed, 7 insertions, 15 deletions

diff --git a/src/gnunet/social/host.cpp b/src/gnunet/social/host.cpp
index 94a8dee..fccc186 100644
--- a/src/gnunet/social/host.cpp
+++ b/src/gnunet/social/host.cpp
@@ -50,8 +50,8 @@ Host::~Host ()
 void
 Host::connectSignals ()
 {
-  connect (this, SIGNAL (announceSignal (QString)),
-           this, SLOT (announce (QString)),
+  connect (this, SIGNAL (talkSignal (QString, QString)),
+           this, SLOT (talk (QString, QString)),
            Qt::QueuedConnection);
 }
 
@@ -68,7 +68,7 @@ Host::answerDoorCallback (void *cls, struct GNUNET_SOCIAL_Nym *nym,
               "%s\n%.*s\n", method_name, data_size, data);
 
   Host *host = (Host *) cls;
-  emit host->answerDoorSignal (new Message (method_name, env, data, data_size,
+  emit host->answerDoorSignal (new Message (0, method_name, env, data, data_size,
                                             0, nym));
 }
 
@@ -112,7 +112,7 @@ Host::farewellCallback (void *cls,
 
 
 void
-Host::announce (Message *msg)
+Host::talk (Message *msg)
 {
   if (m_inTransmit)
   {
@@ -135,19 +135,11 @@ Host::announce (Message *msg)
 
 
 void
-Host::announce (QString text)
-{
-  qDebug () << "Host.announce: " << text;
-  Message msg ("_converse", QList<Modifier *>(), text);
-  announce (&msg);
-}
-
-
-void
 Host::talk (QString text)
 {
-  qDebug () << "Host.talk: " << text;
-  emit announceSignal (text);
+  qDebug () << "Host.announce: " << text;
+  Message msg (this, "_converse", QList<Modifier *>(), text);
+  talk (&msg);
 }