[Xfce4-commits] [apps/xfburn] 03/06: moving type declaration to GTK+3 macros (60%)
noreply at xfce.org
noreply at xfce.org
Thu Oct 17 02:56:52 CEST 2019
This is an automated email from the git hooks/post-receive script.
k a t a n a s t e e l p u s h e d a c o m m i t t o b r a n c h m a s t e r
in repository apps/xfburn.
commit 1146523269e86e2c50685ca8cca8485c262b84d4
Author: Rene Kjellerup <rk.katana.steel at gmail.com>
Date: Wed Oct 16 15:42:12 2019 -0700
moving type declaration to GTK+3 macros (60%)
fixing deprecation of call to g_type_class_add_private
---
xfburn/xfburn-burn-data-composition-base-dialog.c | 47 +++------------------
xfburn/xfburn-burn-data-dvd-composition-dialog.c | 38 ++---------------
xfburn/xfburn-burn-image-dialog.c | 35 ++--------------
xfburn/xfburn-compositions-notebook.c | 35 ++--------------
xfburn/xfburn-copy-cd-dialog.c | 33 ++-------------
xfburn/xfburn-copy-dvd-dialog.c | 38 +++--------------
xfburn/xfburn-data-composition.c | 48 +++++----------------
xfburn/xfburn-device-box.c | 51 ++++-------------------
8 files changed, 44 insertions(+), 281 deletions(-)
diff --git a/xfburn/xfburn-burn-data-composition-base-dialog.c b/xfburn/xfburn-burn-data-composition-base-dialog.c
index de6aa98..efadcf1 100644
--- a/xfburn/xfburn-burn-data-composition-base-dialog.c
+++ b/xfburn/xfburn-burn-data-composition-base-dialog.c
@@ -40,7 +40,7 @@
#include "xfburn-progress-dialog.h"
#include "xfburn-perform-burn.h"
-#define XFBURN_BURN_DATA_COMPOSITION_BASE_DIALOG_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), XFBURN_TYPE_BURN_DATA_COMPOSITION_BASE_DIALOG, XfburnBurnDataCompositionBaseDialogPrivate))
+#define XFBURN_BURN_DATA_COMPOSITION_BASE_DIALOG_GET_PRIVATE(obj) (xfburn_burn_data_composition_base_dialog_get_instance_private (XFBURN_BURN_DATA_COMPOSITION_BASE_DIALOG(obj)))
typedef struct
{
@@ -90,8 +90,6 @@ char *proceed_image[] = {
*/
/* prototypes */
-static void xfburn_burn_data_composition_base_dialog_class_init (XfburnBurnDataCompositionBaseDialogClass * klass, gpointer data);
-static GObject * xfburn_burn_data_composition_base_dialog_constructor (GType type, guint n_construct_properties, GObjectConstructParam *construct_properties);
static void xfburn_burn_data_composition_base_dialog_finalize (GObject * object);
static void xfburn_burn_data_composition_base_dialog_get_property (GObject * object, guint prop_id, GValue * value, GParamSpec * pspec);
@@ -112,40 +110,15 @@ static void cb_dialog_response (XfburnBurnDataCompositionBaseDialog * dialog, gi
/* globals */
static XfceTitledDialogClass *parent_class = NULL;
-GType
-xfburn_burn_data_composition_base_dialog_get_type (void)
-{
- static GType type = 0;
-
- if (type == 0) {
- static const GTypeInfo our_info = {
- sizeof (XfburnBurnDataCompositionBaseDialogClass),
- NULL,
- NULL,
- (GClassInitFunc) xfburn_burn_data_composition_base_dialog_class_init,
- NULL,
- NULL,
- sizeof (XfburnBurnDataCompositionBaseDialog),
- 0,
- NULL,
- NULL
- };
-
- type = g_type_register_static (XFCE_TYPE_TITLED_DIALOG, "XfburnBurnDataCompositionBaseDialog", &our_info, 0);
- }
-
- return type;
-}
+G_DEFINE_TYPE_WITH_PRIVATE (XfburnBurnDataCompositionBaseDialog, xfburn_burn_data_composition_base_dialog, XFCE_TYPE_TITLED_DIALOG)
static void
-xfburn_burn_data_composition_base_dialog_class_init (XfburnBurnDataCompositionBaseDialogClass * klass, gpointer data)
+xfburn_burn_data_composition_base_dialog_class_init (XfburnBurnDataCompositionBaseDialogClass * klass)
{
GObjectClass *object_class = G_OBJECT_CLASS (klass);
parent_class = g_type_class_peek_parent (klass);
- g_type_class_add_private (klass, sizeof (XfburnBurnDataCompositionBaseDialogPrivate));
- object_class->constructor = xfburn_burn_data_composition_base_dialog_constructor;
object_class->finalize = xfburn_burn_data_composition_base_dialog_finalize;
object_class->get_property = xfburn_burn_data_composition_base_dialog_get_property;
object_class->set_property = xfburn_burn_data_composition_base_dialog_set_property;
@@ -157,13 +130,10 @@ xfburn_burn_data_composition_base_dialog_class_init (XfburnBurnDataCompositionBa
g_param_spec_boolean ("show-volume-name", _("Show volume name"), _("Show a text entry for the name of the volume"), FALSE, G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE));
}
-static GObject *
-xfburn_burn_data_composition_base_dialog_constructor (GType type, guint n_construct_properties, GObjectConstructParam *construct_properties)
+static void
+xfburn_burn_data_composition_base_dialog_init(XfburnBurnDataCompositionBaseDialog *obj)
{
- GObject *gobj;
- XfburnBurnDataCompositionBaseDialog *obj;
- XfburnBurnDataCompositionBaseDialogPrivate *priv;
-
+ XfburnBurnDataCompositionBaseDialogPrivate *priv = xfburn_burn_data_composition_base_dialog_get_instance_private(obj);
GdkPixbuf *icon = NULL;
GtkBox *box;
GtkWidget *img;
@@ -176,9 +146,6 @@ xfburn_burn_data_composition_base_dialog_constructor (GType type, guint n_constr
const char *comp_name;
gint x,y;
- gobj = G_OBJECT_CLASS (parent_class)->constructor (type, n_construct_properties, construct_properties);
- obj = XFBURN_BURN_DATA_COMPOSITION_BASE_DIALOG (gobj);
- priv = XFBURN_BURN_DATA_COMPOSITION_BASE_DIALOG_GET_PRIVATE (obj);
box = GTK_BOX (gtk_dialog_get_content_area((GTK_DIALOG (obj))));
gtk_window_set_title (GTK_WINDOW (obj), _("Burn Composition"));
@@ -304,8 +271,6 @@ xfburn_burn_data_composition_base_dialog_constructor (GType type, guint n_constr
cb_volume_changed (XFBURN_DEVICE_BOX (priv->device_box), TRUE, xfburn_device_box_get_selected_device (XFBURN_DEVICE_BOX (priv->device_box)), obj);
g_signal_connect (G_OBJECT (obj), "response", G_CALLBACK (cb_dialog_response), priv);
-
- return gobj;
}
static void
diff --git a/xfburn/xfburn-burn-data-dvd-composition-dialog.c b/xfburn/xfburn-burn-data-dvd-composition-dialog.c
index 0df14a1..69f7398 100644
--- a/xfburn/xfburn-burn-data-dvd-composition-dialog.c
+++ b/xfburn/xfburn-burn-data-dvd-composition-dialog.c
@@ -39,69 +39,37 @@
#include "xfburn-progress-dialog.h"
#include "xfburn-burn-data-composition-base-dialog.h"
-#define XFBURN_BURN_DATA_DVD_COMPOSITION_DIALOG_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), XFBURN_TYPE_BURN_DATA_DVD_COMPOSITION_DIALOG, XfburnBurnDataDvdCompositionDialogPrivate))
-
typedef struct
{
gboolean dummy;
} XfburnBurnDataDvdCompositionDialogPrivate;
/* prototypes */
-static void xfburn_burn_data_dvd_composition_dialog_class_init (XfburnBurnDataDvdCompositionDialogClass * klass, gpointer data);
-static void xfburn_burn_data_dvd_composition_dialog_init (XfburnBurnDataDvdCompositionDialog * obj, gpointer data);
static void xfburn_burn_data_dvd_composition_dialog_finalize (GObject * object);
/* globals */
static XfceTitledDialogClass *parent_class = NULL;
-GType
-xfburn_burn_data_dvd_composition_dialog_get_type (void)
-{
- static GType type = 0;
-
- if (type == 0) {
- static const GTypeInfo our_info = {
- sizeof (XfburnBurnDataDvdCompositionDialogClass),
- NULL,
- NULL,
- (GClassInitFunc) xfburn_burn_data_dvd_composition_dialog_class_init,
- NULL,
- NULL,
- sizeof (XfburnBurnDataDvdCompositionDialog),
- 0,
- (GInstanceInitFunc) xfburn_burn_data_dvd_composition_dialog_init,
- NULL
- };
-
- type = g_type_register_static (XFBURN_TYPE_BURN_DATA_COMPOSITION_BASE_DIALOG, "XfburnBurnDataDvdCompositionDialog", &our_info, 0);
- }
-
- return type;
-}
+G_DEFINE_TYPE_WITH_PRIVATE(XfburnBurnDataDvdCompositionDialog, xfburn_burn_data_dvd_composition_dialog, XFBURN_TYPE_BURN_DATA_COMPOSITION_BASE_DIALOG);
static void
-xfburn_burn_data_dvd_composition_dialog_class_init (XfburnBurnDataDvdCompositionDialogClass * klass, gpointer data)
+xfburn_burn_data_dvd_composition_dialog_class_init (XfburnBurnDataDvdCompositionDialogClass * klass)
{
GObjectClass *object_class = G_OBJECT_CLASS (klass);
parent_class = g_type_class_peek_parent (klass);
- g_type_class_add_private (klass, sizeof (XfburnBurnDataDvdCompositionDialogPrivate));
object_class->finalize = xfburn_burn_data_dvd_composition_dialog_finalize;
}
static void
-xfburn_burn_data_dvd_composition_dialog_init (XfburnBurnDataDvdCompositionDialog * obj, gpointer data)
+xfburn_burn_data_dvd_composition_dialog_init (XfburnBurnDataDvdCompositionDialog * obj)
{
- //XfburnBurnDataDvdCompositionDialogPrivate *priv = XFBURN_BURN_DATA_DVD_COMPOSITION_DIALOG_GET_PRIVATE (obj);
-
}
static void
xfburn_burn_data_dvd_composition_dialog_finalize (GObject * object)
{
- //XfburnBurnDataDvdCompositionDialogPrivate *priv = XFBURN_BURN_DATA_DVD_COMPOSITION_DIALOG_GET_PRIVATE (object);
-
G_OBJECT_CLASS (parent_class)->finalize (object);
}
diff --git a/xfburn/xfburn-burn-image-dialog.c b/xfburn/xfburn-burn-image-dialog.c
index 349c165..b525cf6 100644
--- a/xfburn/xfburn-burn-image-dialog.c
+++ b/xfburn/xfburn-burn-image-dialog.c
@@ -39,7 +39,7 @@
#include "xfburn-burn-image-dialog.h"
#include "xfburn-perform-burn.h"
-#define XFBURN_BURN_IMAGE_DIALOG_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), XFBURN_TYPE_BURN_IMAGE_DIALOG, XfburnBurnImageDialogPrivate))
+#define XFBURN_BURN_IMAGE_DIALOG_GET_PRIVATE(obj) (xfburn_burn_image_dialog_get_instance_private (XFBURN_BURN_IMAGE_DIALOG (obj)))
typedef struct {
GtkWidget *dialog_progress;
@@ -86,8 +86,6 @@ typedef struct
static gchar * last_file = NULL;
/* prototypes */
-static void xfburn_burn_image_dialog_class_init (XfburnBurnImageDialogClass * klass, gpointer data);
-static void xfburn_burn_image_dialog_init (XfburnBurnImageDialog * sp, gpointer data);
static void xfburn_burn_image_dialog_finalize (GObject *object);
/* internal prototypes */
@@ -110,45 +108,20 @@ static void* thread_burn_iso (ThreadBurnIsoParams * params);
/*********************/
static XfceTitledDialogClass *parent_class = NULL;
-GType
-xfburn_burn_image_dialog_get_type (void)
-{
- static GType type = 0;
-
- if (type == 0) {
- static const GTypeInfo our_info = {
- sizeof (XfburnBurnImageDialogClass),
- NULL,
- NULL,
- (GClassInitFunc) xfburn_burn_image_dialog_class_init,
- NULL,
- NULL,
- sizeof (XfburnBurnImageDialog),
- 0,
- (GInstanceInitFunc) xfburn_burn_image_dialog_init,
- NULL
- };
-
- type = g_type_register_static (XFCE_TYPE_TITLED_DIALOG, "XfburnBurnImageDialog", &our_info, 0);
- }
-
- return type;
-}
+G_DEFINE_TYPE_WITH_PRIVATE(XfburnBurnImageDialog,xfburn_burn_image_dialog, XFCE_TYPE_TITLED_DIALOG);
static void
-xfburn_burn_image_dialog_class_init (XfburnBurnImageDialogClass * klass, gpointer data)
+xfburn_burn_image_dialog_class_init (XfburnBurnImageDialogClass * klass)
{
GObjectClass *object_class = G_OBJECT_CLASS (klass);
- g_type_class_add_private (klass, sizeof (XfburnBurnImageDialogPrivate));
-
parent_class = g_type_class_peek_parent (klass);
object_class->finalize = xfburn_burn_image_dialog_finalize;
}
static void
-xfburn_burn_image_dialog_init (XfburnBurnImageDialog * obj, gpointer data)
+xfburn_burn_image_dialog_init (XfburnBurnImageDialog * obj)
{
GtkBox *box = GTK_BOX (gtk_dialog_get_content_area(GTK_DIALOG (obj)));
XfburnBurnImageDialogPrivate *priv = XFBURN_BURN_IMAGE_DIALOG_GET_PRIVATE (obj);
diff --git a/xfburn/xfburn-compositions-notebook.c b/xfburn/xfburn-compositions-notebook.c
index 857141a..cc23c07 100644
--- a/xfburn/xfburn-compositions-notebook.c
+++ b/xfburn/xfburn-compositions-notebook.c
@@ -32,7 +32,7 @@
#include "xfburn-data-composition.h"
#include "xfburn-audio-composition.h"
-#define XFBURN_COMPOSITIONS_NOTEBOOK_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), XFBURN_TYPE_COMPOSITIONS_NOTEBOOK, XfburnCompositionsNotebookPrivate))
+#define XFBURN_COMPOSITIONS_NOTEBOOK_GET_PRIVATE(obj) (xfburn_compositions_notebook_get_instance_private (obj))
/* private members */
typedef struct
@@ -42,8 +42,6 @@ typedef struct
/* prototypes */
-static void xfburn_compositions_notebook_class_init (XfburnCompositionsNotebookClass * klass, gpointer data);
-static void xfburn_compositions_notebook_init (XfburnCompositionsNotebook * notebook, gpointer data);
static void xfburn_compositions_notebook_finalize (GObject * object);
@@ -58,38 +56,13 @@ static XfburnComposition * add_composition_with_data (XfburnCompositionsNotebook
/* static member */
static GtkNotebookClass *parent_class = NULL;
-GType
-xfburn_compositions_notebook_get_type (void)
-{
- static GType type = 0;
-
- if (type == 0) {
- static const GTypeInfo our_info = {
- sizeof (XfburnCompositionsNotebookClass),
- NULL,
- NULL,
- (GClassInitFunc) xfburn_compositions_notebook_class_init,
- NULL,
- NULL,
- sizeof (XfburnCompositionsNotebook),
- 0,
- (GInstanceInitFunc) xfburn_compositions_notebook_init,
- NULL
- };
-
- type = g_type_register_static (GTK_TYPE_NOTEBOOK, "XfburnCompositionsNotebook", &our_info, 0);
- }
-
- return type;
-}
+G_DEFINE_TYPE_WITH_PRIVATE(XfburnCompositionsNotebook, xfburn_compositions_notebook, GTK_TYPE_NOTEBOOK);
static void
-xfburn_compositions_notebook_class_init (XfburnCompositionsNotebookClass * klass, gpointer data)
+xfburn_compositions_notebook_class_init (XfburnCompositionsNotebookClass * klass)
{
GObjectClass *object_class = G_OBJECT_CLASS (klass);
- g_type_class_add_private (klass, sizeof (XfburnCompositionsNotebookPrivate));
-
parent_class = g_type_class_peek_parent (klass);
object_class->finalize = xfburn_compositions_notebook_finalize;
}
@@ -109,7 +82,7 @@ cb_move_focus_out (GtkNotebook *notebook, GtkDirectionType *arg1, XfburnComposit
}
static void
-xfburn_compositions_notebook_init (XfburnCompositionsNotebook * notebook, gpointer data)
+xfburn_compositions_notebook_init (XfburnCompositionsNotebook * notebook)
{
XfburnCompositionsNotebookPrivate *priv = XFBURN_COMPOSITIONS_NOTEBOOK_GET_PRIVATE (notebook);
diff --git a/xfburn/xfburn-copy-cd-dialog.c b/xfburn/xfburn-copy-cd-dialog.c
index 4a5fdbc..1cafeb5 100644
--- a/xfburn/xfburn-copy-cd-dialog.c
+++ b/xfburn/xfburn-copy-cd-dialog.c
@@ -33,7 +33,7 @@
#include "xfburn-copy-cd-dialog.h"
-#define XFBURN_COPY_CD_DIALOG_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), XFBURN_TYPE_COPY_CD_DIALOG, XfburnCopyCdDialogPrivate))
+#define XFBURN_COPY_CD_DIALOG_GET_PRIVATE(obj) (xfburn_copy_cd_dialog_get_instance_private (XFBURN_COPY_CD_DIALOG (obj)))
typedef struct
{
@@ -63,36 +63,11 @@ static void cb_dialog_response (XfburnCopyCdDialog * dialog, gint response_id, X
/*********************/
static XfceTitledDialogClass *parent_class = NULL;
-GType
-xfburn_copy_cd_dialog_get_type (void)
-{
- static GType type = 0;
-
- if (type == 0) {
- static const GTypeInfo our_info = {
- sizeof (XfburnCopyCdDialogClass),
- NULL,
- NULL,
- (GClassInitFunc) xfburn_copy_cd_dialog_class_init,
- NULL,
- NULL,
- sizeof (XfburnCopyCdDialog),
- 0,
- (GInstanceInitFunc) xfburn_copy_cd_dialog_init,
- NULL
- };
-
- type = g_type_register_static (XFCE_TYPE_TITLED_DIALOG, "XfburnCopyCdDialog", &our_info, 0);
- }
-
- return type;
-}
+G_DEFINE_TYPE_WITH_PRIVATE(XfburnCopyCdDialog, xfburn_copy_cd_dialog, XFCE_TYPE_TITLED_DIALOG);
static void
xfburn_copy_cd_dialog_class_init (XfburnCopyCdDialogClass * klass)
-{
- g_type_class_add_private (klass, sizeof (XfburnCopyCdDialogPrivate));
-
+{
parent_class = g_type_class_peek_parent (klass);
}
@@ -100,7 +75,7 @@ static void
xfburn_copy_cd_dialog_init (XfburnCopyCdDialog * obj)
{
XfburnCopyCdDialogPrivate *priv = XFBURN_COPY_CD_DIALOG_GET_PRIVATE (obj);
- GtkBox *box = GTK_BOX (GTK_DIALOG (obj)->vbox);
+ GtkBox *box = GTK_BOX (gtk_dialog_get_content_area(GTK_DIALOG (obj)));
GtkWidget *img;
GdkPixbuf *icon = NULL;
GtkWidget *frame;
diff --git a/xfburn/xfburn-copy-dvd-dialog.c b/xfburn/xfburn-copy-dvd-dialog.c
index f05bfca..88df090 100644
--- a/xfburn/xfburn-copy-dvd-dialog.c
+++ b/xfburn/xfburn-copy-dvd-dialog.c
@@ -33,7 +33,7 @@
#include "xfburn-copy-dvd-dialog.h"
-#define XFBURN_COPY_DVD_DIALOG_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), XFBURN_TYPE_COPY_DVD_DIALOG, XfburnCopyDvdDialogPrivate))
+#define XFBURN_COPY_DVD_DIALOG_GET_PRIVATE(obj) (xfburn_copy_dvd_dialog_get_instance_private (XFBURN_COPY_DVD_DIALOG (obj)))
typedef struct
{
@@ -49,10 +49,6 @@ typedef struct
GtkWidget *check_dummy;
} XfburnCopyDvdDialogPrivate;
-/* prototypes */
-static void xfburn_copy_dvd_dialog_class_init (XfburnCopyDvdDialogClass * klass);
-static void xfburn_copy_dvd_dialog_init (XfburnCopyDvdDialog * sp);
-
static void cb_device_changed (XfburnDeviceBox *box, const gchar *device_name, XfburnCopyDvdDialogPrivate *priv);
static void cb_check_only_iso_toggled (GtkToggleButton * button, XfburnCopyDvdDialog * dialog);
static void cb_browse_iso (GtkButton * button, XfburnCopyDvdDialog * dialog);
@@ -63,36 +59,12 @@ static void cb_dialog_response (XfburnCopyDvdDialog * dialog, gint response_id,
/*********************/
static XfceTitledDialogClass *parent_class = NULL;
-GType
-xfburn_copy_dvd_dialog_get_type (void)
-{
- static GType type = 0;
-
- if (type == 0) {
- static const GTypeInfo our_info = {
- sizeof (XfburnCopyDvdDialogClass),
- NULL,
- NULL,
- (GClassInitFunc) xfburn_copy_dvd_dialog_class_init,
- NULL,
- NULL,
- sizeof (XfburnCopyDvdDialog),
- 0,
- (GInstanceInitFunc) xfburn_copy_dvd_dialog_init,
- NULL
- };
-
- type = g_type_register_static (XFCE_TYPE_TITLED_DIALOG, "XfburnCopyDvdDialog", &our_info, 0);
- }
-
- return type;
-}
+/* prototypes */
+G_DEFINE_TYPE_WITH_PRIVATE(XfburnCopyDvdDialog, xfburn_copy_dvd_dialog, XFCE_TYPE_TITLED_DIALOG);
static void
xfburn_copy_dvd_dialog_class_init (XfburnCopyDvdDialogClass * klass)
-{
- g_type_class_add_private (klass, sizeof (XfburnCopyDvdDialogPrivate));
-
+{
parent_class = g_type_class_peek_parent (klass);
}
@@ -100,7 +72,7 @@ static void
xfburn_copy_dvd_dialog_init (XfburnCopyDvdDialog * obj)
{
XfburnCopyDvdDialogPrivate *priv = XFBURN_COPY_DVD_DIALOG_GET_PRIVATE (obj);
- GtkBox *box = GTK_BOX (GTK_DIALOG (obj)->vbox);
+ GtkBox *box = GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (obj)));
GtkWidget *img;
GdkPixbuf *icon = NULL;
GtkWidget *frame;
diff --git a/xfburn/xfburn-data-composition.c b/xfburn/xfburn-data-composition.c
index 34456f3..454ceaf 100644
--- a/xfburn/xfburn-data-composition.c
+++ b/xfburn/xfburn-data-composition.c
@@ -57,7 +57,7 @@
#include "xfburn-settings.h"
#include "xfburn-main.h"
-#define XFBURN_DATA_COMPOSITION_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), XFBURN_TYPE_DATA_COMPOSITION, XfburnDataCompositionPrivate))
+#define XFBURN_DATA_COMPOSITION_GET_PRIVATE(obj) (xfburn_data_composition_get_instance_private (XFBURN_DATA_COMPOSITION (obj)))
enum
{
@@ -99,9 +99,7 @@ typedef struct {
} ThreadAddFilesDragParams;
/* prototypes */
-static void xfburn_data_composition_class_init (XfburnDataCompositionClass *, gpointer);
static void composition_interface_init (XfburnCompositionInterface *composition, gpointer iface_data);
-static void xfburn_data_composition_init (XfburnDataComposition *dc, gpointer);
static void xfburn_data_composition_finalize (GObject * object);
static void show_custom_controls (XfburnComposition *composition);
@@ -225,44 +223,20 @@ static GdkPixbuf *icon_directory = NULL, *icon_file = NULL;
/***************************/
/* XfburnDataComposition class */
/***************************/
-GType
-xfburn_data_composition_get_type (void)
-{
- static GType data_composition_type = 0;
-
- if (!data_composition_type) {
- static const GTypeInfo data_composition_info = {
- sizeof (XfburnDataCompositionClass),
- NULL,
- NULL,
- (GClassInitFunc) xfburn_data_composition_class_init,
- NULL,
- NULL,
- sizeof (XfburnDataComposition),
- 0,
- (GInstanceInitFunc) xfburn_data_composition_init,
- NULL
- };
-
- static const GInterfaceInfo composition_info = {
- (GInterfaceInitFunc) composition_interface_init, /* interface_init */
- NULL, /* interface_finalize */
- NULL /* interface_data */
- };
-
- data_composition_type = g_type_register_static (GTK_TYPE_BOX, "XfburnDataComposition", &data_composition_info, 0);
-
- g_type_add_interface_static (data_composition_type, XFBURN_TYPE_COMPOSITION, &composition_info);
- }
+G_DEFINE_TYPE_EXTENDED(
+ XfburnDataComposition,
+ xfburn_data_composition,
+ GTK_TYPE_BOX,
+ 0,
+ G_ADD_PRIVATE (XfburnDataComposition)
+ G_IMPLEMENT_INTERFACE (XFBURN_TYPE_COMPOSITION, composition_interface_init)
+);
- return data_composition_type;
-}
static void
-xfburn_data_composition_class_init (XfburnDataCompositionClass * klass, gpointer data)
+xfburn_data_composition_class_init (XfburnDataCompositionClass * klass)
{
GObjectClass *object_class = G_OBJECT_CLASS (klass);
- g_type_class_add_private (klass, sizeof (XfburnDataCompositionPrivate));
parent_class = g_type_class_peek_parent (klass);
@@ -279,7 +253,7 @@ composition_interface_init (XfburnCompositionInterface *composition, gpointer if
}
static void
-xfburn_data_composition_init (XfburnDataComposition * composition, gpointer data)
+xfburn_data_composition_init (XfburnDataComposition * composition)
{
XfburnDataCompositionPrivate *priv = XFBURN_DATA_COMPOSITION_GET_PRIVATE (composition);
diff --git a/xfburn/xfburn-device-box.c b/xfburn/xfburn-device-box.c
index 00eb940..f1c0a2d 100644
--- a/xfburn/xfburn-device-box.c
+++ b/xfburn/xfburn-device-box.c
@@ -31,7 +31,7 @@
#include "xfburn-blank-dialog.h"
#include "xfburn-cclosure-marshal.h"
-#define XFBURN_DEVICE_BOX_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), XFBURN_TYPE_DEVICE_BOX, XfburnDeviceBoxPrivate))
+#define XFBURN_DEVICE_BOX_GET_PRIVATE(obj) (xfburn_device_box_get_instance_private (XFBURN_DEVICE_BOX (obj)))
enum {
PROP_0,
@@ -91,8 +91,6 @@ typedef struct
} XfburnDeviceBoxPrivate;
/* prototypes */
-static void xfburn_device_box_class_init (XfburnDeviceBoxClass *, gpointer data);
-static GObject * xfburn_device_box_constructor (GType type, guint n_construct_properties, GObjectConstructParam *construct_properties);
static void xfburn_device_box_finalize (GObject * object);
static void xfburn_device_box_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec);
static void xfburn_device_box_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec);
@@ -112,7 +110,7 @@ static void empty_speed_list_dialog (void);
#endif
/* globals */
-static GtkVBoxClass *parent_class = NULL;
+static GtkBoxClass *parent_class = NULL;
/*************************/
/* XfburnDeviceBox class */
@@ -120,42 +118,15 @@ static GtkVBoxClass *parent_class = NULL;
static guint signals[LAST_SIGNAL];
-GType
-xfburn_device_box_get_type (void)
-{
- static GType device_box_type = 0;
-
- if (!device_box_type)
- {
- static const GTypeInfo device_box_info = {
- sizeof (XfburnDeviceBoxClass),
- NULL,
- NULL,
- (GClassInitFunc) xfburn_device_box_class_init,
- NULL,
- NULL,
- sizeof (XfburnDeviceBox),
- 0,
- NULL,
- NULL
- };
-
- device_box_type = g_type_register_static (GTK_TYPE_BOX, "XfburnDeviceBox", &device_box_info, 0);
- }
-
- return device_box_type;
-}
+G_DEFINE_TYPE_WITH_PRIVATE(XfburnDeviceBox, xfburn_device_box, GTK_TYPE_BOX);
static void
-xfburn_device_box_class_init (XfburnDeviceBoxClass * klass, gpointer data)
+xfburn_device_box_class_init (XfburnDeviceBoxClass * klass)
{
GObjectClass *object_class = G_OBJECT_CLASS (klass);
- g_type_class_add_private (klass, sizeof (XfburnDeviceBoxPrivate));
-
parent_class = g_type_class_peek_parent (klass);
- object_class->constructor = xfburn_device_box_constructor;
object_class->finalize = xfburn_device_box_finalize;
object_class->set_property = xfburn_device_box_set_property;
object_class->get_property = xfburn_device_box_get_property;
@@ -187,12 +158,10 @@ xfburn_device_box_class_init (XfburnDeviceBoxClass * klass, gpointer data)
FALSE, G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
}
-static GObject *
-xfburn_device_box_constructor (GType type, guint n_construct_properties, GObjectConstructParam *construct_properties)
+static void
+xfburn_device_box_init (XfburnDeviceBox *box)
{
- GObject *gobj;
- XfburnDeviceBox *box;
- XfburnDeviceBoxPrivate *priv;
+ XfburnDeviceBoxPrivate *priv = xfburn_device_box_get_instance_private(box);
GtkWidget *label;
//GtkWidget *hbox;
@@ -201,10 +170,6 @@ xfburn_device_box_constructor (GType type, guint n_construct_properties, GObject
XfburnDeviceList *devlist;
gint n_burners;
- gobj = G_OBJECT_CLASS (parent_class)->constructor (type, n_construct_properties, construct_properties);
- box = XFBURN_DEVICE_BOX (gobj);
- priv = XFBURN_DEVICE_BOX_GET_PRIVATE (box);
-
gtk_orientable_set_orientation (GTK_ORIENTABLE (box), GTK_ORIENTATION_VERTICAL);
priv->devlist = devlist = xfburn_device_list_new ();
@@ -291,8 +256,6 @@ xfburn_device_box_constructor (GType type, guint n_construct_properties, GObject
priv->have_asked_for_blanking = FALSE;
refresh_drive_info (box, xfburn_device_list_get_current_device (priv->devlist));
-
- return gobj;
}
static void
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the Xfce4-commits
mailing list