Commit 18322a95512d8682cf50715919b1dfc3dea96570 - virt-viewer

src: convert VirtViewerNotebook to G_DECLARE_FINAL_TYPE This removes the use of a private data struct. Signed-off-by: Daniel P. Berrangé <berrange@redhat.com> Daniel P. Berrangé 3 years ago

2 changed file(s) with 12 addition(s) and 39 deletion(s). Raw diff Collapse all Expand all

-13

src/virt-viewer-notebook.c less more

26	26	#include "virt-viewer-notebook.h"
27	27	#include "virt-viewer-util.h"
28	28
29		struct _VirtViewerNotebookPrivate {
	29	struct _VirtViewerNotebook {
	30	GtkNotebook parent;
30	31	GtkWidget *status;
31	32	};
32	33
33		G_DEFINE_TYPE_WITH_PRIVATE (VirtViewerNotebook, virt_viewer_notebook, GTK_TYPE_NOTEBOOK)
	34	G_DEFINE_TYPE(VirtViewerNotebook, virt_viewer_notebook, GTK_TYPE_NOTEBOOK)
34	35
35	36	static void
36	37	virt_viewer_notebook_get_property (GObject *object, guint property_id,

64	65	static void
65	66	virt_viewer_notebook_init (VirtViewerNotebook *self)
66	67	{
67		VirtViewerNotebookPrivate *priv;
68
69		self->priv = virt_viewer_notebook_get_instance_private(self);
70		priv = self->priv;
71
72		priv->status = gtk_label_new("");
	68	self->status = gtk_label_new("");
73	69	gtk_notebook_set_show_tabs(GTK_NOTEBOOK(self), FALSE);
74	70	gtk_notebook_set_show_border(GTK_NOTEBOOK(self), FALSE);
75		gtk_widget_show_all(priv->status);
76		gtk_notebook_append_page(GTK_NOTEBOOK(self), priv->status, NULL);
	71	gtk_widget_show_all(self->status);
	72	gtk_notebook_append_page(GTK_NOTEBOOK(self), self->status, NULL);
77	73	}
78	74
79	75	void
80	76	virt_viewer_notebook_show_status_va(VirtViewerNotebook self, const gchar fmt, va_list args)
81	77	{
82		VirtViewerNotebookPrivate *priv;
83	78	gchar *text;
84	79
85	80	g_debug("notebook show status %p", self);
86	81	g_return_if_fail(VIRT_VIEWER_IS_NOTEBOOK(self));
87	82
88	83	text = g_strdup_vprintf(fmt, args);
89		priv = self->priv;
90		gtk_label_set_text(GTK_LABEL(priv->status), text);
	84	gtk_label_set_text(GTK_LABEL(self->status), text);
91	85	gtk_notebook_set_current_page(GTK_NOTEBOOK(self), 0);
92	86	gtk_widget_show_all(GTK_WIDGET(self));
93	87	g_free(text);

-26

src/virt-viewer-notebook.h less more

29	29	G_BEGIN_DECLS
30	30
31	31	#define VIRT_VIEWER_TYPE_NOTEBOOK virt_viewer_notebook_get_type()
32
33		#define VIRT_VIEWER_NOTEBOOK(obj) \
34		(G_TYPE_CHECK_INSTANCE_CAST ((obj), VIRT_VIEWER_TYPE_NOTEBOOK, VirtViewerNotebook))
35
36		#define VIRT_VIEWER_NOTEBOOK_CLASS(klass) \
37		(G_TYPE_CHECK_CLASS_CAST ((klass), VIRT_VIEWER_TYPE_NOTEBOOK, VirtViewerNotebookClass))
38
39		#define VIRT_VIEWER_IS_NOTEBOOK(obj) \
40		(G_TYPE_CHECK_INSTANCE_TYPE ((obj), VIRT_VIEWER_TYPE_NOTEBOOK))
41
42		#define VIRT_VIEWER_IS_NOTEBOOK_CLASS(klass) \
43		(G_TYPE_CHECK_CLASS_TYPE ((klass), VIRT_VIEWER_TYPE_NOTEBOOK))
44
45		#define VIRT_VIEWER_NOTEBOOK_GET_CLASS(obj) \
46		(G_TYPE_INSTANCE_GET_CLASS ((obj), VIRT_VIEWER_TYPE_NOTEBOOK, VirtViewerNotebookClass))
47
48		typedef struct _VirtViewerNotebookPrivate VirtViewerNotebookPrivate;
49
50		typedef struct {
51		GtkNotebook parent;
52		VirtViewerNotebookPrivate *priv;
53		} VirtViewerNotebook;
54
55		typedef struct {
56		GtkNotebookClass parent_class;
57		} VirtViewerNotebookClass;
	32	G_DECLARE_FINAL_TYPE(VirtViewerNotebook,
	33	virt_viewer_notebook,
	34	VIRT_VIEWER,
	35	NOTEBOOK,
	36	GtkNotebook);
58	37
59	38	GType virt_viewer_notebook_get_type (void);
60	39