Merge branch 'master' of gnunet.org:secushare

4 files changed, 5 insertions, 4 deletions

diff --git a/src/app.cpp b/src/app.cpp
index c249ab5..435568a 100644
--- a/src/app.cpp
+++ b/src/app.cpp
@@ -266,4 +266,5 @@ void
 App::close ()
 {
   m_gnunet->stop ();
+  QApplication::quit();
 }
diff --git a/src/gnunet/gnunet.cpp b/src/gnunet/gnunet.cpp
index b5a6b51..99bf88c 100644
--- a/src/gnunet/gnunet.cpp
+++ b/src/gnunet/gnunet.cpp
@@ -154,7 +154,8 @@ GnuNet::processQtEventsTask (void *cls)
   {
     GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply
                                   (GNUNET_TIME_UNIT_MILLISECONDS, 100),
-                                  processQtEventsTask, gnunet);
+                                  processQtEventsTask,
+                                  gnunet);
   }
 }
 
diff --git a/src/gnunet/social/guest.cpp b/src/gnunet/social/guest.cpp
index cc41528..1954fbd 100644
--- a/src/gnunet/social/guest.cpp
+++ b/src/gnunet/social/guest.cpp
@@ -15,8 +15,10 @@ Guest::Guest (GNUNET_SOCIAL_App *app,
   if (NULL == entryMsg)
   {
     GNUNET_PSYC_Environment *env = GNUNET_PSYC_env_create ();
+#ifdef TESTING
     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);
+#endif
     entryMsg = GNUNET_PSYC_message_create ("_request_enter", env, NULL, 0);
   }
 
diff --git a/src/main.cpp b/src/main.cpp
index 6e0a415..e5cf2e5 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -30,9 +30,6 @@ main (int argc, char **argv)
     return -1;
   }
 
-  QObject::connect (engine, SIGNAL (quit ()),
-                    app, SLOT (close ()));
-
   app->registerImageProvider (engine);
 
   theWindow->setTitle (QString ("secushare 0.1"));