Remove circular dependancy between VirtViewerDisplay and VirtViewer

Add many signals to VirtViewerDisplay which are emitted when various
events occur. This lets us remove all the code in the VirtViewerDisplay
subclasses which call back into VirtViewer methods. Instead VirtViewer
can simply connect signals to the display

1 files changed, 6 insertions, 6 deletions

diff --git a/src/virt-viewer-display-vnc.h b/src/virt-viewer-display-vnc.h
index f2373b1..f3c3406 100644
--- a/src/virt-viewer-display-vnc.h
+++ b/src/virt-viewer-display-vnc.h
@@ -34,10 +34,10 @@ G_BEGIN_DECLS
 #define VIRT_VIEWER_TYPE_DISPLAY_VNC virt_viewer_display_vnc_get_type()
 
 #define VIRT_VIEWER_DISPLAY_VNC(obj)					\
-	(G_TYPE_CHECK_INSTANCE_CAST ((obj), VIRT_VIEWER_TYPE_DISPLAY_VNC, VirtViewerDisplayVNC))
+	(G_TYPE_CHECK_INSTANCE_CAST ((obj), VIRT_VIEWER_TYPE_DISPLAY_VNC, VirtViewerDisplayVnc))
 
 #define VIRT_VIEWER_DISPLAY_VNC_CLASS(klass)				\
-	(G_TYPE_CHECK_CLASS_CAST ((klass), VIRT_VIEWER_TYPE_DISPLAY_VNC, VirtViewerDisplayVNCClass))
+	(G_TYPE_CHECK_CLASS_CAST ((klass), VIRT_VIEWER_TYPE_DISPLAY_VNC, VirtViewerDisplayVncClass))
 
 #define VIRT_IS_VIEWER_DISPLAY_VNC(obj)					\
 	(G_TYPE_CHECK_INSTANCE_TYPE ((obj), VIRT_VIEWER_TYPE_DISPLAY_VNC))
@@ -46,21 +46,21 @@ G_BEGIN_DECLS
 	(G_TYPE_CHECK_CLASS_TYPE ((klass), VIRT_VIEWER_TYPE_DISPLAY_VNC))
 
 #define VIRT_VIEWER_DISPLAY_VNC_GET_CLASS(obj)				\
-	(G_TYPE_INSTANCE_GET_CLASS ((obj), VIRT_VIEWER_TYPE_DISPLAY_VNC, VirtViewerDisplayVNCClass))
+	(G_TYPE_INSTANCE_GET_CLASS ((obj), VIRT_VIEWER_TYPE_DISPLAY_VNC, VirtViewerDisplayVncClass))
 
 typedef struct {
 	VirtViewerDisplay parent;
 
 	VncDisplay *vnc;
-} VirtViewerDisplayVNC;
+} VirtViewerDisplayVnc;
 
 typedef struct {
 	VirtViewerDisplayClass parent_class;
-} VirtViewerDisplayVNCClass;
+} VirtViewerDisplayVncClass;
 
 GType virt_viewer_display_vnc_get_type(void);
 
-GtkWidget* virt_viewer_display_vnc_new(VirtViewer *viewer);
+GtkWidget* virt_viewer_display_vnc_new(void);
 
 G_END_DECLS