summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonathon Jongsma <jjongsma@redhat.com>2015-01-21 16:59:11 -0600
committerFabiano FidĂȘncio <fidencio@redhat.com>2015-02-23 23:00:44 +0100
commit8718a461b26bc2dbac087af438912115cc248599 (patch)
tree0f1fe223f5873380aaabedded95ac69be6e1abee
parente3ccb42b894dd3ff3f8149f73fe5bc94e73d1054 (diff)
downloadspice-8718a461b26bc2dbac087af438912115cc248599.tar.gz
spice-8718a461b26bc2dbac087af438912115cc248599.tar.xz
spice-8718a461b26bc2dbac087af438912115cc248599.zip
main_channel_init() -> main_channel_new()
Rename to make function name more consistent
-rw-r--r--server/main-channel.c2
-rw-r--r--server/main-channel.h2
-rw-r--r--server/reds.c2
3 files changed, 3 insertions, 3 deletions
diff --git a/server/main-channel.c b/server/main-channel.c
index fab8822d..df81dea4 100644
--- a/server/main-channel.c
+++ b/server/main-channel.c
@@ -1187,7 +1187,7 @@ static void main_channel_client_migrate(RedChannelClient *rcc)
red_channel_client_default_migrate(rcc);
}
-MainChannel* main_channel_init(void)
+MainChannel* main_channel_new(void)
{
RedChannel *channel;
ChannelCbs channel_cbs = { NULL, };
diff --git a/server/main-channel.h b/server/main-channel.h
index c8e203c5..8158e148 100644
--- a/server/main-channel.h
+++ b/server/main-channel.h
@@ -48,7 +48,7 @@ typedef struct MainChannel {
} MainChannel;
-MainChannel *main_channel_init(void);
+MainChannel *main_channel_new(void);
RedClient *main_channel_get_client_by_link_id(MainChannel *main_chan, uint32_t link_id);
/* This is a 'clone' from the reds.h Channel.link callback to allow passing link_id */
MainChannelClient *main_channel_link(MainChannel *, RedClient *client,
diff --git a/server/reds.c b/server/reds.c
index 3320268b..447aa65b 100644
--- a/server/reds.c
+++ b/server/reds.c
@@ -3292,7 +3292,7 @@ static int do_spice_init(RedsState *reds, SpiceCoreInterface *core_interface)
}
#endif
- reds->main_channel = main_channel_init();
+ reds->main_channel = main_channel_new();
reds->inputs_channel = inputs_channel_new();
reds->mouse_mode = SPICE_MOUSE_MODE_SERVER;