[vino] remove ShareWithTube D-Bus method

[Guillaume Desmottes <gdesmott src gnome org>]

commit 1bd0bd5d8e0b3d928ff16aa3ff0b737a4ac236d7
Author: Guillaume Desmottes <guillaume desmottes collabora co uk>
Date:   Fri Jun 18 14:54:44 2010 +0200

    remove ShareWithTube D-Bus method
    
    We don't need it any more as Vino is proper channel handler.

 server/dbus-interface.xml          |    5 ---
 server/vino-dbus-listener.c        |   25 ------------------
 server/vino-tube-servers-manager.c |   49 ------------------------------------
 server/vino-tube-servers-manager.h |    9 +------
 4 files changed, 1 insertions(+), 87 deletions(-)
---
diff --git a/server/dbus-interface.xml b/server/dbus-interface.xml
index 9859616..d3d34f9 100644
--- a/server/dbus-interface.xml
+++ b/server/dbus-interface.xml
@@ -10,11 +10,6 @@
     <method name="GetExternalPort">
       <arg name="port" direction="out" type="i"/>
     </method>
-    <method name="ShareWithTube">
-      <arg name="connection" direction="in" type="o"/>
-      <arg name="tube" direction="in" type="o"/>
-      <arg name="properties" direction="in" type="a{sv}"/>
-    </method>
     <signal name="ServerInfoChanged">
     </signal>
   </interface>
diff --git a/server/vino-dbus-listener.c b/server/vino-dbus-listener.c
index 6caf5b1..a689e54 100644
--- a/server/vino-dbus-listener.c
+++ b/server/vino-dbus-listener.c
@@ -92,13 +92,6 @@ vino_dbus_listener_get_internal_data (VinoDBusListener *listener,
                                       gint             *port,
                                       GError           **error);
 
-static gboolean
-vino_dbus_listener_share_with_tube (VinoDBusListener *listener,
-                                    const gchar      *connection_path,
-                                    const gchar      *tube_path,
-                                    GHashTable       *properties,
-                                    GError           **error);
-
 #include "dbus-interface-glue.h"
 
 static void vino_dbus_listener_set_server (VinoDBusListener *listener,
@@ -326,24 +319,6 @@ vino_dbus_listener_get_internal_data (VinoDBusListener *listener,
   return TRUE;
 }
 
-static gboolean
-vino_dbus_listener_share_with_tube (VinoDBusListener *listener,
-                                    const gchar * connection_path,
-                                    const gchar * tube_path,
-                                    GHashTable * properties,
-                                    GError **error)
-{
-#ifdef HAVE_TELEPATHY_GLIB
-  return vino_tube_servers_manager_share_with_tube (listener->priv->manager,
-      connection_path, tube_path, properties, error);
-#else
-  g_set_error (error, vino_dbus_error_quark (),
-      VINO_DBUS_ERROR_NOT_IMPLEMENTED,
-      "Tubes are not installed");
-  return FALSE;
-#endif
-}
-
 static void
 vino_dbus_listener_info_changed (VinoServer *server,
                                  GParamSpec *property,
diff --git a/server/vino-tube-servers-manager.c b/server/vino-tube-servers-manager.c
index 7d49715..cea13bc 100644
--- a/server/vino-tube-servers-manager.c
+++ b/server/vino-tube-servers-manager.c
@@ -132,55 +132,6 @@ vino_tube_servers_manager_disconnected_cb (VinoTubeServer *server,
   g_object_unref (server);
 }
 
-gboolean
-vino_tube_servers_manager_share_with_tube
-    (VinoTubeServersManager * object, const gchar *connection_path,
-    const gchar *tube_path, GHashTable *channel_properties, GError **error)
-{
-  VinoTubeServersManager *self = VINO_TUBE_SERVERS_MANAGER (object);
-  VinoTubeServer *server;
-  GdkDisplay *display;
-  GdkScreen *screen;
-
-  /*Â the server is listenning only on lo as only the tube is supposed to
-  connect to it */
-  gchar * network_interface = "lo";
-
-  display = gdk_display_get_default ();
-  screen = gdk_display_get_default_screen (display);
-
-  server = g_object_new (VINO_TYPE_TUBE_SERVER,
-      "display-status-icon",  0,
-      "use-dbus-listener",    0,
-      "prompt-enabled",       0,
-      "view-only",            0,
-      "network-interface",    network_interface,
-      "use-alternative-port", 1,
-      "alternative-port",     self->priv->alternative_port,
-      "auth-methods",         1,
-      "require-encryption",   0,
-      "vnc-password",         NULL,
-      "on-hold",              0,
-      "screen",               screen,
-      "lock-screen",          0,
-      "disable-background",   0,
-      "use-upnp",             0,
-      "connection-path",      connection_path,
-      "tube-path",            tube_path,
-      "channel-properties",   channel_properties,
-      NULL);
-
-  self->priv->vino_tube_servers = g_slist_prepend
-      (self->priv->vino_tube_servers, server);
-
-  g_signal_connect (G_OBJECT (server), "disconnected", G_CALLBACK
-      (vino_tube_servers_manager_disconnected_cb), self);
-
-  self->priv->alternative_port++;
-
-  return vino_tube_server_share_with_tube (server, error);
-}
-
 VinoTubeServersManager *
 vino_tube_servers_manager_new (void)
 {
diff --git a/server/vino-tube-servers-manager.h b/server/vino-tube-servers-manager.h
index afcca7f..5939e07 100644
--- a/server/vino-tube-servers-manager.h
+++ b/server/vino-tube-servers-manager.h
@@ -57,13 +57,6 @@ struct _VinoTubeServersManagerClass
 GType vino_tube_servers_manager_get_type (void) G_GNUC_CONST;
 VinoTubeServersManager* vino_tube_servers_manager_new (void);
 
-gboolean vino_tube_servers_manager_share_with_tube
-    (VinoTubeServersManager * object,
-    const gchar *connection_path,
-    const gchar *tube_path,
-    GHashTable *channel_properties,
-    GError **error);
-
 G_END_DECLS
 
-#endif
\ No newline at end of file
+#endif