[vidalia-svn] r2342: Building on Windows is cool too. I guess. (Related to r2339) (vidalia/trunk/src/torcontrol)

[edmanm@xxxxxxxxxxxxxxxxxxx]

Author: edmanm
Date: 2008-02-09 12:29:51 -0500 (Sat, 09 Feb 2008)
New Revision: 2342

Modified:
   vidalia/trunk/src/torcontrol/torservice.cpp
Log:
Building on Windows is cool too. I guess. (Related to r2339)


Modified: vidalia/trunk/src/torcontrol/torservice.cpp
===================================================================
--- vidalia/trunk/src/torcontrol/torservice.cpp	2008-02-07 19:25:38 UTC (rev 2341)
+++ vidalia/trunk/src/torcontrol/torservice.cpp	2008-02-09 17:29:51 UTC (rev 2342)
@@ -150,7 +150,7 @@
   SC_HANDLE service = openService();
 
   if (!service) {
-    log::error("Bug: We tried to start the Tor service, but it is not installed.");
+    tc::error("Bug: We tried to start the Tor service, but it is not installed.");
     emit startFailed(tr("The Tor service is not installed."));
     return;
   }
@@ -158,7 +158,7 @@
   /* Starting a service can take up to 30 seconds! */
   if (status() != SERVICE_RUNNING) {
     int tries = 0;
-    log::debug("Starting the Tor service.");
+    tc::debug("Starting the Tor service.");
     _service_fns.StartServiceA(service, 0, NULL);
 
     while ((status() != SERVICE_RUNNING) && ++tries <= 5)
@@ -168,7 +168,7 @@
   if (status() == SERVICE_RUNNING) {
     emit started();
   } else {
-    log::error("Unable to start the Tor service.");
+    tc::error("Unable to start the Tor service.");
     emit startFailed(tr("Unable to start the Tor service."));
   }
   closeHandle(service);
@@ -186,7 +186,7 @@
   if (status() != SERVICE_STOPPED) {
     SERVICE_STATUS stat;
     stat.dwCurrentState = SERVICE_RUNNING;
-    log::debug("Stopping the Tor service.");
+    tc::debug("Stopping the Tor service.");
     if (_service_fns.ControlService(service, SERVICE_CONTROL_STOP, &stat)) {
       /* XXX Five seconds isn't long enough to wait when we're stopping a Tor
        * that is running as a server, but we don't want to block for 30
@@ -205,7 +205,7 @@
     return true;
   }
   /* XXX This needs an actual reason message. */
-  log::error("Unable to stop the Tor service.");
+  tc::error("Unable to stop the Tor service.");
   return false;
 }
 
@@ -262,7 +262,7 @@
                                                  .arg(torrc)
                                                  .arg(controlPort);
 
-    log::debug("Installing the Tor service using the command line '%1'")
+    tc::debug("Installing the Tor service using the command line '%1'")
                                                           .arg(command);
     service = _service_fns.CreateServiceA(_scm, 
                               (LPCTSTR)TOR_SERVICE_NAME, (LPCTSTR)TOR_SERVICE_DISP,
@@ -272,7 +272,7 @@
                               NULL, NULL);
     if (!service) {
       /* XXX This needs an actual reason message. */
-      log::error("Failed to install the Tor service.");
+      tc::error("Failed to install the Tor service.");
       return false;
     }
 
@@ -295,13 +295,13 @@
 
   if (service) {
     stop();
-    log::debug("Removing the Tor service.");
+    tc::debug("Removing the Tor service.");
     removed = _service_fns.DeleteService(service);
     closeHandle(service);
   }
   if (!removed) {
     /* XXX This needs an actual reason message. */
-    log::error("Failed to remove the Tor service.");
+    tc::error("Failed to remove the Tor service.");
   }
   return removed;
 }