Changeset 23859 in vbox for trunk/src/VBox/Additions

Timestamp:

Oct 19, 2009 12:11:56 PM (16 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

53627

Message:

X11/VBoxClient: Added host version check.

Location:

trunk/src/VBox/Additions/x11/VBoxClient

Files:

• Makefile.kmk (modified) (2 diffs)
• VBoxClient.h (modified) (1 diff)
• hostversion.cpp (added)
• main.cpp (modified) (1 diff)

trunk/src/VBox/Additions/x11/VBoxClient/Makefile.kmk

@@ -30 +30 @@
 VBoxClient_TEMPLATE = VBOXGUESTR3CPPEXE
 VBoxClient_DEFS += VBOX_X11_CLIPBOARD VBOX_WITH_HGCM
+ifdef VBOX_WITH_DBUS
+ VBoxClient_DEFS += VBOX_WITH_DBUS
+endif
 VBoxClient_DEFS.linux += _GNU_SOURCE
 VBoxClient_SOURCES = \
@@ -62 +65 @@
         Xext Xmu
 endif
-
+ifdef VBOX_WITH_GUEST_PROPS
+ VBoxClient_SOURCES += hostversion.cpp
+ VBoxClient_DEFS += VBOX_WITH_GUEST_PROPS
+endif
 #
 # Link aginst libstdc++.a. (http://www.trilithium.com/johan/2005/06/static-libstdc/).

trunk/src/VBox/Additions/x11/VBoxClient/VBoxClient.h

@@ -46 +46 @@
 extern Service *GetSeamlessService();
 extern Service *GetDisplayService();
+extern Service *GetHostVersionService();
 
 extern void CleanUp();

trunk/src/VBox/Additions/x11/VBoxClient/main.cpp

@@ -190 +190 @@
                 fSuccess = false;
         }
+#ifdef VBOX_WITH_GUEST_PROPS
+        else if (!strcmp(argv[i], "--checkhostversion"))
+        {
+            if (g_pService == NULL)
+                g_pService = VBoxClient::GetHostVersionService();
+            else
+                fSuccess = false;
+        }
+#endif
         else if (!strcmp(argv[i], "-h") || !strcmp(argv[i], "--help"))
         {