Update upstream source from tag 'upstream/2.4.0+dfsg'

Update to upstream version '2.4.0+dfsg'
with Debian dir 4b6668cc08c7b0e56b1e1f7b4e89ecdb316182a0

1 files changed, 8 insertions, 6 deletions

diff --git a/src/lib/barrier/Screen.h b/src/lib/barrier/Screen.h
index b16feff..1c8e7de 100644
--- a/src/lib/barrier/Screen.h
+++ b/src/lib/barrier/Screen.h
@@ -2,11 +2,11 @@
  * barrier -- mouse and keyboard sharing utility
  * Copyright (C) 2012-2016 Symless Ltd.
  * Copyright (C) 2002 Chris Schoeneman
- * 
+ *
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * found in the file LICENSE that should have accompanied this file.
- * 
+ *
  * This package is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
@@ -42,7 +42,7 @@ public:
     Screen(IPlatformScreen* platformScreen, IEventQueue* events);
     virtual ~Screen();
 
-#ifdef TEST_ENV
+#ifdef BARRIER_TEST_ENV
     Screen() : m_mock(true) { }
 #endif
 
@@ -223,7 +223,7 @@ public:
 
     //! Change dragging status
     void                setDraggingStarted(bool started);
-    
+
     //! Fake a files dragging operation
     void                startDraggingFiles(DragFileList& fileList);
 
@@ -278,7 +278,7 @@ public:
 
     //! Test if file is dragged on primary screen
     bool                isDraggingStarted() const;
-    
+
     //! Test if file is dragged on secondary screen
     bool                isFakeDraggingStarted() const;
 
@@ -290,6 +290,8 @@ public:
 
     //! Get the drop target directory
     const String&        getDropTarget() const;
+    //! Set the drop target directory
+    void                 setDropTarget(const String&);
 
     //@}
 
@@ -299,7 +301,7 @@ public:
     virtual void        getShape(SInt32& x, SInt32& y,
                             SInt32& width, SInt32& height) const;
     virtual void        getCursorPos(SInt32& x, SInt32& y) const;
-    
+
     IPlatformScreen*    getPlatformScreen() { return m_screen; }
 
 protected: