Change to common source files not applicable to open-vm-tools at this time.

diff --git a/open-vm-tools/services/plugins/dndcp/copyPasteDnDX11.cpp b/open-vm-tools/services/plugins/dndcp/copyPasteDnDX11.cpp
index b28f2955999fdc20f7c479796550c4f9ac71f99a..4756e0d3856de35277c703f034268ffc197582f8 100644 (file)
--- a/open-vm-tools/services/plugins/dndcp/copyPasteDnDX11.cpp
+++ b/open-vm-tools/services/plugins/dndcp/copyPasteDnDX11.cpp
@@ -195,15 +195,14 @@ BlockService::Shutdown()
  * Constructor.
  */
 
-
-#ifdef VMTOOLS_USE_LEGACY_GTK
 CopyPasteDnDX11::CopyPasteDnDX11() :
+#ifdef VMTOOLS_USE_LEGACY_GTK
    m_main(NULL),
+#endif
    m_copyPasteUI(NULL),
    m_dndUI(NULL)
 {
 }
-#endif
 
 
 /**
@@ -234,6 +233,7 @@ CopyPasteDnDX11::Init(ToolsAppCtx *ctx)
 
    ASSERT(ctx);
 
+
 #ifdef VMTOOLS_USE_LEGACY_GTK
    int argc = 1;
    const char *argv[] = {"", NULL};
@@ -284,8 +284,6 @@ CopyPasteDnDX11::~CopyPasteDnDX11()
    CopyPaste_Unregister(gUserMainWidget);
 
    if (gUserMainWidget) {
-
-
 #ifdef VMTOOLS_USE_LEGACY_GTK
    gtk_widget_destroy(gUserMainWidget);
 #endif
@@ -354,6 +352,8 @@ CopyPasteDnDX11::RegisterDnD()
    TRACE_CALL();
    CopyPasteDnDWrapper *wrapper = CopyPasteDnDWrapper::GetInstance();
 
+
+
    if (!wrapper->IsDnDEnabled()) {
       return FALSE;
    }
@@ -434,11 +434,9 @@ CopyPasteDnDX11::UnregisterDnD()
 void
 CopyPasteDnDX11::SetDnDAllowed(bool allowed)
 {
-#ifdef VMTOOLS_USE_LEGACY_GTK
    ASSERT(m_dndUI);
    TRACE_CALL();
    m_dndUI->SetDnDAllowed(allowed);
-#endif
 }
 
 

diff --git a/open-vm-tools/services/plugins/dndcp/dndGuestBase/copyPasteDnDX11.h b/open-vm-tools/services/plugins/dndcp/dndGuestBase/copyPasteDnDX11.h
index 3b6799331f9f3eedf8d37d8a827efa8fb6fecaba..9acc3cc6a59c2a99de0d646f0cf3986ad7b9bbf6 100644 (file)
--- a/open-vm-tools/services/plugins/dndcp/dndGuestBase/copyPasteDnDX11.h
+++ b/open-vm-tools/services/plugins/dndcp/dndGuestBase/copyPasteDnDX11.h
@@ -67,12 +67,10 @@ public:
    void SetCopyPasteAllowed(bool allowed);
 private:
    CopyPasteUIX11 *m_copyPasteUI;
-
+   DnDUIX11 *m_dndUI;
 #ifdef VMTOOLS_USE_LEGACY_GTK
    Gtk::Main *m_main;
 #endif
-
-   DnDUIX11 *m_dndUI;
 };
 
 #endif // __COPYPASTEDNDX11_H__

diff --git a/open-vm-tools/services/plugins/dndcp/dndGuestBase/dndUIX11.h b/open-vm-tools/services/plugins/dndcp/dndGuestBase/dndUIX11.h
index 15a9178913a531b813b98ac38cb64e943ffbe765..3e4f59d8acc6d239f99c96520c74ef73e5517395 100644 (file)
--- a/open-vm-tools/services/plugins/dndcp/dndGuestBase/dndUIX11.h
+++ b/open-vm-tools/services/plugins/dndcp/dndGuestBase/dndUIX11.h
@@ -28,9 +28,6 @@
 #ifndef __DND_UI_X11_H__
 #define __DND_UI_X11_H__
 
-#define VMTOOLS_USE_LEGACY_GTK
-
-
 #include "stringxx/string.hh"
 #include "dnd.h"
 #include "str.h"
@@ -123,7 +120,6 @@ private:
    /*
     * Gtk+ Callbacks: Drag Destination.
     */
