Index: /trunk/Config.kmk
===================================================================
--- /trunk/Config.kmk	(revision 37024)
+++ /trunk/Config.kmk	(revision 37025)
@@ -4251,5 +4251,4 @@
 #
 # Template for building R3 programs for the guest additions.
-# Note: Make sure you don't break VBOXGUESTR3CPPEXE when changing this.
 #
 TEMPLATE_VBOXGUESTR3EXE           = VBox Guest Program
@@ -4408,17 +4407,4 @@
 	iconv
 
-#
-# Template for guest stuff that makes use of the C++ library and features.
-# (This is mostly about undoing what was done to C++ for VBOXGUESTR3EXE.)
-#
-TEMPLATE_VBOXGUESTR3CPPEXE           = VBox Guest Program with C++ library dependencies
-TEMPLATE_VBOXGUESTR3CPPEXE_EXTENDS   = VBOXGUESTR3EXE
-ifeq ($(KBUILD_TARGET),win)
- # later if necessary
-else
- TEMPLATE_VBOXGUESTR3CPPEXE_TOOL     = $(TEMPLATE_VBOXR3EXE_TOOL)
- TEMPLATE_VBOXGUESTR3CPPEXE_CXXFLAGS = $(TEMPLATE_VBOXR3EXE_CXXFLAGS)
-endif
-
 
 #
Index: /trunk/src/VBox/Additions/x11/VBoxClient/Makefile.kmk
===================================================================
--- /trunk/src/VBox/Additions/x11/VBoxClient/Makefile.kmk	(revision 37024)
+++ /trunk/src/VBox/Additions/x11/VBoxClient/Makefile.kmk	(revision 37025)
@@ -24,5 +24,5 @@
 PROGRAMS += VBoxClient
 
-VBoxClient_TEMPLATE = VBOXGUESTR3CPPEXE
+VBoxClient_TEMPLATE = VBOXGUESTR3EXE
 VBoxClient_DEFS += VBOX_X11_CLIPBOARD VBOX_WITH_HGCM
 ifdef VBOX_WITH_DBUS
Index: /trunk/src/VBox/Additions/x11/VBoxClient/clipboard.h
===================================================================
--- /trunk/src/VBox/Additions/x11/VBoxClient/clipboard.h	(revision 37024)
+++ /trunk/src/VBox/Additions/x11/VBoxClient/clipboard.h	(revision 37025)
@@ -119,7 +119,5 @@
         LogRelFlowFunc(("\n"));
         if (mInit)
-            try {
-                uninit(2000);
-            } catch (...) { }
+            uninit(2000);
         LogRelFlowFunc(("returning\n"));
     }
Index: /trunk/src/VBox/Additions/x11/VBoxClient/seamless-host.h
===================================================================
--- /trunk/src/VBox/Additions/x11/VBoxClient/seamless-host.h	(revision 37024)
+++ /trunk/src/VBox/Additions/x11/VBoxClient/seamless-host.h	(revision 37025)
@@ -165,9 +165,5 @@
         {
             LogRel(("VBoxClient: seamless host object still running!  Stopping...\n"));
-            try
-            {
-                stop(2000);
-            }
-            catch(...) {}
+            stop(2000);
         }
         LogRelFlowFunc(("returning\n"));
Index: /trunk/src/VBox/Additions/x11/VBoxClient/seamless-x11.h
===================================================================
--- /trunk/src/VBox/Additions/x11/VBoxClient/seamless-x11.h	(revision 37024)
+++ /trunk/src/VBox/Additions/x11/VBoxClient/seamless-x11.h	(revision 37025)
@@ -246,9 +246,5 @@
     ~VBoxGuestSeamlessX11()
     {
-        try
-        {
-            uninit();
-        }
-        catch(...) {}
+        uninit();
         if (mDisplay)
             XCloseDisplay(mDisplay);
Index: /trunk/src/VBox/Additions/x11/VBoxClient/thread.cpp
===================================================================
--- /trunk/src/VBox/Additions/x11/VBoxClient/thread.cpp	(revision 37024)
+++ /trunk/src/VBox/Additions/x11/VBoxClient/thread.cpp	(revision 37025)
@@ -56,9 +56,5 @@
     {
         LogRelThisFunc(("Warning!  Stopping thread %s, as it is still running!\n", mName));
-        try
-        {
-            stop(2000, 0);
-        }
-        catch(...) {}
+        stop(2000, 0);
     }
     LogRelFlowFunc(("returning\n"));