shaba/virt-viewer
1
0
Fork 0
mirror of https://gitlab.com/virt-viewer/virt-viewer.git synced 2025-01-07 17:17:45 +03:00
Code Issues Projects Releases Wiki Activity

src: convert VirtViewerNotebook to G_DECLARE_FINAL_TYPE

Browse Source 
This removes the use of a private data struct.

Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
This commit is contained in:
Daniel P. Berrangé 2021-02-10 12:28:55 +00:00
parent 4973411ed8
commit 18322a9551
2 changed files with 12 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/virt-viewer-notebook.c
View File

@ -27,11 +27,12 @@
#include "virt-viewer-notebook.h"
#include "virt-viewer-util.h"
struct _VirtViewerNotebookPrivate {
struct _VirtViewerNotebook {
GtkNotebook parent;
GtkWidget *status;
};
G_DEFINE_TYPE_WITH_PRIVATE (VirtViewerNotebook, virt_viewer_notebook, GTK_TYPE_NOTEBOOK)
G_DEFINE_TYPE(VirtViewerNotebook, virt_viewer_notebook, GTK_TYPE_NOTEBOOK)
static void
virt_viewer_notebook_get_property (GObject *object, guint property_id,
@ -65,30 +66,23 @@ virt_viewer_notebook_class_init (VirtViewerNotebookClass *klass)
static void
virt_viewer_notebook_init (VirtViewerNotebook *self)
{
VirtViewerNotebookPrivate *priv;
self->priv = virt_viewer_notebook_get_instance_private(self);
priv = self->priv;
priv->status = gtk_label_new("");
self->status = gtk_label_new("");
gtk_notebook_set_show_tabs(GTK_NOTEBOOK(self), FALSE);
gtk_notebook_set_show_border(GTK_NOTEBOOK(self), FALSE);
gtk_widget_show_all(priv->status);
gtk_notebook_append_page(GTK_NOTEBOOK(self), priv->status, NULL);
gtk_widget_show_all(self->status);
gtk_notebook_append_page(GTK_NOTEBOOK(self), self->status, NULL);
}
void
virt_viewer_notebook_show_status_va(VirtViewerNotebook *self, const gchar *fmt, va_list args)
{
VirtViewerNotebookPrivate *priv;
gchar *text;
g_debug("notebook show status %p", self);
g_return_if_fail(VIRT_VIEWER_IS_NOTEBOOK(self));
text = g_strdup_vprintf(fmt, args);
priv = self->priv;
gtk_label_set_text(GTK_LABEL(priv->status), text);
gtk_label_set_text(GTK_LABEL(self->status), text);
gtk_notebook_set_current_page(GTK_NOTEBOOK(self), 0);
gtk_widget_show_all(GTK_WIDGET(self));
g_free(text);

31
src/virt-viewer-notebook.h
View File

@ -30,32 +30,11 @@
G_BEGIN_DECLS
#define VIRT_VIEWER_TYPE_NOTEBOOK virt_viewer_notebook_get_type()
#define VIRT_VIEWER_NOTEBOOK(obj) \
(G_TYPE_CHECK_INSTANCE_CAST ((obj), VIRT_VIEWER_TYPE_NOTEBOOK, VirtViewerNotebook))
#define VIRT_VIEWER_NOTEBOOK_CLASS(klass) \
(G_TYPE_CHECK_CLASS_CAST ((klass), VIRT_VIEWER_TYPE_NOTEBOOK, VirtViewerNotebookClass))
#define VIRT_VIEWER_IS_NOTEBOOK(obj) \
(G_TYPE_CHECK_INSTANCE_TYPE ((obj), VIRT_VIEWER_TYPE_NOTEBOOK))
#define VIRT_VIEWER_IS_NOTEBOOK_CLASS(klass) \
(G_TYPE_CHECK_CLASS_TYPE ((klass), VIRT_VIEWER_TYPE_NOTEBOOK))
#define VIRT_VIEWER_NOTEBOOK_GET_CLASS(obj) \
(G_TYPE_INSTANCE_GET_CLASS ((obj), VIRT_VIEWER_TYPE_NOTEBOOK, VirtViewerNotebookClass))
typedef struct _VirtViewerNotebookPrivate VirtViewerNotebookPrivate;
typedef struct {
GtkNotebook parent;
VirtViewerNotebookPrivate *priv;
} VirtViewerNotebook;
typedef struct {
GtkNotebookClass parent_class;
} VirtViewerNotebookClass;
G_DECLARE_FINAL_TYPE(VirtViewerNotebook,
virt_viewer_notebook,
VIRT_VIEWER,
NOTEBOOK,
GtkNotebook);
GType virt_viewer_notebook_get_type (void);