simplify code

diff --git a/screen.c b/screen.c
index 654ba0fac08b6c4dff8e2ddcb7035662a246833c..f06f8df44ebe20adab2a9304f572257d689e81c8 100644 (file)
--- a/screen.c
+++ b/screen.c
@@ -623,12 +623,6 @@ QXLInterface display_sif = {
     .set_client_capabilities = set_client_capabilities,
 };
 
-void 
-spice_screen_add_display_interface(SpiceScreen* spice_screen)
-{
-    spice_server_add_interface(spice_screen->server, &spice_screen->qxl_instance.base);
-}
-
 /* vdagent interface - not sure why we need that? */
 static int 
 vmc_write(SpiceCharDeviceInstance *sin, const uint8_t *buf, int len)
@@ -665,12 +659,6 @@ SpiceCharDeviceInstance vdagent_sin = {
     .subtype = "vdagent",
 };
 
-void 
-spice_screen_add_agent_interface(SpiceServer *server)
-{
-    spice_server_add_interface(server, &vdagent_sin.base);
-}
-
 void 
 spice_screen_draw_char(SpiceScreen *spice_screen, int x, int y, gunichar2 ch, TextAttributes attrib)
 {
@@ -739,5 +727,9 @@ spice_screen_new(SpiceCoreInterface *core)
     spice_screen->conn_timeout_timer = core->timer_add(do_conn_timeout, spice_screen);
     spice_screen->core->timer_start(spice_screen->conn_timeout_timer, timeout*1000);
 
+    spice_server_add_interface(spice_screen->server, &spice_screen->qxl_instance.base);
+
+    spice_server_add_interface(server, &vdagent_sin.base);
+
     return spice_screen;
 }

diff --git a/spiceterm.c b/spiceterm.c
index 3699ab3e92811557cc6e09c1c52c96e6a36a2b37..c460aff65df72287b3aa50263db7cfe31d2ab5d7 100644 (file)
--- a/spiceterm.c
+++ b/spiceterm.c
@@ -1612,8 +1612,6 @@ create_spiceterm(int argc, char** argv, int maxx, int maxy)
     SpiceCoreInterface *core = basic_event_loop_init();
     spice_screen = spice_screen_new(core);
     //spice_server_set_image_compression(server, SPICE_IMAGE_COMPRESS_OFF);
-    spice_screen_add_display_interface(spice_screen);
-    spice_screen_add_agent_interface(spice_screen->server);
 
     spiceTerm *vt = (spiceTerm *)calloc (sizeof(spiceTerm), 1);
 

diff --git a/spiceterm.h b/spiceterm.h
index cd763f510627e54a74a5d3c6d0b91a7e1f7ad23d..8dcbea9557fbeaf20d7b6c35ae085da556cd20f1 100644 (file)
--- a/spiceterm.h
+++ b/spiceterm.h
@@ -64,8 +64,6 @@ struct SpiceScreen {
 
 SpiceScreen* spice_screen_new(SpiceCoreInterface* core);
 
-void spice_screen_add_display_interface(SpiceScreen *spice_screen);
-void spice_screen_add_agent_interface(SpiceServer *server);
 void spice_screen_draw_char(SpiceScreen *spice_screen, int x, int y, gunichar2 ch, TextAttributes attrib);
 void spice_screen_scroll(SpiceScreen *spice_screen, int x1, int y1, int x2, int y2, int src_x, int src_y);
 void spice_screen_clear(SpiceScreen *spice_screen, int x1, int y1, int x2, int y2);