1 files changed, 10 insertions, 11 deletions

diff --git a/unix/xserver/hw/vnc/XserverDesktop.cc b/unix/xserver/hw/vnc/XserverDesktop.cc
index 7ad65d06..9c4486c8 100644
--- a/unix/xserver/hw/vnc/XserverDesktop.cc
+++ b/unix/xserver/hw/vnc/XserverDesktop.cc
@@ -38,7 +38,6 @@
 #include <sys/utsname.h>
 
 #include <network/Socket.h>
-#include <rfb/Exception.h>
 #include <rfb/VNCServerST.h>
 #include <rfb/LogWriter.h>
 #include <rfb/Configuration.h>
@@ -195,7 +194,7 @@ void XserverDesktop::requestClipboard()
 {
   try {
     server->requestClipboard();
-  } catch (rdr::Exception& e) {
+  } catch (std::exception& e) {
     vlog.error("XserverDesktop::requestClipboard: %s",e.what());
   }
 }
@@ -204,7 +203,7 @@ void XserverDesktop::announceClipboard(bool available)
 {
   try {
     server->announceClipboard(available);
-  } catch (rdr::Exception& e) {
+  } catch (std::exception& e) {
     vlog.error("XserverDesktop::announceClipboard: %s",e.what());
   }
 }
@@ -213,7 +212,7 @@ void XserverDesktop::sendClipboardData(const char* data_)
 {
   try {
     server->sendClipboardData(data_);
-  } catch (rdr::Exception& e) {
+  } catch (std::exception& e) {
     vlog.error("XserverDesktop::sendClipboardData: %s",e.what());
   }
 }
@@ -232,7 +231,7 @@ void XserverDesktop::setDesktopName(const char* name)
 {
   try {
     server->setName(name);
-  } catch (rdr::Exception& e) {
+  } catch (std::exception& e) {
     vlog.error("XserverDesktop::setDesktopName: %s",e.what());
   }
 }
@@ -267,7 +266,7 @@ void XserverDesktop::setCursor(int width, int height, int hotX, int hotY,
 
   try {
     server->setCursor(width, height, Point(hotX, hotY), cursorData);
-  } catch (rdr::Exception& e) {
+  } catch (std::exception& e) {
     vlog.error("XserverDesktop::setCursor: %s",e.what());
   }
 
@@ -278,7 +277,7 @@ void XserverDesktop::setCursorPos(int x, int y, bool warped)
 {
   try {
     server->setCursorPos(Point(x, y), warped);
-  } catch (rdr::Exception& e) {
+  } catch (std::exception& e) {
     vlog.error("XserverDesktop::setCursorPos: %s",e.what());
   }
 }
@@ -287,7 +286,7 @@ void XserverDesktop::add_changed(const rfb::Region &region)
 {
   try {
     server->add_changed(region);
-  } catch (rdr::Exception& e) {
+  } catch (std::exception& e) {
     vlog.error("XserverDesktop::add_changed: %s",e.what());
   }
 }
@@ -296,7 +295,7 @@ void XserverDesktop::add_copied(const rfb::Region &dest, const rfb::Point &delta
 {
   try {
     server->add_copied(dest, delta);
-  } catch (rdr::Exception& e) {
+  } catch (std::exception& e) {
     vlog.error("XserverDesktop::add_copied: %s",e.what());
   }
 }
@@ -313,7 +312,7 @@ void XserverDesktop::handleSocketEvent(int fd, bool read, bool write)
       return;
 
     vlog.error("Cannot find file descriptor for socket event");
-  } catch (rdr::Exception& e) {
+  } catch (std::exception& e) {
     vlog.error("XserverDesktop::handleSocketEvent: %s",e.what());
   }
 }
@@ -406,7 +405,7 @@ void XserverDesktop::blockHandler(int* timeout)
     int nextTimeout = Timer::checkTimeouts();
     if (nextTimeout >= 0 && (*timeout == -1 || nextTimeout < *timeout))
       *timeout = nextTimeout;
-  } catch (rdr::Exception& e) {
+  } catch (std::exception& e) {
     vlog.error("XserverDesktop::blockHandler: %s", e.what());
   }
 }