commit baaaec09f1d487bfdc916730d8d89ca920275e72
author Yingdi Yu <yuyingdi@gmail.com> Tue Sep 02 22:05:32 2014 -0700
committer Yingdi Yu <yuyingdi@gmail.com> Tue Sep 23 10:59:44 2014 -0700
tree 9bf9f9369684117ad8b401ec326d51528031184c
parent e8323b63aa6b96ed171b64a6ec87fb79603043d2

Add configurable routing prefix

Change-Id: I649bbd9f4decb8466ae4aeb82e1500f712adb6f6

src/controller.cpp

diff --git a/src/controller.cpp b/src/controller.cpp
index fc4037b..d99b7a6 100644
--- a/src/controller.cpp
+++ b/src/controller.cpp
@@ -50,6 +50,7 @@
                        QWidget* parent)
   : QDialog(parent)
   , m_face(face)
+  , m_localPrefixDetected(false)
   , m_invitationListenerId(0)
   , m_contactManager(m_face)
   , m_discoveryLogic(m_face,
@@ -94,6 +95,10 @@
           this, SLOT(onIdentityUpdated(const QString&)));
   connect(m_settingDialog, SIGNAL(nickUpdated(const QString&)),
           this, SLOT(onNickUpdated(const QString&)));
+  connect(this, SIGNAL(localPrefixUpdated(const QString&)),
+          m_settingDialog, SLOT(onLocalPrefixUpdated(const QString&)));
+  connect(m_settingDialog, SIGNAL(prefixUpdated(const QString&)),
+          this, SLOT(onLocalPrefixConfigured(const QString&)));
 
   // Connection to ProfileEditor
   connect(this, SIGNAL(closeDBModule()),
@@ -543,6 +548,8 @@
           this, SLOT(onRosterChanged(const chronos::ChatroomInfo&)));
   connect(this, SIGNAL(localPrefixUpdated(const QString&)),
           chatDialog, SLOT(onLocalPrefixUpdated(const QString&)));
+  connect(this, SIGNAL(localPrefixConfigured(const QString&)),
+          chatDialog, SLOT(onLocalPrefixUpdated(const QString&)));
 
   QAction* chatAction = new QAction(chatroomName, this);
   m_chatActionList[chatroomName.toStdString()] = chatAction;
@@ -617,7 +624,23 @@
 void
 Controller::onLocalPrefixUpdated(const QString& localPrefix)
 {
+  QString privateLocalPrefix("/private/local");
+
   m_localPrefix = Name(localPrefix.toStdString());
+
+  if (privateLocalPrefix != localPrefix)
+    m_localPrefixDetected = true;
+  else
+    m_localPrefixDetected = false;
+}
+
+void
+Controller::onLocalPrefixConfigured(const QString& prefix)
+{
+  if (!m_localPrefixDetected) {
+    m_localPrefix = Name(prefix.toStdString());
+    emit localPrefixConfigured(prefix);
+  }
 }
 
 void