Changeset 23941 in vbox for trunk/src/VBox/Additions/x11/VBoxClient

Timestamp:

Oct 21, 2009 3:40:36 PM (15 years ago)

Author:

vboxsync

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

53757

Message:

VBoxClient: Installer, command line, define cleanup.

Location:

trunk/src/VBox/Additions/x11/VBoxClient

Files:

• Makefile.kmk (modified) (1 diff)
• hostversion.cpp (modified) (6 diffs)
• main.cpp (modified) (4 diffs)

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

@@ -61 +61 @@
         seamless-x11.cpp \
         thread.cpp \
-        display.cpp
+        display.cpp \
+        hostversion.cpp
  VBoxClient_LIBS += \
         Xext Xmu
 endif
 ifdef VBOX_WITH_GUEST_PROPS
- VBoxClient_SOURCES += hostversion.cpp
  VBoxClient_DEFS += VBOX_WITH_GUEST_PROPS
 endif

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

@@ -45 +45 @@
     {
         int rc;
-#ifdef VBOX_WITH_DBUS
+# ifdef VBOX_WITH_DBUS
         DBusConnection *conn;
         DBusMessage* msg;
@@ -104 +104 @@
         if (msg != NULL)
             dbus_message_unref(msg);
-#else
+# else
         /* TODO: Implement me */
         rc = VINF_SUCCESS;
-#endif /* VBOX_WITH_DBUS */
+# endif /* VBOX_WITH_DBUS */
         return rc;
     }
 
-    /** @todo Move this part in VbglR3 and just provide a callback for the platform-specific 
+    /** @todo Move this part in VbglR3 and just provide a callback for the platform-specific
               notification stuff, since this is very similar to the VBoxTray code. */
     virtual int run()
@@ -117 +117 @@
         int rc;
         LogFlowFunc(("\n"));
-#ifdef VBOX_WITH_DBUS
+# ifdef VBOX_WITH_DBUS
         rc = RTDBusLoadLib();
         if (RT_FAILURE(rc))
+            LogRel(("VBoxClient: D-Bus seems not to be installed; no host version check/notification done.\n"));
+# else
+        rc = VERR_NOT_IMPLEMENTED;
+# endif /* VBOX_WITH_DBUS */
+
+# ifdef VBOX_WITH_GUEST_PROPS
+        if (RT_SUCCESS(rc))
         {
-            LogRel(("VBoxClient: D-Bus seems not to be installed; no host version check/notification done.\n"));
+            uint32_t uGuestPropSvcClientID;
+            rc = VbglR3GuestPropConnect(&uGuestPropSvcClientID);
+            if (RT_FAILURE(rc))
+                LogFlow(("Cannot connect to guest property service! rc = %Rrc\n", rc));
         }
-#else
-        rc = VERR_NOT_IMPLEMENTED;
-#endif
-        uint32_t uGuestPropSvcClientID;
-        rc = VbglR3GuestPropConnect(&uGuestPropSvcClientID);
+
         if (RT_SUCCESS(rc))
         {
@@ -143 +149 @@
                         char szMsg[256];
                         char szTitle[64];
-        
+
                         /** @todo add some translation macros here */
                         RTStrPrintf(szTitle, sizeof(szTitle), "VirtualBox Guest Additions update available!");
@@ -156 +162 @@
                     /* Store host version to not notify again */
                     rc = VbglR3HostVersionLastCheckedStore(uGuestPropSvcClientID, pszHostVersion);
-    
+
                     VbglR3GuestPropReadValueFree(pszHostVersion);
                     VbglR3GuestPropReadValueFree(pszGuestVersion);
@@ -163 +169 @@
             VbglR3GuestPropDisconnect(uGuestPropSvcClientID);
         }
+# endif /* VBOX_WITH_GUEST_PROPS */
         LogFlowFunc(("returning %Rrc\n", rc));
         return rc;

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

@@ -138 +138 @@
     RTPrintf("  --clipboard      start the shared clipboard service\n");
     RTPrintf("  --display     start the display management service\n");
+# ifdef VBOX_WITH_GUEST_PROPS
+    RTPrintf("  --checkhostversion      start the host version notifier service\n");
+# endif
     RTPrintf("  --seamless       start the seamless windows service\n");
     RTPrintf("  -d, --nodaemon   continue running as a system service\n");
@@ -190 +193 @@
                 fSuccess = false;
         }
-#ifdef VBOX_WITH_GUEST_PROPS
         else if (!strcmp(argv[i], "--checkhostversion"))
         {
@@ -198 +200 @@
                 fSuccess = false;
         }
-#endif
         else if (!strcmp(argv[i], "-h") || !strcmp(argv[i], "--help"))
         {
@@ -223 +224 @@
             RTPrintf("VBoxClient: failed to daemonize.  Exiting.\n");
             Log(("VBoxClient: failed to daemonize.  Exiting.\n"));
-#ifdef DEBUG
+# ifdef DEBUG
             RTPrintf("Error %Rrc\n", rc);
-#endif
+# endif
             return 1;
         }