[vino] Remove VinoTubeServer::connection property
- From: David King <davidk src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [vino] Remove VinoTubeServer::connection property
- Date: Wed, 25 Apr 2012 09:59:04 +0000 (UTC)
commit cb74cea7d9021e30be8bd9a42d36e98137c513eb
Author: Guillaume Desmottes <guillaume desmottes collabora co uk>
Date: Tue Apr 24 14:21:33 2012 +0200
Remove VinoTubeServer::connection property
The TpConnection from the TpChannel can be used instead. See bug 674707.
server/vino-tube-server.c | 33 ---------------------------------
server/vino-tube-servers-manager.c | 1 -
2 files changed, 0 insertions(+), 34 deletions(-)
---
diff --git a/server/vino-tube-server.c b/server/vino-tube-server.c
index b8e3df9..24811be 100644
--- a/server/vino-tube-server.c
+++ b/server/vino-tube-server.c
@@ -44,7 +44,6 @@ G_DEFINE_TYPE (VinoTubeServer, vino_tube_server, VINO_TYPE_SERVER);
struct _VinoTubeServerPrivate
{
TpChannel *tube;
- TpConnection *connection;
gchar *filename;
gulong signal_invalidated_id;
VinoStatusTubeIcon *icon_tube;
@@ -133,12 +132,6 @@ vino_tube_server_finalize (GObject *object)
server->priv->filename = NULL;
}
- if (server->priv->connection != NULL)
- {
- g_object_unref (server->priv->connection);
- server->priv->connection = NULL;
- }
-
dprintf (TUBE, "Destruction of a VinoTubeServer\n");
if (G_OBJECT_CLASS (vino_tube_server_parent_class)->finalize)
@@ -146,15 +139,6 @@ vino_tube_server_finalize (GObject *object)
}
static void
-vino_tube_server_set_connection (VinoTubeServer *server,
- TpConnection *connection)
-{
- g_return_if_fail (VINO_IS_TUBE_SERVER (server));
-
- server->priv->connection = g_object_ref (connection);
-}
-
-static void
vino_tube_server_set_tube (VinoTubeServer *server,
TpChannel *tube)
{
@@ -173,10 +157,6 @@ vino_tube_server_set_property (GObject *object,
switch (prop_id)
{
- case PROP_CONNECTION:
- vino_tube_server_set_connection (server,
- g_value_get_object (value));
- break;
case PROP_TUBE:
vino_tube_server_set_tube (server, g_value_get_object (value));
break;
@@ -196,9 +176,6 @@ vino_tube_server_get_property (GObject *object,
switch (prop_id)
{
- case PROP_CONNECTION:
- g_value_set_object (value, server->priv->connection);
- break;
case PROP_TUBE:
g_value_set_object (value, server->priv->tube);
break;
@@ -239,16 +216,6 @@ vino_tube_server_class_init (VinoTubeServerClass *klass)
0);
g_object_class_install_property (gobject_class,
- PROP_CONNECTION,
- g_param_spec_object ("connection",
- "TpConnection",
- "Connection of the stream tube",
- TP_TYPE_CONNECTION,
- G_PARAM_READWRITE |
- G_PARAM_CONSTRUCT |
- G_PARAM_STATIC_STRINGS));
-
- g_object_class_install_property (gobject_class,
PROP_TUBE,
g_param_spec_object ("tube",
"TpChannel",
diff --git a/server/vino-tube-servers-manager.c b/server/vino-tube-servers-manager.c
index 70be03e..a5dab53 100644
--- a/server/vino-tube-servers-manager.c
+++ b/server/vino-tube-servers-manager.c
@@ -238,7 +238,6 @@ handle_channels_cb (TpSimpleHandler *handler,
"lock-screen", 0,
"disable-background", 0,
"use-upnp", 0,
- "connection", connection,
"tube", channel,
NULL);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]