-#ifdef VMTOOLS_USE_LEGACY_GTK
    void OnGtkDragDataReceived(const Glib::RefPtr<Gdk::DragContext> &dc,
                               int x, int y, const Gtk::SelectionData &sd,
                               guint info, guint time);
@@ -146,7 +142,7 @@ private:
     */
    void SourceDragStartDone();
    void SourceUpdateFeedback(DND_DROPEFFECT effect);
-#endif   /* end VMTOOLS_USE_LEGACY_GTK */
+
    /*
     * Target function for GH DnD. Makes call to common layer.
     */

diff --git a/open-vm-tools/services/plugins/dndcp/dndGuestBase/guestDnD.hh b/open-vm-tools/services/plugins/dndcp/dndGuestBase/guestDnD.hh
index f20f8c7e116dd10eecbae6ece920dc9bc37fe3bb..42f5b4f880dfcad6424383f4d5e99887537a8c07 100644 (file)
--- a/open-vm-tools/services/plugins/dndcp/dndGuestBase/guestDnD.hh
+++ b/open-vm-tools/services/plugins/dndcp/dndGuestBase/guestDnD.hh
@@ -203,4 +203,3 @@ private:
 };
 
 #endif // GUEST_DND_HH
-

diff --git a/open-vm-tools/services/plugins/dndcp/dndUIX11.cpp b/open-vm-tools/services/plugins/dndcp/dndUIX11.cpp
index 690318f8db92a6100e4e3f110b4c9fb72073349b..628442d509678943a384155db65a35f42cfa0267 100644 (file)
--- a/open-vm-tools/services/plugins/dndcp/dndUIX11.cpp
+++ b/open-vm-tools/services/plugins/dndcp/dndUIX11.cpp
@@ -26,13 +26,7 @@
 
 #define G_LOG_DOMAIN "dndcp"
 
-#define VMTOOLS_USE_LEGACY_GTK
-
-
-#ifdef VMTOOLS_USE_LEGACY_GTK
-/* TODO: support xutils with GTK4 */
 #include "xutils/xutils.hh"
-#endif
 
 #include "dndUIX11.h"
 #include "guestDnDCPMgr.hh"
@@ -41,10 +35,7 @@
 extern "C" {
 #include <X11/extensions/XTest.h>       /* for XTest*() */
 #include <gtk/gtk.h>
-#ifdef VMTOOLS_USE_LEGACY_GTK
 #include <gdk/gdkx.h>
-#endif
-
 #include <X11/Xatom.h>
 
 #include "vmware/guestrpc/tclodefs.h"
@@ -111,10 +102,8 @@ DnDUIX11::DnDUIX11(ToolsAppCtx *ctx)
 {
    TRACE_CALL();
 
-#ifdef VMTOOLS_USE_LEGACY_GTK
    xutils::Init();
    xutils::workAreaChanged.connect(sigc::mem_fun(this, &DnDUIX11::OnWorkAreaChanged));
-#endif
 
    /*
     * XXX Hard coded use of default screen means this doesn't work in dual-
@@ -2759,7 +2748,6 @@ DnDUIX11::OnWorkAreaChanged(Glib::RefPtr<Gdk::Screen> screen)    // IN
 {
    TRACE_CALL();
 
-#ifdef VMTOOLS_USE_LEGACY_GTK
    std::vector<unsigned long> values;
    if (xutils::GetCardinalList(screen->get_root_window(), "_NET_WORKAREA", values)
        && values.size() > 0
@@ -2780,7 +2768,6 @@ DnDUIX11::OnWorkAreaChanged(Glib::RefPtr<Gdk::Screen> screen)    // IN
       mOrigin.set_x(0);
       mOrigin.set_y(0);
    }
-#endif
 
    g_debug("%s: new origin at (%d, %d)\n", __FUNCTION__, mOrigin.get_x(),
            mOrigin.get_y());