[vidalia-svn] r4051: Adjust ServerStatusEvent dispatches so they can handle multi (in vidalia/branches/extension-api/src: plugins torcontrol vidalia)

[tyree731@xxxxxxxxxxxxxxxxxxx]

Author: tyree731
Date: 2009-08-15 14:32:12 -0400 (Sat, 15 Aug 2009)
New Revision: 4051

Modified:
   vidalia/branches/extension-api/src/plugins/PluginManager.cpp
   vidalia/branches/extension-api/src/torcontrol/TorEvents.cpp
   vidalia/branches/extension-api/src/vidalia/MainWindow.cpp
Log:
Adjust ServerStatusEvent dispatches so they can handle multiple receiver postEvents

Modified: vidalia/branches/extension-api/src/plugins/PluginManager.cpp
===================================================================
--- vidalia/branches/extension-api/src/plugins/PluginManager.cpp	2009-08-15 04:48:59 UTC (rev 4050)
+++ vidalia/branches/extension-api/src/plugins/PluginManager.cpp	2009-08-15 18:32:12 UTC (rev 4051)
@@ -28,8 +28,6 @@
 : _dataDirectory(dataDirectory),
   _torControl(torControl)
 {
-  _torControl->setEvent(TorEvents::ClientStatus,  this, true);
-  _torControl->setEvent(TorEvents::GeneralStatus, this, true);
   _torControl->setEvent(TorEvents::ServerStatus,  this, true);
 }
 

Modified: vidalia/branches/extension-api/src/torcontrol/TorEvents.cpp
===================================================================
--- vidalia/branches/extension-api/src/torcontrol/TorEvents.cpp	2009-08-15 04:48:59 UTC (rev 4050)
+++ vidalia/branches/extension-api/src/torcontrol/TorEvents.cpp	2009-08-15 18:32:12 UTC (rev 4051)
@@ -84,7 +84,7 @@
 TorEvents::dispatch(TorEvent e, QEvent *event)
 {
   foreach (QObject *obj, _eventList.values(e)) {
-    QApplication::sendEvent(obj, event);
+    QApplication::postEvent(obj, event);
   }
 }
 
@@ -443,15 +443,17 @@
   ServerStatusEvent::Status status
     = ServerStatusEvent::statusFromString(action);
 
-  switch (status) {
-    case ServerStatusEvent::UnrecognizedStatus:
-      event = new UnrecognizedServerStatusEvent(severity, action, args);
-      break;
-
-    default:
-      event = new ServerStatusEvent(severity, status);
+  foreach (QObject *obj, _eventList.values(ServerStatus)) {
+    switch (status) {
+      case ServerStatusEvent::UnrecognizedStatus:
+        event = new UnrecognizedServerStatusEvent(severity, action, args);
+        break;
+        
+      default:
+        event = new ServerStatusEvent(severity, status);
+    }
+    QApplication::postEvent(obj, event);
   }
-  dispatch(ServerStatus, event);
 }
 
 /** Parses and posts a general Tor status event. */

Modified: vidalia/branches/extension-api/src/vidalia/MainWindow.cpp
===================================================================
--- vidalia/branches/extension-api/src/vidalia/MainWindow.cpp	2009-08-15 04:48:59 UTC (rev 4050)
+++ vidalia/branches/extension-api/src/vidalia/MainWindow.cpp	2009-08-15 18:32:12 UTC (rev 4051)
@@ -287,10 +287,6 @@
   }
 
   _bandwidthAct->setText(tr("Bandwidth Graph"));
-#if 0
-  _messageAct->setText(tr("Message Log"));
-  _networkAct->setText(tr("Network Map"));
-#endif
   _controlPanelAct->setText(tr("Control Panel"));
   _helpAct->setText(tr("Help"));
   _newIdentityAct->setText(tr("New Identity"));