[Xfce4-commits] [apps/xfburn] 02/06: moving type declaration to GTK+3 macros (15%)
noreply at xfce.org
noreply at xfce.org
Thu Oct 17 02:56:51 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 79e4667752bef39d0ea13f488424caff626a0bee
Author: Rene Kjellerup <rk.katana.steel at gmail.com>
Date: Wed Oct 16 14:41:43 2019 -0700
moving type declaration to GTK+3 macros (15%)
fixing deprecation of call to g_type_class_add_private
---
xfburn/xfburn-blank-dialog.c | 47 ++++--------------------
xfburn/xfburn-burn-audio-cd-composition-dialog.c | 46 ++++-------------------
xfburn/xfburn-burn-data-cd-composition-dialog.c | 43 +++-------------------
3 files changed, 21 insertions(+), 115 deletions(-)
diff --git a/xfburn/xfburn-blank-dialog.c b/xfburn/xfburn-blank-dialog.c
index 604008a..ebdba60 100644
--- a/xfburn/xfburn-blank-dialog.c
+++ b/xfburn/xfburn-blank-dialog.c
@@ -34,7 +34,7 @@
#include "xfburn-blank-dialog.h"
-#define XFBURN_BLANK_DIALOG_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), XFBURN_TYPE_BLANK_DIALOG, XfburnBlankDialogPrivate))
+#define XFBURN_BLANK_DIALOG_GET_PRIVATE(obj) (xfburn_blank_dialog_get_instance_private (obj))
#define XFBURN_BLANK_DIALOG_EJECT_DEFAULT TRUE
@@ -90,8 +90,6 @@ typedef struct {
/* internal prototypes */
-static void xfburn_blank_dialog_class_init (XfburnBlankDialogClass * klass, gpointer data);
-static void xfburn_blank_dialog_init (XfburnBlankDialog * sp, gpointer data);
static void xfburn_blank_dialog_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec);
static void xfburn_blank_dialog_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec);
@@ -106,35 +104,10 @@ static void cb_volume_changed (GtkWidget *device_box, gboolean device_changed, X
static XfceTitledDialogClass *parent_class = NULL;
-
-
-GType
-xfburn_blank_dialog_get_type (void)
-{
- static GType type = 0;
-
- if (type == 0) {
- static const GTypeInfo our_info = {
- sizeof (XfburnBlankDialogClass),
- NULL,
- NULL,
- (GClassInitFunc) xfburn_blank_dialog_class_init,
- NULL,
- NULL,
- sizeof (XfburnBlankDialog),
- 0,
- (GInstanceInitFunc) xfburn_blank_dialog_init,
- NULL,
- };
-
- type = g_type_register_static (XFCE_TYPE_TITLED_DIALOG, "XfburnBlankDialog", &our_info, 0);
- }
-
- return type;
-}
+G_DEFINE_TYPE_WITH_PRIVATE(XfburnBlankDialog, xfburn_blank_dialog, XFCE_TYPE_TITLED_DIALOG);
static void
-xfburn_blank_dialog_class_init (XfburnBlankDialogClass * klass, gpointer data)
+xfburn_blank_dialog_class_init (XfburnBlankDialogClass * klass)
{
GObjectClass *object_class = G_OBJECT_CLASS (klass);
@@ -142,8 +115,6 @@ xfburn_blank_dialog_class_init (XfburnBlankDialogClass * klass, gpointer data)
object_class->set_property = xfburn_blank_dialog_set_property;
object_class->get_property = xfburn_blank_dialog_get_property;
- g_type_class_add_private (klass, sizeof (XfburnBlankDialogPrivate));
-
g_object_class_install_property (object_class, PROP_EJECT,
g_param_spec_boolean ("eject", _("Eject the disc"),
_("Default value for eject checkbox"), XFBURN_BLANK_DIALOG_EJECT_DEFAULT, G_PARAM_READWRITE));
@@ -152,7 +123,7 @@ xfburn_blank_dialog_class_init (XfburnBlankDialogClass * klass, gpointer data)
static void
xfburn_blank_dialog_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec)
{
- XfburnBlankDialogPrivate *priv = XFBURN_BLANK_DIALOG_GET_PRIVATE (object);
+ XfburnBlankDialogPrivate *priv = XFBURN_BLANK_DIALOG_GET_PRIVATE (XFBURN_BLANK_DIALOG (object));
switch (prop_id) {
case PROP_EJECT:
@@ -167,7 +138,7 @@ xfburn_blank_dialog_get_property (GObject *object, guint prop_id, GValue *value,
static void
xfburn_blank_dialog_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec)
{
- XfburnBlankDialogPrivate *priv = XFBURN_BLANK_DIALOG_GET_PRIVATE (object);
+ XfburnBlankDialogPrivate *priv = XFBURN_BLANK_DIALOG_GET_PRIVATE (XFBURN_BLANK_DIALOG (object));
switch (prop_id) {
case PROP_EJECT:
@@ -181,7 +152,7 @@ xfburn_blank_dialog_set_property (GObject *object, guint prop_id, const GValue *
}
static void
-xfburn_blank_dialog_init (XfburnBlankDialog * obj, gpointer data)
+xfburn_blank_dialog_init (XfburnBlankDialog * obj)
{
XfburnBlankDialogPrivate *priv = XFBURN_BLANK_DIALOG_GET_PRIVATE (obj);
GtkBox *box = GTK_BOX (gtk_dialog_get_content_area((GTK_DIALOG (obj))));
@@ -352,12 +323,12 @@ thread_blank_perform_blank (ThreadBlankParams * params, struct burn_drive_info *
usleep (1001);
switch (disc_state) {
- case BURN_DISC_BLANK:
+ case BURN_DISC_BLANK:
if (params->blank_mode == XFBURN_BLANK_FAST || params->blank_mode == XFBURN_BLANK_COMPLETE) {
/* blanking can only be performed on blank discs, format and deformat are allowed to be blank ones */
xfburn_progress_dialog_burning_failed (XFBURN_PROGRESS_DIALOG (dialog_progress), _("The inserted disc is already blank."));
return FALSE;
- }
+ } // fall through
case BURN_DISC_FULL:
case BURN_DISC_APPENDABLE:
/* these ones we can blank */
@@ -530,8 +501,6 @@ xfburn_blank_dialog_response_cb (XfburnBlankDialog * dialog, gint response_id, g
static void
cb_volume_changed (GtkWidget *device_box, gboolean device_changed, XfburnDevice *device, XfburnBlankDialog * dialog)
{
- //XfburnBlankDialogPrivate *priv = XFBURN_BLANK_DIALOG_GET_PRIVATE (dialog);
-
fill_combo_mode (dialog);
}
diff --git a/xfburn/xfburn-burn-audio-cd-composition-dialog.c b/xfburn/xfburn-burn-audio-cd-composition-dialog.c
index 5b3c9e2..737863a 100644
--- a/xfburn/xfburn-burn-audio-cd-composition-dialog.c
+++ b/xfburn/xfburn-burn-audio-cd-composition-dialog.c
@@ -42,7 +42,7 @@
#include "xfburn-audio-composition.h"
#include "xfburn-transcoder.h"
-#define XFBURN_BURN_AUDIO_CD_COMPOSITION_DIALOG_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), XFBURN_TYPE_BURN_AUDIO_CD_COMPOSITION_DIALOG, XfburnBurnAudioCdCompositionDialogPrivate))
+#define XFBURN_BURN_AUDIO_CD_COMPOSITION_DIALOG_GET_PRIVATE(obj) (xfburn_burn_audio_cd_composition_dialog_get_instance_private (XFBURN_BURN_AUDIO_CD_COMPOSITION_DIALOG (obj)))
typedef struct
{
@@ -67,7 +67,6 @@ enum {
};
/* prototypes */
-static void xfburn_burn_audio_cd_composition_dialog_class_init (XfburnBurnAudioCdCompositionDialogClass * klass, gpointer data);
static GObject * xfburn_burn_audio_cd_composition_dialog_constructor (GType type, guint n_construct_properties, GObjectConstructParam *construct_properties);
static void xfburn_burn_audio_cd_composition_dialog_finalize (GObject * object);
@@ -81,40 +80,16 @@ static void cb_dialog_response (XfburnBurnAudioCdCompositionDialog * dialog, gin
/* globals */
static XfceTitledDialogClass *parent_class = NULL;
-GType
-xfburn_burn_audio_cd_composition_dialog_get_type (void)
-{
- static GType type = 0;
-
- if (type == 0) {
- static const GTypeInfo our_info = {
- sizeof (XfburnBurnAudioCdCompositionDialogClass),
- NULL,
- NULL,
- (GClassInitFunc) xfburn_burn_audio_cd_composition_dialog_class_init,
- NULL,
- NULL,
- sizeof (XfburnBurnAudioCdCompositionDialog),
- 0,
- NULL,
- NULL
- };
-
- type = g_type_register_static (XFCE_TYPE_TITLED_DIALOG, "XfburnBurnAudioCdCompositionDialog", &our_info, 0);
- }
-
- return type;
-}
+G_DEFINE_TYPE_WITH_PRIVATE(XfburnBurnAudioCdCompositionDialog, xfburn_burn_audio_cd_composition_dialog, XFCE_TYPE_TITLED_DIALOG);
static void
-xfburn_burn_audio_cd_composition_dialog_class_init (XfburnBurnAudioCdCompositionDialogClass * klass, gpointer data)
+xfburn_burn_audio_cd_composition_dialog_class_init (XfburnBurnAudioCdCompositionDialogClass * klass)
{
GObjectClass *object_class = G_OBJECT_CLASS (klass);
parent_class = g_type_class_peek_parent (klass);
- g_type_class_add_private (klass, sizeof (XfburnBurnAudioCdCompositionDialogPrivate));
- object_class->constructor = xfburn_burn_audio_cd_composition_dialog_constructor;
+ // object_class->constructor = xfburn_burn_audio_cd_composition_dialog_constructor;
object_class->finalize = xfburn_burn_audio_cd_composition_dialog_finalize;
object_class->get_property = xfburn_burn_audio_cd_composition_dialog_get_property;
object_class->set_property = xfburn_burn_audio_cd_composition_dialog_set_property;
@@ -124,12 +99,10 @@ xfburn_burn_audio_cd_composition_dialog_class_init (XfburnBurnAudioCdComposition
g_param_spec_pointer ("track-list", "Track List", "Track List", G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE));
}
-static GObject *
-xfburn_burn_audio_cd_composition_dialog_constructor (GType type, guint n_construct_properties, GObjectConstructParam *construct_properties)
+static void
+xfburn_burn_audio_cd_composition_dialog_init(XfburnBurnAudioCdCompositionDialog *obj)
{
- GObject *gobj;
- XfburnBurnAudioCdCompositionDialog *obj;
- XfburnBurnAudioCdCompositionDialogPrivate *priv;
+ XfburnBurnAudioCdCompositionDialogPrivate *priv = XFBURN_BURN_AUDIO_CD_COMPOSITION_DIALOG_GET_PRIVATE(obj);
GdkPixbuf *icon = NULL;
GtkBox *box;
@@ -139,9 +112,6 @@ xfburn_burn_audio_cd_composition_dialog_constructor (GType type, guint n_constru
GtkWidget *button;
//const char *comp_name;
- gobj = G_OBJECT_CLASS (parent_class)->constructor (type, n_construct_properties, construct_properties);
- obj = XFBURN_BURN_AUDIO_CD_COMPOSITION_DIALOG (gobj);
- priv = XFBURN_BURN_AUDIO_CD_COMPOSITION_DIALOG_GET_PRIVATE (obj);
box = GTK_BOX (gtk_dialog_get_content_area((GTK_DIALOG (obj))));
gtk_window_set_title (GTK_WINDOW (obj), _("Burn Composition"));
@@ -230,8 +200,6 @@ xfburn_burn_audio_cd_composition_dialog_constructor (GType type, guint n_constru
cb_volume_changed (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-cd-composition-dialog.c b/xfburn/xfburn-burn-data-cd-composition-dialog.c
index 3b2655d..e856eac 100644
--- a/xfburn/xfburn-burn-data-cd-composition-dialog.c
+++ b/xfburn/xfburn-burn-data-cd-composition-dialog.c
@@ -38,69 +38,38 @@
#include "xfburn-burn-data-cd-composition-dialog.h"
#include "xfburn-progress-dialog.h"
-#define XFBURN_BURN_DATA_CD_COMPOSITION_DIALOG_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), XFBURN_TYPE_BURN_DATA_CD_COMPOSITION_DIALOG, XfburnBurnDataCdCompositionDialogPrivate))
-
typedef struct
{
gboolean dummy; /* An empty private struct is not allowed */
} XfburnBurnDataCdCompositionDialogPrivate;
/* prototypes */
-static void xfburn_burn_data_cd_composition_dialog_class_init (XfburnBurnDataCdCompositionDialogClass * klass, gpointer data);
-static void xfburn_burn_data_cd_composition_dialog_init (XfburnBurnDataCdCompositionDialog * obj, gpointer data);
+// static void xfburn_burn_data_cd_composition_dialog_class_init (XfburnBurnDataCdCompositionDialogClass * klass, gpointer data);
+// static void xfburn_burn_data_cd_composition_dialog_init (XfburnBurnDataCdCompositionDialog * obj, gpointer data);
static void xfburn_burn_data_cd_composition_dialog_finalize (GObject * object);
+G_DEFINE_TYPE_WITH_PRIVATE(XfburnBurnDataCdCompositionDialog, xfburn_burn_data_cd_composition_dialog, XFBURN_TYPE_BURN_DATA_COMPOSITION_BASE_DIALOG);
/* globals */
static XfceTitledDialogClass *parent_class = NULL;
-GType
-xfburn_burn_data_cd_composition_dialog_get_type (void)
-{
- static GType type = 0;
-
- if (type == 0) {
- static const GTypeInfo our_info = {
- sizeof (XfburnBurnDataCdCompositionDialogClass),
- NULL,
- NULL,
- (GClassInitFunc) xfburn_burn_data_cd_composition_dialog_class_init,
- NULL,
- NULL,
- sizeof (XfburnBurnDataCdCompositionDialog),
- 0,
- (GInstanceInitFunc) xfburn_burn_data_cd_composition_dialog_init,
- NULL
- };
-
- type = g_type_register_static (XFBURN_TYPE_BURN_DATA_COMPOSITION_BASE_DIALOG, "XfburnBurnDataCdCompositionDialog", &our_info, 0);
- }
-
- return type;
-}
-
static void
-xfburn_burn_data_cd_composition_dialog_class_init (XfburnBurnDataCdCompositionDialogClass * klass, gpointer data)
+xfburn_burn_data_cd_composition_dialog_class_init (XfburnBurnDataCdCompositionDialogClass * klass)
{
GObjectClass *object_class = G_OBJECT_CLASS (klass);
parent_class = g_type_class_peek_parent (klass);
- g_type_class_add_private (klass, sizeof (XfburnBurnDataCdCompositionDialogPrivate));
object_class->finalize = xfburn_burn_data_cd_composition_dialog_finalize;
}
static void
-xfburn_burn_data_cd_composition_dialog_init (XfburnBurnDataCdCompositionDialog * obj, gpointer data)
-{
- //XfburnBurnDataCdCompositionDialogPrivate *priv = XFBURN_BURN_DATA_CD_COMPOSITION_DIALOG_GET_PRIVATE (obj);
-
+xfburn_burn_data_cd_composition_dialog_init (XfburnBurnDataCdCompositionDialog * obj)
+{
}
static void
xfburn_burn_data_cd_composition_dialog_finalize (GObject * object)
{
- //XfburnBurnDataCdCompositionDialogPrivate *priv = XFBURN_BURN_DATA_CD_COMPOSITION_DIALOG_GET_PRIVATE (object);
-
G_OBJECT_CLASS (parent_class)->finalize (object);
}
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the Xfce4-commits
mailing list