Index: /trunk/src/VBox/Frontends/VBoxHeadless/VBoxHeadless.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VBoxHeadless/VBoxHeadless.cpp	(revision 35445)
+++ /trunk/src/VBox/Frontends/VBoxHeadless/VBoxHeadless.cpp	(revision 35446)
@@ -5,5 +5,5 @@
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2011 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -102,5 +102,5 @@
     }
 
-    STDMETHOD(HandleEvent)(VBoxEventType_T aType, IEvent * aEvent)
+    STDMETHOD(HandleEvent)(VBoxEventType_T aType, IEvent *aEvent)
     {
         switch (aType)
@@ -148,5 +148,5 @@
     }
 
-    STDMETHOD(HandleEvent)(VBoxEventType_T aType, IEvent * aEvent)
+    STDMETHOD(HandleEvent)(VBoxEventType_T aType, IEvent *aEvent)
     {
         switch (aType)
@@ -255,5 +255,5 @@
     }
 
-    STDMETHOD(HandleEvent)(VBoxEventType_T aType, IEvent * aEvent)
+    STDMETHOD(HandleEvent)(VBoxEventType_T aType, IEvent *aEvent)
     {
         switch (aType)
@@ -1002,5 +1002,5 @@
             CHECK_ERROR(pVirtualBoxClient, COMGETTER(EventSource)(pES.asOutParam()));
             vboxClientListener = new VirtualBoxClientEventListenerImpl();
-            com::SafeArray <VBoxEventType_T> eventTypes;
+            com::SafeArray<VBoxEventType_T> eventTypes;
             eventTypes.push_back(VBoxEventType_OnVBoxSVCAvailabilityChanged);
             CHECK_ERROR(pES, RegisterListener(vboxClientListener, ComSafeArrayAsInParam(eventTypes), true));
@@ -1012,5 +1012,5 @@
             CHECK_ERROR(console, COMGETTER(EventSource)(es.asOutParam()));
             consoleListener = new ConsoleEventListenerImpl();
-            com::SafeArray <VBoxEventType_T> eventTypes;
+            com::SafeArray<VBoxEventType_T> eventTypes;
             eventTypes.push_back(VBoxEventType_OnMouseCapabilityChanged);
             eventTypes.push_back(VBoxEventType_OnStateChanged);
@@ -1167,5 +1167,5 @@
             CHECK_ERROR(virtualBox, COMGETTER(EventSource)(es.asOutParam()));
             vboxListener = new VirtualBoxEventListenerImpl();
-            com::SafeArray <VBoxEventType_T> eventTypes;
+            com::SafeArray<VBoxEventType_T> eventTypes;
             eventTypes.push_back(VBoxEventType_OnGuestPropertyChanged);
             CHECK_ERROR(es, RegisterListener(vboxListener, ComSafeArrayAsInParam(eventTypes), true));
@@ -1259,5 +1259,5 @@
 
     /* VirtualBoxClient callback unregistration. */
-    if (consoleListener)
+    if (vboxClientListener)
     {
         ComPtr<IEventSource> pES;