From: Jonathon Jongsma <jjongsma@xxxxxxxxxx> Rename to make function name more consistent Acked-by: Frediano Ziglio <fziglio@xxxxxxxxxx> --- server/main-channel.c | 2 +- server/main-channel.h | 2 +- server/reds.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/server/main-channel.c b/server/main-channel.c index 9623224..1f4fcaa 100644 --- a/server/main-channel.c +++ b/server/main-channel.c @@ -1161,7 +1161,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 fab383a..c472e13 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 bf4c63d..15d20a5 100644 --- a/server/reds.c +++ b/server/reds.c @@ -3413,7 +3413,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; -- 2.4.3 _______________________________________________ Spice-devel mailing list Spice-devel@xxxxxxxxxxxxxxxxxxxxx http://lists.freedesktop.org/mailman/listinfo/spice-devel