[vino] Remove all HTTP server code

[David King <davidk src gnome org>]

commit f926606b97631208c4721605dfd866afe44ba7c2
Author: Mihai Capotă <mihai mihaic ro>
Date:   Fri Aug 15 17:30:48 2014 +0200

    Remove all HTTP server code
    
    https://bugzilla.gnome.org/show_bug.cgi?id=674268

 Makefile.am                   |    8 -
 configure.ac                  |   12 -
 server/libvncserver/rfb/rfb.h |    6 -
 server/vino-dbus-listener.c   |    7 -
 server/vino-http.c            |  851 -----------------------------------------
 server/vino-http.h            |   65 ----
 server/vino-server.c          |   21 -
 server/vino-util.c            |    1 -
 server/vino-util.h            |    7 +-
 9 files changed, 3 insertions(+), 975 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 8abc3d3..a9dcb35 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -11,7 +11,6 @@ DISTCHECK_CONFIGURE_FLAGS = \
        --with-zlib \
        --with-jpeg \
        --enable-debug \
-       --enable-http-server \
        --enable-compile-warnings=maximum
 
 noinst_LTLIBRARIES = \
@@ -126,12 +125,6 @@ vino_server_LDADD = \
        $(JPEG_LIBS) \
        $(X_LIBS) $(XTEST_LIBS) $(XSHM_LIBS) $(XDAMAGE_LIBS) $(ZLIB_LIBS)
 
-if VINO_ENABLE_HTTP_SERVER
-VINO_HTTP_sources = \
-       server/vino-http.c \
-       server/vino-http.h
-endif
-
 if VINO_HAVE_TELEPATHY_GLIB
 VINO_TELEPATHY_GLIB_sources = \
        server/vino-tube-servers-manager.c \
@@ -180,7 +173,6 @@ vino_server_SOURCES = \
        $(VINO_MINIUPNP_sources) \
        $(VINO_IFADDR_sources) \
        $(VINO_LIBVNCSERVER_sources) \
-       $(VINO_HTTP_sources) \
        $(VINO_TELEPATHY_GLIB_sources)
 
 nodist_vino_server_SOURCES = \
diff --git a/configure.ac b/configure.ac
index cbbbd75..d9db6a1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11,18 +11,6 @@ AM_SILENT_RULES([yes])
 AC_PROG_CC
 AM_PROG_CC_C_O
 
-# Check whether to enable HTTP server support
-AC_ARG_ENABLE([http-server],
-  [AS_HELP_STRING([--disable-http-server],
-   [build with an HTTP server for serving a Java applet client @<:@default=yes@:>@])],
-   [],
-   [enable_http_server=yes])
-
-AS_IF([test "x$enable_http_server" = "xyes"],
-  [AC_DEFINE([VINO_ENABLE_HTTP_SERVER], [], [Enable HTTP server support])])
-
-AM_CONDITIONAL([VINO_ENABLE_HTTP_SERVER], [test "x$enable_http_server" = "xyes"])
-
 # GNOME common
 AM_MAINTAINER_MODE([enable])
 GNOME_MAINTAINER_MODE_DEFINES
diff --git a/server/libvncserver/rfb/rfb.h b/server/libvncserver/rfb/rfb.h
index 0de79a4..9aab2be 100644
--- a/server/libvncserver/rfb/rfb.h
+++ b/server/libvncserver/rfb/rfb.h
@@ -451,12 +451,6 @@ extern rfbBool rfbSetTranslateFunction(rfbClientPtr cl);
 extern rfbBool rfbSetClientColourMap(rfbClientPtr cl, int firstColour, int nColours);
 extern void rfbSetClientColourMaps(rfbScreenInfoPtr rfbScreen, int firstColour, int nColours);
 
-/* httpd.c */
-
-extern void httpInitSockets(rfbScreenInfoPtr rfbScreen);
-extern void httpCheckFds(rfbScreenInfoPtr rfbScreen);
-
-
 
 /* auth.c */
 
diff --git a/server/vino-dbus-listener.c b/server/vino-dbus-listener.c
index 97b72f2..d1c57c8 100644
--- a/server/vino-dbus-listener.c
+++ b/server/vino-dbus-listener.c
@@ -30,9 +30,6 @@
 #endif
 
 #include "vino-util.h"
