Changeset 99586 in vbox for trunk/src/VBox/Additions/x11

Timestamp:

May 3, 2023 3:25:51 PM (19 months ago)

Author:

vboxsync

Message:

Guest Additions/VBoxClient: Removed the code for VBOX_WITH_SHARED_CLIPBOARD_FUSE, as we don't use that approach (anymore). bugref:9437

Location:

trunk/src/VBox/Additions/x11/VBoxClient

Files:

• Makefile.kmk (modified) (1 diff)
• clipboard.cpp (modified) (4 diffs)

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

@@ -185 +185 @@
    VBoxClient_SOURCES += \
         $(PATH_ROOT)/src/VBox/GuestHost/SharedClipboard/clipboard-transfers-http.cpp
-  endif
-  ifdef VBOX_WITH_SHARED_CLIPBOARD_FUSE
-   VBoxClient_DEFS    += VBOX_WITH_SHARED_CLIPBOARD_FUSE
-   # @todo Make this dynamic loading more generic.
-   VBoxClient_SOURCES += \
-        $(PATH_ROOT)/src/VBox/ImageMounter/vboximg-mount/fuse.cpp \
-        clipboard-fuse.cpp
-   # @todo Ditto.
-   VBoxClient_INCS    += \
-        $(PATH_ROOT)/src/VBox/ImageMounter/vboximg-mount
   endif
  endif

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

@@ -33 +33 @@
 #include <iprt/asm.h>
 #include <iprt/assert.h>
-#ifdef VBOX_WITH_SHARED_CLIPBOARD_FUSE
-# include <iprt/dir.h>
-#endif
 #include <iprt/initterm.h>
 #include <iprt/mem.h>
@@ -52 +49 @@
 
 #include "clipboard.h"
-#ifdef VBOX_WITH_SHARED_CLIPBOARD_FUSE
-# include "clipboard-fuse.h"
-#endif
 
 
@@ -63 +57 @@
 /** Only one context is supported at a time for now. */
 SHCLCONTEXT g_Ctx;
-#ifdef VBOX_WITH_SHARED_CLIPBOARD_FUSE
-SHCLFUSECTX g_FuseCtx;
-#endif
 
 
@@ -371 +362 @@
     if (RT_SUCCESS(rc))
     {
-#ifdef VBOX_WITH_SHARED_CLIPBOARD_FUSE
-        rc = VbClShClFUSEInit(&g_FuseCtx, &g_Ctx);
-        if (RT_SUCCESS(rc))
-        {
-            rc = VbClShClFUSEStart(&g_FuseCtx);
-            if (RT_SUCCESS(rc))
-            {
-#endif
-                /* Let the main thread know that it can continue spawning services. */
-                RTThreadUserSignal(RTThreadSelf());
-
-                rc = vboxClipboardMain();
-
-#ifdef VBOX_WITH_SHARED_CLIPBOARD_FUSE
-                int rc2 = VbClShClFUSEStop(&g_FuseCtx);
-                if (RT_SUCCESS(rc))
-                    rc = rc2;
-            }
-        }
-#endif
+        /* Let the main thread know that it can continue spawning services. */
+        RTThreadUserSignal(RTThreadSelf());
+
+        rc = vboxClipboardMain();
     }