[Xfce4-commits] [apps/xfburn] 01/06: moving type declaration to GTK+3 macros (10%)
noreply at xfce.org
noreply at xfce.org
Thu Oct 17 02:56:50 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 77a2f87f0c037b83acd3e891ae5380f61588afe2
Author: Rene Kjellerup <rk.katana.steel at gmail.com>
Date: Wed Oct 16 00:10:05 2019 -0700
moving type declaration to GTK+3 macros (10%)
fixing deprecation of call to g_type_class_add_private
---
xfburn/xfburn-adding-progress.c | 47 ++++++++-------------------------------
xfburn/xfburn-audio-composition.c | 27 +++++++++++-----------
xfburn/xfburn-main-window.c | 39 +++++---------------------------
xfburn/xfburn-welcome-tab.c | 40 +++++----------------------------
4 files changed, 34 insertions(+), 119 deletions(-)
diff --git a/xfburn/xfburn-adding-progress.c b/xfburn/xfburn-adding-progress.c
index a2d4141..7234c92 100644
--- a/xfburn/xfburn-adding-progress.c
+++ b/xfburn/xfburn-adding-progress.c
@@ -27,7 +27,7 @@
#include "xfburn-adding-progress.h"
#include "xfburn-utils.h"
-#define XFBURN_ADDING_PROGRESS_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), XFBURN_TYPE_ADDING_PROGRESS, XfburnAddingProgressPrivate))
+#define XFBURN_ADDING_PROGRESS_GET_PRIVATE(obj) (xfburn_adding_progress_get_instance_private (obj))
enum {
ADDING_DONE,
@@ -42,11 +42,10 @@ typedef struct
} XfburnAddingProgressPrivate;
/* prototypes */
-static void xfburn_adding_progress_class_init (XfburnAddingProgressClass *, gpointer);
-static void xfburn_adding_progress_init (XfburnAddingProgress *, gpointer);
+G_DEFINE_TYPE_WITH_PRIVATE(XfburnAddingProgress, xfburn_adding_progress, GTK_TYPE_WINDOW)
static void xfburn_adding_progress_finalize (GObject * object);
-static gboolean cb_delete (GtkWidget *widget, GdkEvent *event, gpointer data);
-static gboolean cb_cancel (GtkWidget *widget, GdkEvent *event, gpointer data);
+static gboolean cb_delete (XfburnAddingProgress *widget, GdkEvent *event, gpointer data);
+static gboolean cb_cancel (XfburnAddingProgress *widget, GdkEvent *event, gpointer data);
/* globals */
static GtkWindowClass *parent_class = NULL;
@@ -56,43 +55,15 @@ static guint signals[LAST_SIGNAL];
/* XfburnAddingProgress class */
/******************************/
-GType
-xfburn_adding_progress_get_type (void)
-{
- static GType adding_progress_type = 0;
-
- if (!adding_progress_type)
- {
- static const GTypeInfo adding_progress_info = {
- sizeof (XfburnAddingProgressClass),
- NULL,
- NULL,
- (GClassInitFunc) xfburn_adding_progress_class_init,
- NULL,
- NULL,
- sizeof (XfburnAddingProgress),
- 0,
- (GInstanceInitFunc) xfburn_adding_progress_init,
- NULL
- };
-
- adding_progress_type = g_type_register_static (GTK_TYPE_WINDOW, "XfburnAddingProgress", &adding_progress_info, 0);
- }
-
- return adding_progress_type;
-}
-
static void
-xfburn_adding_progress_class_init (XfburnAddingProgressClass * klass, gpointer data)
+xfburn_adding_progress_class_init (XfburnAddingProgressClass * klass)
{
GObjectClass *object_class = G_OBJECT_CLASS (klass);
- g_type_class_add_private (klass, sizeof (XfburnAddingProgressPrivate));
-
parent_class = g_type_class_peek_parent (klass);
object_class->finalize = xfburn_adding_progress_finalize;
-
+
signals[ADDING_DONE] = g_signal_new ("adding-done", XFBURN_TYPE_ADDING_PROGRESS, G_SIGNAL_ACTION,
G_STRUCT_OFFSET (XfburnAddingProgressClass, adding_done),
NULL, NULL, g_cclosure_marshal_VOID__VOID,
@@ -100,7 +71,7 @@ xfburn_adding_progress_class_init (XfburnAddingProgressClass * klass, gpointer d
}
static void
-xfburn_adding_progress_init (XfburnAddingProgress * win, gpointer data)
+xfburn_adding_progress_init (XfburnAddingProgress * win)
{
XfburnAddingProgressPrivate *priv = XFBURN_ADDING_PROGRESS_GET_PRIVATE (win);
GtkWidget *vbox, *cancel_btn;
@@ -142,7 +113,7 @@ xfburn_adding_progress_finalize (GObject * object)
/* internals */
static gboolean
-cb_delete (GtkWidget *widget, GdkEvent *event, gpointer data)
+cb_delete (XfburnAddingProgress *widget, GdkEvent *event, gpointer data)
{
XfburnAddingProgressPrivate *priv = XFBURN_ADDING_PROGRESS_GET_PRIVATE (widget);
priv->aborted = TRUE;
@@ -151,7 +122,7 @@ cb_delete (GtkWidget *widget, GdkEvent *event, gpointer data)
}
static gboolean
-cb_cancel (GtkWidget *widget, GdkEvent *event, gpointer data)
+cb_cancel (XfburnAddingProgress *widget, GdkEvent *event, gpointer data)
{
XfburnAddingProgressPrivate *priv = XFBURN_ADDING_PROGRESS_GET_PRIVATE (data);
priv->aborted = TRUE;
diff --git a/xfburn/xfburn-audio-composition.c b/xfburn/xfburn-audio-composition.c
index 184368a..906e8a8 100644
--- a/xfburn/xfburn-audio-composition.c
+++ b/xfburn/xfburn-audio-composition.c
@@ -55,7 +55,7 @@
#include "xfburn-settings.h"
#include "xfburn-main.h"
-#define XFBURN_AUDIO_COMPOSITION_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), XFBURN_TYPE_AUDIO_COMPOSITION, XfburnAudioCompositionPrivate))
+#define XFBURN_AUDIO_COMPOSITION_GET_PRIVATE(obj) (xfburn_audio_composition_get_instance_private (obj))
enum
{
@@ -113,9 +113,7 @@ typedef struct {
} ThreadAddFilesDragParams;
/* prototypes */
-static void xfburn_audio_composition_class_init (XfburnAudioCompositionClass *, gpointer);
static void composition_interface_init (XfburnCompositionInterface *composition, gpointer iface_data);
-static void xfburn_audio_composition_init (XfburnAudioComposition *dc, gpointer);
static void xfburn_audio_composition_finalize (GObject * object);
/* internals */
@@ -245,6 +243,13 @@ static GdkPixbuf *icon_directory = NULL, *icon_file = NULL;
/********************************/
/* XfburnAudioComposition class */
/********************************/
+G_DEFINE_TYPE_EXTENDED(XfburnAudioComposition,
+ xfburn_audio_composition,
+ GTK_TYPE_BOX,
+ 0,
+ G_ADD_PRIVATE(XfburnAudioComposition)
+ G_IMPLEMENT_INTERFACE(XFBURN_TYPE_COMPOSITION, composition_interface_init));
+/*
GType
xfburn_audio_composition_get_type (void)
{
@@ -264,10 +269,6 @@ xfburn_audio_composition_get_type (void)
NULL
};
- static const GInterfaceInfo composition_info = {
- (GInterfaceInitFunc) composition_interface_init, /* interface_init */
- NULL, /* interface_finalize */
- NULL /* interface_data */
};
audio_composition_type = g_type_register_static (GTK_TYPE_BOX, "XfburnAudioComposition", &audio_composition_info, 0);
@@ -276,15 +277,13 @@ xfburn_audio_composition_get_type (void)
}
return audio_composition_type;
-}
+} */
static void
-xfburn_audio_composition_class_init (XfburnAudioCompositionClass * klass, gpointer data)
+xfburn_audio_composition_class_init (XfburnAudioCompositionClass * klass)
{
GObjectClass *object_class = G_OBJECT_CLASS (klass);
- g_type_class_add_private (klass, sizeof (XfburnAudioCompositionPrivate));
-
parent_class = g_type_class_peek_parent (klass);
object_class->finalize = xfburn_audio_composition_finalize;
@@ -300,7 +299,7 @@ composition_interface_init (XfburnCompositionInterface *composition, gpointer if
}
static void
-xfburn_audio_composition_init (XfburnAudioComposition * composition, gpointer data)
+xfburn_audio_composition_init (XfburnAudioComposition * composition)
{
XfburnAudioCompositionPrivate *priv = XFBURN_AUDIO_COMPOSITION_GET_PRIVATE (composition);
@@ -524,7 +523,7 @@ xfburn_audio_composition_init (XfburnAudioComposition * composition, gpointer da
static void
xfburn_audio_composition_finalize (GObject * object)
{
- XfburnAudioCompositionPrivate *priv = XFBURN_AUDIO_COMPOSITION_GET_PRIVATE (object);
+ XfburnAudioCompositionPrivate *priv = XFBURN_AUDIO_COMPOSITION_GET_PRIVATE (XFBURN_AUDIO_COMPOSITION (object));
g_free (priv->filename);
@@ -2160,7 +2159,7 @@ foreach_save (GtkTreeModel * model, GtkTreePath * path, GtkTreeIter * iter, Comp
static void
save_to_file (XfburnComposition * composition)
{
- XfburnAudioCompositionPrivate *priv = XFBURN_AUDIO_COMPOSITION_GET_PRIVATE (composition);
+ XfburnAudioCompositionPrivate *priv = XFBURN_AUDIO_COMPOSITION_GET_PRIVATE (XFBURN_AUDIO_COMPOSITION (composition));
FILE *file_content;
GtkTreeModel *model;
CompositionSaveInfo info;
diff --git a/xfburn/xfburn-main-window.c b/xfburn/xfburn-main-window.c
index 202075c..05871f3 100644
--- a/xfburn/xfburn-main-window.c
+++ b/xfburn/xfburn-main-window.c
@@ -41,7 +41,7 @@
#include "xfburn-main.h"
#include "xfburn-utils.h"
-#define XFBURN_MAIN_WINDOW_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), XFBURN_TYPE_MAIN_WINDOW, XfburnMainWindowPrivate))
+#define XFBURN_MAIN_WINDOW_GET_PRIVATE(obj) (xfburn_main_window_get_instance_private(obj))
/* private struct */
typedef struct {
@@ -61,9 +61,9 @@ typedef struct {
} XfburnMainWindowPrivate;
/* prototypes */
-static void xfburn_main_window_class_init (XfburnMainWindowClass *, gpointer);
+G_DEFINE_TYPE_WITH_PRIVATE (XfburnMainWindow, xfburn_main_window, GTK_TYPE_WINDOW)
+
static void xfburn_main_window_finalize (GObject *obj);
-static void xfburn_main_window_init (XfburnMainWindow *, gpointer);
static gboolean cb_delete_main_window (XfburnMainWindow *, GdkEvent *, XfburnMainWindowPrivate *);
// static void cb_edit_toolbars_view (ExoToolbarsView *, gpointer);
@@ -95,7 +95,7 @@ static void action_show_toolbar (GSimpleAction * action, GVariant*, XfburnMainWi
/* globals */
static GtkWindowClass *parent_class = NULL;
-// upgrade to
+// upgrade to
static const GActionEntry action_entries[] = {
// { "file-menu", NULL},
{ .name = "new-data-composition", .activate = (gActionCallback)action_new_data_composition },
@@ -196,38 +196,11 @@ static XfburnMainWindow *instance = NULL;
/**************************/
/* XfburnMainWindow class */
/**************************/
-GType
-xfburn_main_window_get_type (void)
-{
- static GType main_window_type = 0;
-
- if (!main_window_type) {
- static const GTypeInfo main_window_info = {
- sizeof (XfburnMainWindowClass),
- NULL,
- NULL,
- (GClassInitFunc) xfburn_main_window_class_init,
- NULL,
- NULL,
- sizeof (XfburnMainWindow),
- 0,
- (GInstanceInitFunc) xfburn_main_window_init,
- NULL
- };
-
- main_window_type = g_type_register_static (GTK_TYPE_WINDOW, "XfburnMainWindow", &main_window_info, 0);
- }
-
- return main_window_type;
-}
-
static void
-xfburn_main_window_class_init (XfburnMainWindowClass * klass, gpointer data)
+xfburn_main_window_class_init (XfburnMainWindowClass * klass)
{
GObjectClass *object_class = G_OBJECT_CLASS (klass);
- g_type_class_add_private (klass, sizeof (XfburnMainWindowPrivate));
-
parent_class = g_type_class_peek_parent (klass);
object_class->finalize = xfburn_main_window_finalize;
@@ -241,7 +214,7 @@ xfburn_main_window_finalize (GObject *obj)
}
static void
-xfburn_main_window_init (XfburnMainWindow * mainwin, gpointer data)
+xfburn_main_window_init (XfburnMainWindow * mainwin)
{
XfburnMainWindowPrivate *priv = XFBURN_MAIN_WINDOW_GET_PRIVATE (mainwin);
diff --git a/xfburn/xfburn-welcome-tab.c b/xfburn/xfburn-welcome-tab.c
index 362d1d9..a8f9a36 100644
--- a/xfburn/xfburn-welcome-tab.c
+++ b/xfburn/xfburn-welcome-tab.c
@@ -38,12 +38,8 @@
#include "xfburn-blank-dialog.h"
/* prototypes */
-static void xfburn_welcome_tab_class_init (XfburnWelcomeTabClass * klass, gpointer data);
-static void xfburn_welcome_tab_init (XfburnWelcomeTab * sp, gpointer data);
static void xfburn_welcome_tab_finalize (GObject * object);
-#define XFBURN_WELCOME_TAB_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), XFBURN_TYPE_WELCOME_TAB, XfburnWelcomeTabPrivate))
-
typedef struct {
XfburnCompositionsNotebook *notebook;
@@ -53,6 +49,9 @@ typedef struct {
GtkWidget *button_blank;
} XfburnWelcomeTabPrivate;
+G_DEFINE_TYPE_WITH_PRIVATE (XfburnWelcomeTab, xfburn_welcome_tab, GTK_TYPE_BOX)
+#define XFBURN_WELCOME_TAB_GET_PRIVATE(obj) (xfburn_welcome_tab_get_instance_private(obj))
+
/* internals */
static GtkWidget* create_welcome_button (const gchar *stock, const gchar *text, const gchar *secondary);
@@ -67,45 +66,18 @@ static void blank_disc (GtkButton *button, XfburnWelcomeTab *tab);
/*********************/
static GtkWidget *parent_class = NULL;
-GType
-xfburn_welcome_tab_get_type (void)
-{
- static GType type = 0;
-
- if (type == 0) {
- static const GTypeInfo our_info = {
- sizeof (XfburnWelcomeTabClass),
- NULL,
- NULL,
- (GClassInitFunc) xfburn_welcome_tab_class_init,
- NULL,
- NULL,
- sizeof (XfburnWelcomeTab),
- 0,
- (GInstanceInitFunc) xfburn_welcome_tab_init,
- NULL
- };
-
- type = g_type_register_static (GTK_TYPE_BOX, "XfburnWelcomeTab", &our_info, 0);
- }
-
- return type;
-}
-
static void
-xfburn_welcome_tab_class_init (XfburnWelcomeTabClass * klass, gpointer data)
+xfburn_welcome_tab_class_init (XfburnWelcomeTabClass * klass)
{
GObjectClass *object_class = G_OBJECT_CLASS (klass);
- g_type_class_add_private (klass, sizeof (XfburnWelcomeTabPrivate));
-
parent_class = g_type_class_peek_parent (klass);
object_class->finalize = xfburn_welcome_tab_finalize;
}
static void
-xfburn_welcome_tab_init (XfburnWelcomeTab * obj, gpointer data)
+xfburn_welcome_tab_init (XfburnWelcomeTab * obj)
{
XfburnWelcomeTabPrivate *priv = XFBURN_WELCOME_TAB_GET_PRIVATE (obj);
@@ -263,7 +235,7 @@ xfburn_welcome_tab_new (XfburnCompositionsNotebook *notebook, GActionMap *action
obj = g_object_new (XFBURN_TYPE_WELCOME_TAB, NULL);
if (obj) {
- XfburnWelcomeTabPrivate *priv = XFBURN_WELCOME_TAB_GET_PRIVATE (obj);
+ XfburnWelcomeTabPrivate *priv = XFBURN_WELCOME_TAB_GET_PRIVATE (XFBURN_WELCOME_TAB(obj));
GAction *action;
priv->notebook = notebook;
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the Xfce4-commits
mailing list