diff options
| author | Christian Beier <dontmind@freeshell.org> | 2010-09-06 16:12:30 +0200 |
|---|---|---|
| committer | Christian Beier <dontmind@freeshell.org> | 2010-09-13 14:17:43 +0200 |
| commit | 0df84e5c27eefad8b731b12d58f8fbede71823e0 (patch) | |
| tree | fc6d66e04cf8343fff2cbebbe1d6dacd09e43671 | |
| parent | 81c05e4a2c5ff72d04adde93ae404e73c9a299e9 (diff) | |
| download | libvncserver-0df84e5c27eefad8b731b12d58f8fbede71823e0.zip libvncserver-0df84e5c27eefad8b731b12d58f8fbede71823e0.tar.gz | |
Cleanup: remove CORBA stuff.
The header file and most of the functions referred to
do not exist in libvncserver.
Signed-off-by: Christian Beier <dontmind@freeshell.org>
| -rw-r--r-- | libvncserver/main.c | 3 | ||||
| -rw-r--r-- | libvncserver/rfbserver.c | 14 | ||||
| -rw-r--r-- | libvncserver/scale.c | 4 |
3 files changed, 1 insertions, 20 deletions
diff --git a/libvncserver/main.c b/libvncserver/main.c index 6aa82d3..807d782 100644 --- a/libvncserver/main.c +++ b/libvncserver/main.c @@ -1078,9 +1078,6 @@ rfbProcessEvents(rfbScreenInfoPtr screen,long usec) rfbCheckFds(screen,usec); rfbHttpCheckFds(screen); -#ifdef CORBA - corbaCheckFds(screen); -#endif i = rfbGetClientIteratorWithClosed(screen); cl=rfbClientIteratorHead(i); diff --git a/libvncserver/rfbserver.c b/libvncserver/rfbserver.c index 48fd74a..471dac3 100644 --- a/libvncserver/rfbserver.c +++ b/libvncserver/rfbserver.c @@ -54,10 +54,6 @@ #endif #endif -#ifdef CORBA -#include <vncserverctrl.h> -#endif - #ifdef DEBUGPROTO #undef DEBUGPROTO #define DEBUGPROTO(x) x @@ -214,15 +210,11 @@ rfbNewClientConnection(rfbScreenInfoPtr rfbScreen, rfbClientPtr cl; cl = rfbNewClient(rfbScreen,sock); -#ifdef CORBA - if(cl!=NULL) - newConnection(cl, (KEYBOARD_DEVICE|POINTER_DEVICE),1,1,1); -#endif } /* - * rfbReverseConnection is called by the CORBA stuff to make an outward + * rfbReverseConnection is called to make an outward * connection to a "listening" RFB client. */ @@ -555,10 +547,6 @@ rfbClientConnectionGone(rfbClientPtr cl) UNLOCK(cl->sendMutex); TINI_MUTEX(cl->sendMutex); -#ifdef CORBA - destroyConnection(cl); -#endif - rfbPrintStats(cl); free(cl); diff --git a/libvncserver/scale.c b/libvncserver/scale.c index 55598fa..22f5597 100644 --- a/libvncserver/scale.c +++ b/libvncserver/scale.c @@ -54,10 +54,6 @@ #endif #endif -#ifdef CORBA -#include <vncserverctrl.h> -#endif - #ifdef DEBUGPROTO #undef DEBUGPROTO #define DEBUGPROTO(x) x |