-#ifdef VINO_ENABLE_HTTP_SERVER
-#include "vino-http.h"
-#endif
 
 #include "vino-mdns.h"
 
@@ -129,11 +126,7 @@ vino_dbus_listener_class_init (GObjectClass *class)
 static guint16
 vino_dbus_listener_get_port (VinoDBusListener *listener)
 {
-#ifdef VINO_ENABLE_HTTP_SERVER
-  return vino_get_http_server_port ();
-#else
   return vino_server_get_port (listener->server);
-#endif
 }
 
 static GVariant *
diff --git a/server/vino-server.c b/server/vino-server.c
index 8becd52..38b17e3 100644
--- a/server/vino-server.c
+++ b/server/vino-server.c
@@ -26,9 +26,6 @@
 
 #include <rfb/rfb.h>
 #include "vino-fb.h"
-#ifdef VINO_ENABLE_HTTP_SERVER
-#include "vino-http.h"
-#endif
 #include "vino-mdns.h"
 #include "vino-input.h"
 #include "vino-cursor.h"
@@ -71,10 +68,6 @@ struct _VinoServerPrivate
   VinoAuthMethod    auth_methods;
   char             *vnc_password;
 
-#ifdef VINO_ENABLE_HTTP_SERVER
-  VinoHTTP         *http;
-#endif
-
   int               alternative_port;
 
   guint             on_hold : 1;
@@ -1091,10 +1084,6 @@ vino_server_init_from_screen (VinoServer *server,
 
   vino_server_init_io_channels (server);
 
-#ifdef VINO_ENABLE_HTTP_SERVER
-  server->priv->http = vino_http_get (rfb_screen->rfbPort);
-#endif
-
   vino_mdns_add_service ("_rfb._tcp", rfb_screen->rfbPort);
 
   cb = gtk_clipboard_get_for_display (gdk_screen_get_display (screen),
@@ -1112,16 +1101,6 @@ static void
 vino_server_finalize (GObject *object)
 {
   VinoServer *server = VINO_SERVER (object);
-  
-#ifdef VINO_ENABLE_HTTP_SERVER
-  if (server->priv->http)
-    {
-      vino_http_remove_rfb_port (server->priv->http,
-                                server->priv->rfb_screen->rfbPort);
-      g_object_unref (server->priv->http);
-    }
-  server->priv->http = NULL;
-#endif /* VINO_ENABLE_HTTP_SERVER */
 
   vino_server_deinit_io_channels (server);
   
diff --git a/server/vino-util.c b/server/vino-util.c
index c41f6cb..aefa873 100644
--- a/server/vino-util.c
+++ b/server/vino-util.c
@@ -65,7 +65,6 @@ vino_setup_debug_flags (void)
       { "tls",     VINO_DEBUG_TLS },
       { "mdns",    VINO_DEBUG_MDNS },
       { "prompt",  VINO_DEBUG_PROMPT },
-      { "http",    VINO_DEBUG_HTTP },
       { "dbus",    VINO_DEBUG_DBUS },
       { "upnp",    VINO_DEBUG_UPNP },
       { "tube",    VINO_DEBUG_TUBE }
diff --git a/server/vino-util.h b/server/vino-util.h
index a93437f..6750136 100644
--- a/server/vino-util.h
+++ b/server/vino-util.h
@@ -44,10 +44,9 @@ typedef enum
   VINO_DEBUG_TLS     = 1 << 4,
   VINO_DEBUG_MDNS    = 1 << 5,
   VINO_DEBUG_PROMPT  = 1 << 6,
-  VINO_DEBUG_HTTP    = 1 << 7,
-  VINO_DEBUG_DBUS    = 1 << 8,
-  VINO_DEBUG_UPNP    = 1 << 9,
-  VINO_DEBUG_TUBE    = 1 << 10
+  VINO_DEBUG_DBUS    = 1 << 7,
+  VINO_DEBUG_UPNP    = 1 << 8,
+  VINO_DEBUG_TUBE    = 1 << 9
 } VinoDebugFlags;
 
 #ifdef GNOME_ENABLE_DEBUG