[Spice-commits] 3 commits - server/cursor-channel-client.c server/inputs-channel-client.c server/inputs-channel-client.h server/inputs-channel.c server/red-channel-client.c server/red-channel-client.h server/red-channel.c server/smartcard-channel-client.c server/smartcard-channel-client.h server/smartcard.c server/spicevmc.c
Frediano Ziglio
fziglio at kemper.freedesktop.org
Thu Mar 30 17:17:40 UTC 2017
server/cursor-channel-client.c | 1 -
server/inputs-channel-client.c | 2 --
server/inputs-channel-client.h | 1 -
server/inputs-channel.c | 2 +-
server/red-channel-client.c | 19 -------------------
server/red-channel-client.h | 5 -----
server/red-channel.c | 2 +-
server/smartcard-channel-client.c | 2 --
server/smartcard-channel-client.h | 1 -
server/smartcard.c | 6 +-----
server/spicevmc.c | 1 -
11 files changed, 3 insertions(+), 39 deletions(-)
New commits:
commit 6a6d0fa339d4a8a803831e80a20fdedaa6dc1791
Author: Christophe Fergeau <cfergeau at redhat.com>
Date: Thu Mar 30 18:40:15 2017 +0200
Remove unused red_channel_client_new()
Signed-off-by: Christophe Fergeau <cfergeau at redhat.com>
Acked-by: Frediano Ziglio <fziglio at redhat.com>
diff --git a/server/red-channel-client.c b/server/red-channel-client.c
index a86833d5..447f29bb 100644
--- a/server/red-channel-client.c
+++ b/server/red-channel-client.c
@@ -973,25 +973,6 @@ cleanup:
return local_error == NULL;
}
-RedChannelClient *red_channel_client_create(RedChannel *channel, RedClient *client,
- RedsStream *stream,
- int monitor_latency,
- RedChannelCapabilities *caps)
-{
- RedChannelClient *rcc;
-
- rcc = g_initable_new(RED_TYPE_CHANNEL_CLIENT,
- NULL, NULL,
- "channel", channel,
- "client", client,
- "stream", stream,
- "monitor-latency", monitor_latency,
- "caps", caps,
- NULL);
-
- return rcc;
-}
-
static void red_channel_client_seamless_migration_done(RedChannelClient *rcc)
{
rcc->priv->wait_migrate_data = FALSE;
diff --git a/server/red-channel-client.h b/server/red-channel-client.h
index ebe06d80..95e2d133 100644
--- a/server/red-channel-client.h
+++ b/server/red-channel-client.h
@@ -47,11 +47,6 @@ typedef struct RedChannelClientPrivate RedChannelClientPrivate;
GType red_channel_client_get_type(void) G_GNUC_CONST;
-RedChannelClient *red_channel_client_create(RedChannel *channel,
- RedClient *client, RedsStream *stream,
- int monitor_latency,
- RedChannelCapabilities *caps);
-
gboolean red_channel_client_is_connected(RedChannelClient *rcc);
void red_channel_client_default_migrate(RedChannelClient *rcc);
bool red_channel_client_is_waiting_for_migrate_data(RedChannelClient *rcc);
diff --git a/server/red-channel.c b/server/red-channel.c
index 1d8cce8a..91c0dee1 100644
--- a/server/red-channel.c
+++ b/server/red-channel.c
@@ -37,7 +37,7 @@
* red_channel_create.* and red_channel_destroy. The RedChannel resources
* are deallocated only after red_channel_destroy is called and no RedChannelClient
* refers to the channel.
- * RedChannelClient is created and destroyed by the calls to red_channel_client_create
+ * RedChannelClient is created and destroyed by the calls to xxx_channel_client_new
* and red_channel_client_destroy. RedChannelClient resources are deallocated only when
* its refs == 0. The reference count of RedChannelClient can be increased by routines
* that include calls that might destroy the red_channel_client. For example,
commit b8bc1fe715de38fe07fb026b8d2d81790f8e18e0
Author: Christophe Fergeau <cfergeau at redhat.com>
Date: Thu Mar 30 18:40:14 2017 +0200
Don't set RedChannelClient::monitor-latency to FALSE
This is the default value, and the property is marked as
_CONSTRUCT_ONLY, so we don't need to explicitly force the default when
instantiating a RedChannelClient.
Signed-off-by: Christophe Fergeau <cfergeau at redhat.com>
Acked-by: Frediano Ziglio <fziglio at redhat.com>
diff --git a/server/cursor-channel-client.c b/server/cursor-channel-client.c
index db74bdea..bbb0588f 100644
--- a/server/cursor-channel-client.c
+++ b/server/cursor-channel-client.c
@@ -102,7 +102,6 @@ CursorChannelClient* cursor_channel_client_new(CursorChannel *cursor, RedClient
"channel", cursor,
"client", client,
"stream", stream,
- "monitor-latency", FALSE,
"caps", caps,
NULL);
common_graphics_channel_set_during_target_migrate(COMMON_GRAPHICS_CHANNEL(cursor), mig_target);
diff --git a/server/spicevmc.c b/server/spicevmc.c
index 623e34f0..83f4a760 100644
--- a/server/spicevmc.c
+++ b/server/spicevmc.c
@@ -1014,7 +1014,6 @@ vmc_channel_client_create(RedChannel *channel, RedClient *client,
"channel", channel,
"client", client,
"stream", stream,
- "monitor-latency", FALSE,
"caps", caps,
NULL);
commit db9dcd944a77db57d46e2d3a3898ad67fd4c010a
Author: Christophe Fergeau <cfergeau at redhat.com>
Date: Thu Mar 30 18:40:13 2017 +0200
Remove unused "monitor_latency" arguments
InputsChannelClient::new and SmartcardChannelClient::new both accept a
"monitor_latency" argument, which is always FALSE. It can be removed.
Signed-off-by: Christophe Fergeau <cfergeau at redhat.com>
Acked-by: Frediano Ziglio <fziglio at redhat.com>
diff --git a/server/inputs-channel-client.c b/server/inputs-channel-client.c
index c5b8e719..c28e24eb 100644
--- a/server/inputs-channel-client.c
+++ b/server/inputs-channel-client.c
@@ -83,7 +83,6 @@ inputs_channel_client_init(InputsChannelClient *self)
RedChannelClient* inputs_channel_client_create(RedChannel *channel,
RedClient *client,
RedsStream *stream,
- int monitor_latency,
RedChannelCapabilities *caps)
{
RedChannelClient *rcc;
@@ -93,7 +92,6 @@ RedChannelClient* inputs_channel_client_create(RedChannel *channel,
"channel", channel,
"client", client,
"stream", stream,
- "monitor-latency", monitor_latency,
"caps", caps,
NULL);
diff --git a/server/inputs-channel-client.h b/server/inputs-channel-client.h
index ba08dbfd..0cd2ae61 100644
--- a/server/inputs-channel-client.h
+++ b/server/inputs-channel-client.h
@@ -59,7 +59,6 @@ GType inputs_channel_client_get_type(void) G_GNUC_CONST;
RedChannelClient* inputs_channel_client_create(RedChannel *channel,
RedClient *client,
RedsStream *stream,
- int monitor_latency,
RedChannelCapabilities *caps);
uint16_t inputs_channel_client_get_motion_count(InputsChannelClient* self);
diff --git a/server/inputs-channel.c b/server/inputs-channel.c
index 073dc41a..08518212 100644
--- a/server/inputs-channel.c
+++ b/server/inputs-channel.c
@@ -463,7 +463,7 @@ static void inputs_connect(RedChannel *channel, RedClient *client,
}
spice_printerr("inputs channel client create");
- rcc = inputs_channel_client_create(channel, client, stream, FALSE, caps);
+ rcc = inputs_channel_client_create(channel, client, stream, caps);
if (!rcc) {
return;
}
diff --git a/server/smartcard-channel-client.c b/server/smartcard-channel-client.c
index 05ad49b9..e934b2e9 100644
--- a/server/smartcard-channel-client.c
+++ b/server/smartcard-channel-client.c
@@ -106,7 +106,6 @@ smart_card_channel_client_init(SmartCardChannelClient *self)
SmartCardChannelClient* smartcard_channel_client_create(RedChannel *channel,
RedClient *client, RedsStream *stream,
- int monitor_latency,
RedChannelCapabilities *caps)
{
SmartCardChannelClient *rcc;
@@ -116,7 +115,6 @@ SmartCardChannelClient* smartcard_channel_client_create(RedChannel *channel,
"channel", channel,
"client", client,
"stream", stream,
- "monitor-latency", monitor_latency,
"caps", caps,
NULL);
diff --git a/server/smartcard-channel-client.h b/server/smartcard-channel-client.h
index 612f9f84..f346889a 100644
--- a/server/smartcard-channel-client.h
+++ b/server/smartcard-channel-client.h
@@ -57,7 +57,6 @@ GType smart_card_channel_client_get_type(void) G_GNUC_CONST;
SmartCardChannelClient* smartcard_channel_client_create(RedChannel *channel,
RedClient *client, RedsStream *stream,
- int monitor_latency,
RedChannelCapabilities *caps);
bool smartcard_channel_client_handle_migrate_flush_mark(RedChannelClient *rcc);
diff --git a/server/smartcard.c b/server/smartcard.c
index fcba01b0..ac2fc1e1 100644
--- a/server/smartcard.c
+++ b/server/smartcard.c
@@ -535,11 +535,7 @@ static void smartcard_connect_client(RedChannel *channel, RedClient *client,
SmartCardChannelClient *scc;
- scc = smartcard_channel_client_create(channel,
- client,
- stream,
- FALSE,
- caps);
+ scc = smartcard_channel_client_create(channel, client, stream, caps);
if (!scc) {
return;
More information about the Spice-commits
mailing list