From 0df84e5c27eefad8b731b12d58f8fbede71823e0 Mon Sep 17 00:00:00 2001 From: Christian Beier Date: Mon, 6 Sep 2010 16:12:30 +0200 Subject: [PATCH] Cleanup: remove CORBA stuff. The header file and most of the functions referred to do not exist in libvncserver. Signed-off-by: Christian Beier --- libvncserver/main.c | 3 --- libvncserver/rfbserver.c | 14 +------------- libvncserver/scale.c | 4 ---- 3 files changed, 1 insertion(+), 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 -#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 -#endif - #ifdef DEBUGPROTO #undef DEBUGPROTO #define DEBUGPROTO(x) x