bureaucratic clean-ups

7 files changed, 18 insertions, 7 deletions

diff --git a/src/gnunet.h b/src/gnunet.h
index 7c86ec2..e9c87bb 100644
--- a/src/gnunet.h
+++ b/src/gnunet.h
@@ -1,3 +1,7 @@
+// one of the two gnunet.h needs to have a different name...
+// i suggest gnunet.cpp to be called eventloop.cpp since it
+// doesnt really do anything gnunet
+
 #include <gnunet/platform.h>
 #include <gnunet/gnunet_util_lib.h>
 #include <gnunet/gnunet_psyc_util_lib.h>
diff --git a/src/gnunet/gnunet.cpp b/src/gnunet/gnunet.cpp
index 8886808..b8b2a29 100644
--- a/src/gnunet/gnunet.cpp
+++ b/src/gnunet/gnunet.cpp
@@ -40,7 +40,9 @@ GnuNet::GnuNet (QObject * parent)
 
 GnuNet::~GnuNet ()
 {
-  qDebug () << "GnuNet: destructed";
+    // user could get very nervous should they ever see the message that
+    // gnunet got destructed when it is just a bureaucratic event loop class
+  qDebug () << "GnuNet object: destructed";
 }
 
 
@@ -54,7 +56,7 @@ GnuNet::start ()
   GNUNET_PROGRAM_run (main_argc, main_argv,
                       APP_NAME, APP_NAME,
                       options, mainLoopCallback, this);
-  qDebug () << "GnuNet: event loop finished";
+  qDebug () << "GnuNet object: event loop finished";
   Q_ASSERT (!m_connected);
 }
 
@@ -69,7 +71,7 @@ GnuNet::stop ()
 void
 GnuNet::shutdownSlot ()
 {
-  qDebug () << "GnuNet: shutting down";
+  qDebug () << "GnuNet object: shutting down";
   if (m_social)
   {
     delete m_social;
@@ -77,7 +79,7 @@ GnuNet::shutdownSlot ()
   }
   setConnected (false);
   GNUNET_SCHEDULER_shutdown ();
-  qDebug () << "GnuNet: shut down finished";
+  qDebug () << "GnuNet object: shut down finished";
   emit stopped ();
 }
 
diff --git a/src/nym/nym.h b/src/nym/nym.h
index 0cd444d..350a21c 100644
--- a/src/nym/nym.h
+++ b/src/nym/nym.h
@@ -74,6 +74,8 @@ class Nym : public QObject
   QString
   gnsUrl ()
   {
+    // should GNS appear explicitly in a client app? shouldn't it be
+    // used transparently behind the gnunet social API instead?
     return QString ("gnunet://gns/%1").arg (m_pubKeyStr);
   }
 
diff --git a/src/settings/settings.cpp b/src/settings/settings.cpp
index f4ba078..24f38a1 100644
--- a/src/settings/settings.cpp
+++ b/src/settings/settings.cpp
@@ -23,6 +23,7 @@
 
 Settings::Settings (QObject * parent)
   : QSettings (QSettings::IniFormat, QSettings::UserScope,
+            // gnunet is wrong. we are definitely not in gnunet here.
                "gnunet", "secushare", parent)
 {
   sync ();
diff --git a/src/settings/settings.h b/src/settings/settings.h
index 5c2a0e4..19e63a4 100644
--- a/src/settings/settings.h
+++ b/src/settings/settings.h
@@ -74,6 +74,7 @@ class Settings : public QSettings
   QColor
   leftSideColor ()
   {
+    // color code comes from secushare logo
     return value ("ui/leftSideColor", QColor ("#EB0C60")).value<QColor> ();
   }
 
@@ -88,6 +89,7 @@ class Settings : public QSettings
   QColor
   rightSideColor ()
   {
+    // color code comes from secushare logo
     return value ("ui/rightSideColor", QColor ("#EFC208")).value<QColor> ();
   }
 
diff --git a/src/social/guest.cpp b/src/social/guest.cpp
index 3050595..4b2d783 100644
--- a/src/social/guest.cpp
+++ b/src/social/guest.cpp
@@ -15,8 +15,8 @@ Guest::Guest (GNUNET_SOCIAL_App *app,
   if (NULL == entryMsg)
   {
     GNUNET_PSYC_Environment *env = GNUNET_PSYC_env_create ();
-    GNUNET_PSYC_env_add (env, GNUNET_PSYC_OP_ASSIGN, "_abc", "abc def", 7);
-    GNUNET_PSYC_env_add (env, GNUNET_PSYC_OP_ASSIGN, "_abc_def", "abc def ghi", 11);
+    GNUNET_PSYC_env_add (env, GNUNET_PSYC_OP_ASSIGN, "_test_abc", "abc def", 7);
+    GNUNET_PSYC_env_add (env, GNUNET_PSYC_OP_ASSIGN, "_test_abc_def", "abc def ghi", 11);
     entryMsg = GNUNET_PSYC_message_create ("_request_enter", env, NULL, 0);
   }
 
diff --git a/src/social/socialapp.cpp b/src/social/socialapp.cpp
index 7ff6971..f72360c 100644
--- a/src/social/socialapp.cpp
+++ b/src/social/socialapp.cpp
@@ -99,7 +99,7 @@ SocialApp::createPlace ()
 void
 SocialApp::placeEnter (QString pubKeyStr, QString peerIdStr)
 {
-  GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Entering to place %s as guest.\n",
+  GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Entering place %s as guest.\n",
               pubKeyStr.toStdString ().c_str ());
 
   GNUNET_CRYPTO_EddsaPublicKey *pubKey = new GNUNET_CRYPTO_EddsaPublicKey;