[GNUnet-SVN] r4683 - gnunet-qt/src/plugins/general

[gnunet]

Author: durner
Date: 2007-03-22 15:59:20 -0600 (Thu, 22 Mar 2007)
New Revision: 4683

Modified:
   gnunet-qt/src/plugins/general/general.cc
   gnunet-qt/src/plugins/general/general.h
   gnunet-qt/src/plugins/general/startStopThread.cc
   gnunet-qt/src/plugins/general/startStopThread.h
Log:
improve error reporting

Modified: gnunet-qt/src/plugins/general/general.cc
===================================================================
--- gnunet-qt/src/plugins/general/general.cc    2007-03-22 21:46:59 UTC (rev 
4682)
+++ gnunet-qt/src/plugins/general/general.cc    2007-03-22 21:59:20 UTC (rev 
4683)
@@ -44,7 +44,7 @@
   treeApps->setHeaderLabels(headerList);
 
   connect(pbStartStop, SIGNAL(clicked(bool)), SLOT(startStopDaemon()));
-  connect(startStopThread, SIGNAL(finished(bool)), this, 
SLOT(startStopDone(bool)));
+  connect(startStopThread, SIGNAL(finished(bool, QString)), this, 
SLOT(startStopDone(bool, QString)));
   connect(&timer, SIGNAL(timeout()), this, SLOT(checkDaemon()));
   connect(checkDaemonThread, SIGNAL(running(bool)), this, SLOT(running(bool)));
   connect(checkDaemonThread, SIGNAL(applications(GGNUnetAppDescs *)), this,
@@ -97,7 +97,7 @@
   pbStartStop->setEnabled(true);
 }
 
-void GGeneralPlugin::startStopDone(bool success)
+void GGeneralPlugin::startStopDone(bool success, QString msg)
 {
   QString strStatus;
   QPixmap icon;
@@ -120,7 +120,7 @@
     if (isRunning)
       strStatus = tr("Terminating server failed");
     else
-      strStatus = tr("Launching server failed");
+      strStatus = tr("Launching server failed: %1").arg(msg);
       
     icon.load(":/pixmaps/error.png");
   }

Modified: gnunet-qt/src/plugins/general/general.h
===================================================================
--- gnunet-qt/src/plugins/general/general.h     2007-03-22 21:46:59 UTC (rev 
4682)
+++ gnunet-qt/src/plugins/general/general.h     2007-03-22 21:59:20 UTC (rev 
4683)
@@ -52,7 +52,7 @@
   bool isRunning, pending;
 protected slots:
   void startStopDaemon();
-  void startStopDone(bool success);
+  void startStopDone(bool success, QString msg);
   void applications(GGNUnetAppDescs *apps);
   void running(bool isRunning);
   void checkDaemon();

Modified: gnunet-qt/src/plugins/general/startStopThread.cc
===================================================================
--- gnunet-qt/src/plugins/general/startStopThread.cc    2007-03-22 21:46:59 UTC 
(rev 4682)
+++ gnunet-qt/src/plugins/general/startStopThread.cc    2007-03-22 21:59:20 UTC 
(rev 4683)
@@ -61,7 +61,7 @@
     ret = connection_request_shutdown(sock) != SYSERR;
   }
     
-  emit finished(ret);
+  emit finished(ret, GE_strerror(errno));
 }
 
 /* end of startStopThread.cc */

Modified: gnunet-qt/src/plugins/general/startStopThread.h
===================================================================
--- gnunet-qt/src/plugins/general/startStopThread.h     2007-03-22 21:46:59 UTC 
(rev 4682)
+++ gnunet-qt/src/plugins/general/startStopThread.h     2007-03-22 21:59:20 UTC 
(rev 4683)
@@ -39,7 +39,7 @@
   void start(bool doStart);
   void run();
 signals:
-  void finished(bool success);
+  void finished(bool success, QString msg);
 protected:
   bool doStart;
   int numRun;