[Xfce4-commits] [apps/xfburn] 41/42: fixed all incorrect function ptr casts warnings
noreply at xfce.org
noreply at xfce.org
Tue Oct 15 02:22:24 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 c734019610fa475e09b874ba7a8d68d427256c86
Author: Rene Kjellerup <rk.katana.steel at gmail.com>
Date: Fri Oct 4 15:59:57 2019 -0700
fixed all incorrect function ptr casts warnings
---
xfburn/xfburn-adding-progress.c | 8 ++++----
xfburn/xfburn-audio-disc-usage.c | 4 ++--
xfburn/xfburn-blank-dialog.c | 13 +++++++------
xfburn/xfburn-burn-audio-cd-composition-dialog.c | 7 ++++---
xfburn/xfburn-burn-data-cd-composition-dialog.c | 8 ++++----
xfburn/xfburn-burn-data-composition-base-dialog.c | 10 ++++++----
xfburn/xfburn-burn-data-dvd-composition-dialog.c | 8 ++++----
xfburn/xfburn-burn-image-dialog.c | 13 +++++++------
xfburn/xfburn-compositions-notebook.c | 8 ++++----
xfburn/xfburn-data-disc-usage.c | 4 ++--
xfburn/xfburn-device-box.c | 4 ++--
xfburn/xfburn-device-list.c | 3 +--
xfburn/xfburn-directory-browser.c | 11 +++++------
xfburn/xfburn-disc-usage.c | 4 ++--
xfburn/xfburn-file-browser.c | 11 +++++------
xfburn/xfburn-fs-browser.c | 8 ++++----
xfburn/xfburn-main-window.c | 8 ++++----
xfburn/xfburn-main.c | 2 +-
xfburn/xfburn-main.h | 2 +-
xfburn/xfburn-notebook-tab.c | 8 ++++----
xfburn/xfburn-preferences-dialog.c | 8 ++++----
xfburn/xfburn-progress-dialog.c | 8 ++++----
xfburn/xfburn-settings.c | 8 ++++----
xfburn/xfburn-transcoder-basic.c | 8 ++++----
xfburn/xfburn-transcoder-gst.c | 8 ++++----
xfburn/xfburn-udev-manager.c | 8 ++++----
xfburn/xfburn-utils.c | 2 +-
xfburn/xfburn-welcome-tab.c | 8 ++++----
28 files changed, 102 insertions(+), 100 deletions(-)
diff --git a/xfburn/xfburn-adding-progress.c b/xfburn/xfburn-adding-progress.c
index 83ab871..a2d4141 100644
--- a/xfburn/xfburn-adding-progress.c
+++ b/xfburn/xfburn-adding-progress.c
@@ -42,8 +42,8 @@ typedef struct
} XfburnAddingProgressPrivate;
/* prototypes */
-static void xfburn_adding_progress_class_init (XfburnAddingProgressClass *);
-static void xfburn_adding_progress_init (XfburnAddingProgress *);
+static void xfburn_adding_progress_class_init (XfburnAddingProgressClass *, gpointer);
+static void xfburn_adding_progress_init (XfburnAddingProgress *, gpointer);
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);
@@ -83,7 +83,7 @@ xfburn_adding_progress_get_type (void)
}
static void
-xfburn_adding_progress_class_init (XfburnAddingProgressClass * klass)
+xfburn_adding_progress_class_init (XfburnAddingProgressClass * klass, gpointer data)
{
GObjectClass *object_class = G_OBJECT_CLASS (klass);
@@ -100,7 +100,7 @@ xfburn_adding_progress_class_init (XfburnAddingProgressClass * klass)
}
static void
-xfburn_adding_progress_init (XfburnAddingProgress * win)
+xfburn_adding_progress_init (XfburnAddingProgress * win, gpointer data)
{
XfburnAddingProgressPrivate *priv = XFBURN_ADDING_PROGRESS_GET_PRIVATE (win);
GtkWidget *vbox, *cancel_btn;
diff --git a/xfburn/xfburn-audio-disc-usage.c b/xfburn/xfburn-audio-disc-usage.c
index 3ee1260..f78ea77 100644
--- a/xfburn/xfburn-audio-disc-usage.c
+++ b/xfburn/xfburn-audio-disc-usage.c
@@ -32,7 +32,7 @@
#include "xfburn-main-window.h"
/* prototypes */
-static void xfburn_audio_disc_usage_class_init (XfburnAudioDiscUsageClass *);
+static void xfburn_audio_disc_usage_class_init (XfburnAudioDiscUsageClass *, gpointer);
static gboolean can_burn (XfburnDiscUsage *disc_usage);
static void xfburn_audio_disc_usage_update_size (XfburnDiscUsage * disc_usage);
@@ -86,7 +86,7 @@ xfburn_audio_disc_usage_get_type (void)
}
static void
-xfburn_audio_disc_usage_class_init (XfburnAudioDiscUsageClass * klass)
+xfburn_audio_disc_usage_class_init (XfburnAudioDiscUsageClass * klass, gpointer data)
{
XfburnDiscUsageClass *pklass;
diff --git a/xfburn/xfburn-blank-dialog.c b/xfburn/xfburn-blank-dialog.c
index ab070f0..011db3f 100644
--- a/xfburn/xfburn-blank-dialog.c
+++ b/xfburn/xfburn-blank-dialog.c
@@ -91,8 +91,8 @@ typedef struct {
/* internal prototypes */
-static void xfburn_blank_dialog_class_init (XfburnBlankDialogClass * klass);
-static void xfburn_blank_dialog_init (XfburnBlankDialog * sp);
+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);
@@ -101,7 +101,7 @@ static void fill_combo_mode (XfburnBlankDialog *dialog);
//static GList * get_valid_blank_modes (XfburnDevice *device);
static XfburnBlankMode get_selected_mode (XfburnBlankDialogPrivate *priv);
static gboolean thread_blank_perform_blank (ThreadBlankParams * params, struct burn_drive_info *drive_info);
-static void thread_blank (ThreadBlankParams * params);
+static void* thread_blank (ThreadBlankParams * params);
static void xfburn_blank_dialog_response_cb (XfburnBlankDialog * dialog, gint response_id, gpointer user_data);
static void cb_volume_changed (GtkWidget *device_box, gboolean device_changed, XfburnDevice *device, XfburnBlankDialog * dialog);
@@ -135,7 +135,7 @@ xfburn_blank_dialog_get_type (void)
}
static void
-xfburn_blank_dialog_class_init (XfburnBlankDialogClass * klass)
+xfburn_blank_dialog_class_init (XfburnBlankDialogClass * klass, gpointer data)
{
GObjectClass *object_class = G_OBJECT_CLASS (klass);
@@ -182,7 +182,7 @@ xfburn_blank_dialog_set_property (GObject *object, guint prop_id, const GValue *
}
static void
-xfburn_blank_dialog_init (XfburnBlankDialog * obj)
+xfburn_blank_dialog_init (XfburnBlankDialog * obj, gpointer data)
{
XfburnBlankDialogPrivate *priv = XFBURN_BLANK_DIALOG_GET_PRIVATE (obj);
GtkBox *box = GTK_BOX (gtk_dialog_get_content_area((GTK_DIALOG (obj))));
@@ -455,7 +455,7 @@ thread_blank_perform_blank (ThreadBlankParams * params, struct burn_drive_info *
return TRUE;
}
-static void
+static void*
thread_blank (ThreadBlankParams * params)
{
struct burn_drive_info *drive_info = NULL;
@@ -475,6 +475,7 @@ thread_blank (ThreadBlankParams * params)
xfburn_udev_manager_send_volume_changed ();
gdk_threads_leave ();
#endif
+ return NULL;
}
static XfburnBlankMode
diff --git a/xfburn/xfburn-burn-audio-cd-composition-dialog.c b/xfburn/xfburn-burn-audio-cd-composition-dialog.c
index 202d1d8..3f4cfc6 100644
--- a/xfburn/xfburn-burn-audio-cd-composition-dialog.c
+++ b/xfburn/xfburn-burn-audio-cd-composition-dialog.c
@@ -68,7 +68,7 @@ enum {
};
/* prototypes */
-static void xfburn_burn_audio_cd_composition_dialog_class_init (XfburnBurnAudioCdCompositionDialogClass * klass);
+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);
@@ -108,7 +108,7 @@ xfburn_burn_audio_cd_composition_dialog_get_type (void)
}
static void
-xfburn_burn_audio_cd_composition_dialog_class_init (XfburnBurnAudioCdCompositionDialogClass * klass)
+xfburn_burn_audio_cd_composition_dialog_class_init (XfburnBurnAudioCdCompositionDialogClass * klass, gpointer data)
{
GObjectClass *object_class = G_OBJECT_CLASS (klass);
@@ -339,7 +339,7 @@ thread_burn_prep_and_burn (ThreadBurnCompositionParams * params, struct burn_dri
burn_write_opts_free (burn_options);
}
-static void
+static void*
thread_burn_composition (ThreadBurnCompositionParams * params)
{
GtkWidget *dialog_progress = params->dialog_progress;
@@ -418,6 +418,7 @@ thread_burn_composition (ThreadBurnCompositionParams * params)
/* FIXME: free track_list here? */
g_free (params);
+ return NULL;
}
static void
diff --git a/xfburn/xfburn-burn-data-cd-composition-dialog.c b/xfburn/xfburn-burn-data-cd-composition-dialog.c
index e3c3e02..f563095 100644
--- a/xfburn/xfburn-burn-data-cd-composition-dialog.c
+++ b/xfburn/xfburn-burn-data-cd-composition-dialog.c
@@ -47,8 +47,8 @@ typedef struct
} XfburnBurnDataCdCompositionDialogPrivate;
/* prototypes */
-static void xfburn_burn_data_cd_composition_dialog_class_init (XfburnBurnDataCdCompositionDialogClass * klass);
-static void xfburn_burn_data_cd_composition_dialog_init (XfburnBurnDataCdCompositionDialog * obj);
+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);
/* globals */
@@ -80,7 +80,7 @@ xfburn_burn_data_cd_composition_dialog_get_type (void)
}
static void
-xfburn_burn_data_cd_composition_dialog_class_init (XfburnBurnDataCdCompositionDialogClass * klass)
+xfburn_burn_data_cd_composition_dialog_class_init (XfburnBurnDataCdCompositionDialogClass * klass, gpointer data)
{
GObjectClass *object_class = G_OBJECT_CLASS (klass);
@@ -91,7 +91,7 @@ xfburn_burn_data_cd_composition_dialog_class_init (XfburnBurnDataCdCompositionDi
}
static void
-xfburn_burn_data_cd_composition_dialog_init (XfburnBurnDataCdCompositionDialog * obj)
+xfburn_burn_data_cd_composition_dialog_init (XfburnBurnDataCdCompositionDialog * obj, gpointer data)
{
//XfburnBurnDataCdCompositionDialogPrivate *priv = XFBURN_BURN_DATA_CD_COMPOSITION_DIALOG_GET_PRIVATE (obj);
diff --git a/xfburn/xfburn-burn-data-composition-base-dialog.c b/xfburn/xfburn-burn-data-composition-base-dialog.c
index 063e7e7..104039f 100644
--- a/xfburn/xfburn-burn-data-composition-base-dialog.c
+++ b/xfburn/xfburn-burn-data-composition-base-dialog.c
@@ -91,7 +91,7 @@ char *proceed_image[] = {
*/
/* prototypes */
-static void xfburn_burn_data_composition_base_dialog_class_init (XfburnBurnDataCompositionBaseDialogClass * klass);
+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);
@@ -139,7 +139,7 @@ xfburn_burn_data_composition_base_dialog_get_type (void)
}
static void
-xfburn_burn_data_composition_base_dialog_class_init (XfburnBurnDataCompositionBaseDialogClass * klass)
+xfburn_burn_data_composition_base_dialog_class_init (XfburnBurnDataCompositionBaseDialogClass * klass, gpointer data)
{
GObjectClass *object_class = G_OBJECT_CLASS (klass);
@@ -458,7 +458,7 @@ typedef struct {
gchar *iso_path;
} ThreadWriteIsoParams;
-static void
+static void*
thread_write_iso (ThreadWriteIsoParams * params)
{
GtkWidget *dialog_progress = params->dialog_progress;
@@ -527,6 +527,7 @@ thread_write_iso (ThreadWriteIsoParams * params)
burn_source_free (params->src);
g_free (params->iso_path);
g_free (params);
+ return NULL;
}
typedef struct {
@@ -608,7 +609,7 @@ thread_burn_prep_and_burn (ThreadBurnCompositionParams * params, struct burn_dri
burn_write_opts_free (burn_options);
}
-static void
+static void*
thread_burn_composition (ThreadBurnCompositionParams * params)
{
GtkWidget *dialog_progress = params->dialog_progress;
@@ -636,6 +637,7 @@ thread_burn_composition (ThreadBurnCompositionParams * params)
burn_source_free (params->src);
g_free (params);
+ return NULL;
}
static void
diff --git a/xfburn/xfburn-burn-data-dvd-composition-dialog.c b/xfburn/xfburn-burn-data-dvd-composition-dialog.c
index da4b83a..5aa8069 100644
--- a/xfburn/xfburn-burn-data-dvd-composition-dialog.c
+++ b/xfburn/xfburn-burn-data-dvd-composition-dialog.c
@@ -48,8 +48,8 @@ typedef struct
} XfburnBurnDataDvdCompositionDialogPrivate;
/* prototypes */
-static void xfburn_burn_data_dvd_composition_dialog_class_init (XfburnBurnDataDvdCompositionDialogClass * klass);
-static void xfburn_burn_data_dvd_composition_dialog_init (XfburnBurnDataDvdCompositionDialog * obj);
+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 */
@@ -81,7 +81,7 @@ xfburn_burn_data_dvd_composition_dialog_get_type (void)
}
static void
-xfburn_burn_data_dvd_composition_dialog_class_init (XfburnBurnDataDvdCompositionDialogClass * klass)
+xfburn_burn_data_dvd_composition_dialog_class_init (XfburnBurnDataDvdCompositionDialogClass * klass, gpointer data)
{
GObjectClass *object_class = G_OBJECT_CLASS (klass);
@@ -92,7 +92,7 @@ xfburn_burn_data_dvd_composition_dialog_class_init (XfburnBurnDataDvdComposition
}
static void
-xfburn_burn_data_dvd_composition_dialog_init (XfburnBurnDataDvdCompositionDialog * obj)
+xfburn_burn_data_dvd_composition_dialog_init (XfburnBurnDataDvdCompositionDialog * obj, gpointer data)
{
//XfburnBurnDataDvdCompositionDialogPrivate *priv = XFBURN_BURN_DATA_DVD_COMPOSITION_DIALOG_GET_PRIVATE (obj);
diff --git a/xfburn/xfburn-burn-image-dialog.c b/xfburn/xfburn-burn-image-dialog.c
index 4b8df83..2171e2b 100644
--- a/xfburn/xfburn-burn-image-dialog.c
+++ b/xfburn/xfburn-burn-image-dialog.c
@@ -87,8 +87,8 @@ typedef struct
static gchar * last_file = NULL;
/* prototypes */
-static void xfburn_burn_image_dialog_class_init (XfburnBurnImageDialogClass * klass);
-static void xfburn_burn_image_dialog_init (XfburnBurnImageDialog * sp);
+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 */
@@ -104,7 +104,7 @@ static void cb_clicked_ok (GtkButton * button, gpointer user_data);
static void free_params (ThreadBurnIsoParams *params);
static gboolean prepare_params (ThreadBurnIsoParams *params, struct burn_drive *drive, gchar **failure_msg);
static gboolean create_disc (ThreadBurnIsoParams *params, gchar **failure_msg);
-static void thread_burn_iso (ThreadBurnIsoParams * params);
+static void* thread_burn_iso (ThreadBurnIsoParams * params);
/*********************/
/* class declaration */
@@ -137,7 +137,7 @@ xfburn_burn_image_dialog_get_type (void)
}
static void
-xfburn_burn_image_dialog_class_init (XfburnBurnImageDialogClass * klass)
+xfburn_burn_image_dialog_class_init (XfburnBurnImageDialogClass * klass, gpointer data)
{
GObjectClass *object_class = G_OBJECT_CLASS (klass);
@@ -149,7 +149,7 @@ xfburn_burn_image_dialog_class_init (XfburnBurnImageDialogClass * klass)
}
static void
-xfburn_burn_image_dialog_init (XfburnBurnImageDialog * obj)
+xfburn_burn_image_dialog_init (XfburnBurnImageDialog * obj, gpointer data)
{
GtkBox *box = GTK_BOX (gtk_dialog_get_content_area(GTK_DIALOG (obj)));
XfburnBurnImageDialogPrivate *priv = XFBURN_BURN_IMAGE_DIALOG_GET_PRIVATE (obj);
@@ -389,7 +389,7 @@ create_disc (ThreadBurnIsoParams *params, gchar **failure_msg)
return TRUE;
}
-static void
+static void*
thread_burn_iso (ThreadBurnIsoParams * params)
{
GtkWidget *dialog_progress = params->dialog_progress;
@@ -424,6 +424,7 @@ thread_burn_iso (ThreadBurnIsoParams * params)
free_params (params);
g_free (params);
+ return NULL;
}
/**
diff --git a/xfburn/xfburn-compositions-notebook.c b/xfburn/xfburn-compositions-notebook.c
index 2da487a..857141a 100644
--- a/xfburn/xfburn-compositions-notebook.c
+++ b/xfburn/xfburn-compositions-notebook.c
@@ -42,8 +42,8 @@ typedef struct
/* prototypes */
-static void xfburn_compositions_notebook_class_init (XfburnCompositionsNotebookClass * klass);
-static void xfburn_compositions_notebook_init (XfburnCompositionsNotebook * notebook);
+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);
@@ -84,7 +84,7 @@ xfburn_compositions_notebook_get_type (void)
}
static void
-xfburn_compositions_notebook_class_init (XfburnCompositionsNotebookClass * klass)
+xfburn_compositions_notebook_class_init (XfburnCompositionsNotebookClass * klass, gpointer data)
{
GObjectClass *object_class = G_OBJECT_CLASS (klass);
@@ -109,7 +109,7 @@ cb_move_focus_out (GtkNotebook *notebook, GtkDirectionType *arg1, XfburnComposit
}
static void
-xfburn_compositions_notebook_init (XfburnCompositionsNotebook * notebook)
+xfburn_compositions_notebook_init (XfburnCompositionsNotebook * notebook, gpointer data)
{
XfburnCompositionsNotebookPrivate *priv = XFBURN_COMPOSITIONS_NOTEBOOK_GET_PRIVATE (notebook);
diff --git a/xfburn/xfburn-data-disc-usage.c b/xfburn/xfburn-data-disc-usage.c
index a5b5f00..c04c924 100644
--- a/xfburn/xfburn-data-disc-usage.c
+++ b/xfburn/xfburn-data-disc-usage.c
@@ -32,7 +32,7 @@
#include "xfburn-main-window.h"
/* prototypes */
-static void xfburn_data_disc_usage_class_init (XfburnDataDiscUsageClass *);
+static void xfburn_data_disc_usage_class_init (XfburnDataDiscUsageClass *, gpointer data);
static gboolean can_burn (XfburnDiscUsage *disc_usage);
static void xfburn_data_disc_usage_update_size (XfburnDiscUsage * disc_usage);
@@ -96,7 +96,7 @@ xfburn_data_disc_usage_get_type (void)
}
static void
-xfburn_data_disc_usage_class_init (XfburnDataDiscUsageClass * klass)
+xfburn_data_disc_usage_class_init (XfburnDataDiscUsageClass * klass, gpointer data)
{
XfburnDiscUsageClass *pklass;
diff --git a/xfburn/xfburn-device-box.c b/xfburn/xfburn-device-box.c
index 38c9382..00eb940 100644
--- a/xfburn/xfburn-device-box.c
+++ b/xfburn/xfburn-device-box.c
@@ -91,7 +91,7 @@ typedef struct
} XfburnDeviceBoxPrivate;
/* prototypes */
-static void xfburn_device_box_class_init (XfburnDeviceBoxClass *);
+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);
@@ -147,7 +147,7 @@ xfburn_device_box_get_type (void)
}
static void
-xfburn_device_box_class_init (XfburnDeviceBoxClass * klass)
+xfburn_device_box_class_init (XfburnDeviceBoxClass * klass, gpointer data)
{
GObjectClass *object_class = G_OBJECT_CLASS (klass);
diff --git a/xfburn/xfburn-device-list.c b/xfburn/xfburn-device-list.c
index 557ef25..c59571f 100644
--- a/xfburn/xfburn-device-list.c
+++ b/xfburn/xfburn-device-list.c
@@ -174,8 +174,7 @@ xfburn_device_list_finalize (GObject *object)
XfburnDeviceList *devlist = XFBURN_DEVICE_LIST (object);
XfburnDeviceListPrivate *priv = GET_PRIVATE (devlist);
- g_list_foreach (priv->devices, (GFunc) g_object_unref, NULL);
- g_list_free (priv->devices);
+ g_list_free_full (priv->devices, (GDestroyNotify) g_object_unref);
G_OBJECT_CLASS (parent_class)->finalize (object);
}
diff --git a/xfburn/xfburn-directory-browser.c b/xfburn/xfburn-directory-browser.c
index 8c1bdd2..dedd225 100644
--- a/xfburn/xfburn-directory-browser.c
+++ b/xfburn/xfburn-directory-browser.c
@@ -44,8 +44,8 @@ typedef struct
} XfburnDirectoryBrowserPrivate;
/* prototypes */
-static void xfburn_directory_browser_class_init (XfburnDirectoryBrowserClass *);
-static void xfburn_directory_browser_init (XfburnDirectoryBrowser *);
+static void xfburn_directory_browser_class_init (XfburnDirectoryBrowserClass *, gpointer);
+static void xfburn_directory_browser_init (XfburnDirectoryBrowser *, gpointer);
static void cb_browser_drag_data_get (GtkWidget *, GdkDragContext *, GtkSelectionData *, guint, guint, gpointer);
static gint directory_tree_sortfunc (GtkTreeModel *, GtkTreeIter *, GtkTreeIter *, gpointer);
@@ -95,7 +95,7 @@ xfburn_directory_browser_finalize (GObject * object)
}
static void
-xfburn_directory_browser_class_init (XfburnDirectoryBrowserClass * klass)
+xfburn_directory_browser_class_init (XfburnDirectoryBrowserClass * klass, gpointer data)
{
GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
@@ -106,7 +106,7 @@ xfburn_directory_browser_class_init (XfburnDirectoryBrowserClass * klass)
}
static void
-xfburn_directory_browser_init (XfburnDirectoryBrowser * browser)
+xfburn_directory_browser_init (XfburnDirectoryBrowser * browser, gpointer data)
{
GtkListStore *model;
GtkTreeViewColumn *column_file;
@@ -396,8 +396,7 @@ xfburn_directory_browser_get_selection (XfburnDirectoryBrowser * browser)
}
selected_rows = g_list_first (selected_rows);
- g_list_foreach (selected_rows, (GFunc) gtk_tree_path_free, NULL);
- g_list_free (selected_rows);
+ g_list_free_full (selected_rows, (GDestroyNotify) gtk_tree_path_free);
return full_paths;
}
diff --git a/xfburn/xfburn-disc-usage.c b/xfburn/xfburn-disc-usage.c
index e235275..0861560 100644
--- a/xfburn/xfburn-disc-usage.c
+++ b/xfburn/xfburn-disc-usage.c
@@ -41,7 +41,7 @@
/* prototypes */
-static void xfburn_disc_usage_class_init (XfburnDiscUsageClass *);
+static void xfburn_disc_usage_class_init (XfburnDiscUsageClass *, gpointer);
//static void xfburn_disc_usage_init (XfburnDiscUsage *);
static GObject * xfburn_disc_usage_constructor (GType type, guint n_construct_properties, GObjectConstructParam *construct_properties);
@@ -113,7 +113,7 @@ xfburn_disc_usage_get_type (void)
}
static void
-xfburn_disc_usage_class_init (XfburnDiscUsageClass * klass)
+xfburn_disc_usage_class_init (XfburnDiscUsageClass * klass, gpointer data)
{
GObjectClass *gobject_class;
diff --git a/xfburn/xfburn-file-browser.c b/xfburn/xfburn-file-browser.c
index 04ba7f4..fbd4bff 100644
--- a/xfburn/xfburn-file-browser.c
+++ b/xfburn/xfburn-file-browser.c
@@ -45,8 +45,8 @@ typedef struct {
} XfburnFileBrowserPrivate;
/* prototypes */
-static void xfburn_file_browser_class_init (XfburnFileBrowserClass *);
-static void xfburn_file_browser_init (XfburnFileBrowser *);
+static void xfburn_file_browser_class_init (XfburnFileBrowserClass *, gpointer);
+static void xfburn_file_browser_init (XfburnFileBrowser *, gpointer);
static void cb_fs_browser_selection_changed (GtkTreeSelection *, XfburnFileBrowser *);
static void cb_directory_browser_row_activated (GtkWidget *, GtkTreePath *, GtkTreeViewColumn *, XfburnFileBrowser *);
@@ -83,7 +83,7 @@ xfburn_file_browser_get_type (void)
}
static void
-xfburn_file_browser_class_init (XfburnFileBrowserClass * klass)
+xfburn_file_browser_class_init (XfburnFileBrowserClass * klass, gpointer data)
{
g_type_class_add_private (klass, sizeof (XfburnFileBrowserPrivate));
@@ -91,7 +91,7 @@ xfburn_file_browser_class_init (XfburnFileBrowserClass * klass)
}
static void
-xfburn_file_browser_init (XfburnFileBrowser * file_browser)
+xfburn_file_browser_init (XfburnFileBrowser * file_browser, gpointer data)
{
GtkWidget *scrolled_window;
GtkTreeSelection *selection;
@@ -159,8 +159,7 @@ cb_directory_browser_row_activated (GtkWidget * treeview, GtkTreePath * path, Gt
gtk_tree_model_get_iter (model_dir, &iter_dir, path_dir);
gtk_tree_model_get (model_dir, &iter_dir, DIRECTORY_BROWSER_COLUMN_FILE, &directory, -1);
- g_list_foreach (selected_row, (GFunc) gtk_tree_path_free, NULL);
- g_list_free (selected_row);
+ g_list_free_full (selected_row, (GDestroyNotify) gtk_tree_path_free);
/* expand the parent directory in the FS browser */
path_fs = gtk_tree_model_get_path (model_fs, &iter_fs);
diff --git a/xfburn/xfburn-fs-browser.c b/xfburn/xfburn-fs-browser.c
index 06981a1..822a269 100644
--- a/xfburn/xfburn-fs-browser.c
+++ b/xfburn/xfburn-fs-browser.c
@@ -34,8 +34,8 @@
/* prototypes */
-static void xfburn_fs_browser_class_init (XfburnFsBrowserClass * klass);
-static void xfburn_fs_browser_init (XfburnFsBrowser * sp);
+static void xfburn_fs_browser_class_init (XfburnFsBrowserClass * klass, gpointer data);
+static void xfburn_fs_browser_init (XfburnFsBrowser * sp, gpointer data);
static void cb_browser_row_expanded (GtkTreeView *, GtkTreeIter *, GtkTreePath *, gpointer);
static void cb_browser_row_activated (GtkTreeView *tree_view, GtkTreePath *path, GtkTreeViewColumn *column, gpointer user_data);
@@ -72,13 +72,13 @@ xfburn_fs_browser_get_type (void)
}
static void
-xfburn_fs_browser_class_init (XfburnFsBrowserClass * klass)
+xfburn_fs_browser_class_init (XfburnFsBrowserClass * klass, gpointer data)
{
parent_class = g_type_class_peek_parent (klass);
}
static void
-xfburn_fs_browser_init (XfburnFsBrowser * browser)
+xfburn_fs_browser_init (XfburnFsBrowser * browser, gpointer data)
{
GtkTreeStore *model;
GtkTreeViewColumn *column_directory;
diff --git a/xfburn/xfburn-main-window.c b/xfburn/xfburn-main-window.c
index 801debf..d6f3784 100644
--- a/xfburn/xfburn-main-window.c
+++ b/xfburn/xfburn-main-window.c
@@ -62,9 +62,9 @@ typedef struct {
} XfburnMainWindowPrivate;
/* prototypes */
-static void xfburn_main_window_class_init (XfburnMainWindowClass *);
+static void xfburn_main_window_class_init (XfburnMainWindowClass *, gpointer);
static void xfburn_main_window_finalize (GObject *obj);
-static void xfburn_main_window_init (XfburnMainWindow *);
+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);
@@ -223,7 +223,7 @@ xfburn_main_window_get_type (void)
}
static void
-xfburn_main_window_class_init (XfburnMainWindowClass * klass)
+xfburn_main_window_class_init (XfburnMainWindowClass * klass, gpointer data)
{
GObjectClass *object_class = G_OBJECT_CLASS (klass);
@@ -242,7 +242,7 @@ xfburn_main_window_finalize (GObject *obj)
}
static void
-xfburn_main_window_init (XfburnMainWindow * mainwin)
+xfburn_main_window_init (XfburnMainWindow * mainwin, gpointer data)
{
XfburnMainWindowPrivate *priv = XFBURN_MAIN_WINDOW_GET_PRIVATE (mainwin);
diff --git a/xfburn/xfburn-main.c b/xfburn/xfburn-main.c
index a01456f..2436f86 100644
--- a/xfburn/xfburn-main.c
+++ b/xfburn/xfburn-main.c
@@ -129,7 +129,7 @@ xfburn_main_get_initial_dir ()
return xfce_get_homedir ();
}
-const gboolean *
+gboolean
xfburn_main_has_initial_dir ()
{
if (initial_dir)
diff --git a/xfburn/xfburn-main.h b/xfburn/xfburn-main.h
index 752f0bf..c47acd6 100644
--- a/xfburn/xfburn-main.h
+++ b/xfburn/xfburn-main.h
@@ -28,7 +28,7 @@ G_BEGIN_DECLS
void xfburn_main_leave_window (void);
void xfburn_main_enter_window (void);
const gchar *xfburn_main_get_initial_dir ();
-const gboolean *xfburn_main_has_initial_dir ();
+gboolean xfburn_main_has_initial_dir ();
G_END_DECLS
#endif /* __XFBURN_MAIN_H__ */
diff --git a/xfburn/xfburn-notebook-tab.c b/xfburn/xfburn-notebook-tab.c
index 4e549ab..4a4ce98 100644
--- a/xfburn/xfburn-notebook-tab.c
+++ b/xfburn/xfburn-notebook-tab.c
@@ -48,8 +48,8 @@ typedef struct
/* prototypes */
-static void xfburn_notebook_tab_class_init (XfburnNotebookTabClass * klass);
-static void xfburn_notebook_tab_init (XfburnNotebookTab * tab);
+static void xfburn_notebook_tab_class_init (XfburnNotebookTabClass * klass, gpointer data);
+static void xfburn_notebook_tab_init (XfburnNotebookTab * tab, gpointer data);
static void xfburn_notebook_tab_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec);
static void xfburn_notebook_tab_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec);
@@ -88,7 +88,7 @@ xfburn_notebook_tab_get_type (void)
}
static void
-xfburn_notebook_tab_class_init (XfburnNotebookTabClass * klass)
+xfburn_notebook_tab_class_init (XfburnNotebookTabClass * klass, gpointer data)
{
GObjectClass *object_class = G_OBJECT_CLASS (klass);
@@ -113,7 +113,7 @@ xfburn_notebook_tab_class_init (XfburnNotebookTabClass * klass)
}
static void
-xfburn_notebook_tab_init (XfburnNotebookTab * tab)
+xfburn_notebook_tab_init (XfburnNotebookTab * tab, gpointer data)
{
XfburnNotebookTabPrivate *priv = XFBURN_NOTEBOOK_TAB_GET_PRIVATE (tab);
GtkBox *hbox = GTK_BOX (tab);
diff --git a/xfburn/xfburn-preferences-dialog.c b/xfburn/xfburn-preferences-dialog.c
index 2402412..4be7d15 100644
--- a/xfburn/xfburn-preferences-dialog.c
+++ b/xfburn/xfburn-preferences-dialog.c
@@ -51,8 +51,8 @@ typedef struct
} XfburnPreferencesDialogPrivate;
/* prototypes */
-static void xfburn_preferences_dialog_class_init (XfburnPreferencesDialogClass * klass);
-static void xfburn_preferences_dialog_init (XfburnPreferencesDialog * sp);
+static void xfburn_preferences_dialog_class_init (XfburnPreferencesDialogClass * klass, gpointer data);
+static void xfburn_preferences_dialog_init (XfburnPreferencesDialog * sp, gpointer data);
static void refresh_devices_list (XfburnPreferencesDialog * dialog);
static void scan_button_clicked_cb (GtkWidget * button, gpointer user_data);
@@ -115,7 +115,7 @@ xfburn_preferences_dialog_get_type (void)
}
static void
-xfburn_preferences_dialog_class_init (XfburnPreferencesDialogClass * klass)
+xfburn_preferences_dialog_class_init (XfburnPreferencesDialogClass * klass, gpointer data)
{
g_type_class_add_private (klass, sizeof (XfburnPreferencesDialogPrivate));
@@ -123,7 +123,7 @@ xfburn_preferences_dialog_class_init (XfburnPreferencesDialogClass * klass)
}
static void
-xfburn_preferences_dialog_init (XfburnPreferencesDialog * obj)
+xfburn_preferences_dialog_init (XfburnPreferencesDialog * obj, gpointer data)
{
GtkBox *box = GTK_BOX (gtk_dialog_get_content_area(GTK_DIALOG (obj)));
XfburnPreferencesDialogPrivate *priv = XFBURN_PREFERENCES_DIALOG_GET_PRIVATE (obj);
diff --git a/xfburn/xfburn-progress-dialog.c b/xfburn/xfburn-progress-dialog.c
index 7f84391..33f4874 100644
--- a/xfburn/xfburn-progress-dialog.c
+++ b/xfburn/xfburn-progress-dialog.c
@@ -68,8 +68,8 @@ typedef struct
/* globals */
static guint signals[LAST_SIGNAL];
-static void xfburn_progress_dialog_class_init (XfburnProgressDialogClass * klass);
-static void xfburn_progress_dialog_init (XfburnProgressDialog * sp);
+static void xfburn_progress_dialog_class_init (XfburnProgressDialogClass * klass, gpointer data);
+static void xfburn_progress_dialog_init (XfburnProgressDialog * sp, gpointer data);
static void xfburn_progress_dialog_get_property (GObject * object, guint prop_id, GValue * value, GParamSpec * pspec);
static void xfburn_progress_dialog_set_property (GObject * object, guint prop_id, const GValue * value,
@@ -147,7 +147,7 @@ xfburn_progress_dialog_get_type (void)
}
static void
-xfburn_progress_dialog_class_init (XfburnProgressDialogClass * klass)
+xfburn_progress_dialog_class_init (XfburnProgressDialogClass * klass, gpointer data)
{
GObjectClass *object_class = G_OBJECT_CLASS (klass);
@@ -182,7 +182,7 @@ xfburn_progress_dialog_class_init (XfburnProgressDialogClass * klass)
}
static void
-xfburn_progress_dialog_init (XfburnProgressDialog * obj)
+xfburn_progress_dialog_init (XfburnProgressDialog * obj, gpointer data)
{
XfburnProgressDialogPrivate *priv = XFBURN_PROGRESS_DIALOG_GET_PRIVATE (obj);
GtkBox *box = GTK_BOX (gtk_dialog_get_content_area(GTK_DIALOG(obj)));
diff --git a/xfburn/xfburn-settings.c b/xfburn/xfburn-settings.c
index 061ca5d..c3f4cae 100644
--- a/xfburn/xfburn-settings.c
+++ b/xfburn/xfburn-settings.c
@@ -43,8 +43,8 @@
/* global */
typedef struct _Setting Setting;
-static void xfburn_settings_class_init (XfburnSettingsClass * klass);
-static void xfburn_settings_internal_init (XfburnSettings * settings);
+static void xfburn_settings_class_init (XfburnSettingsClass * klass, gpointer data);
+static void xfburn_settings_internal_init (XfburnSettings * settings, gpointer data);
static void xfburn_settings_finalize (GObject * object);
static void value_destroy (Setting * val);
@@ -108,7 +108,7 @@ xfburn_settings_get_type (void)
}
static void
-xfburn_settings_class_init (XfburnSettingsClass * klass)
+xfburn_settings_class_init (XfburnSettingsClass * klass, gpointer data)
{
GObjectClass *object_class = G_OBJECT_CLASS (klass);
@@ -140,7 +140,7 @@ xfburn_settings_finalize (GObject * object)
}
static void
-xfburn_settings_internal_init (XfburnSettings *settings)
+xfburn_settings_internal_init (XfburnSettings *settings, gpointer data)
{
XfburnSettingsPrivate *priv = XFBURN_SETTINGS_GET_PRIVATE (settings);
diff --git a/xfburn/xfburn-transcoder-basic.c b/xfburn/xfburn-transcoder-basic.c
index b91f3e8..aef0956 100644
--- a/xfburn/xfburn-transcoder-basic.c
+++ b/xfburn/xfburn-transcoder-basic.c
@@ -44,8 +44,8 @@
/** Prototypes **/
/* class initialization */
-static void xfburn_transcoder_basic_class_init (XfburnTranscoderBasicClass * klass);
-static void xfburn_transcoder_basic_init (XfburnTranscoderBasic * obj);
+static void xfburn_transcoder_basic_class_init (XfburnTranscoderBasicClass * klass, gpointer data);
+static void xfburn_transcoder_basic_init (XfburnTranscoderBasic * obj, gpointer data);
static void xfburn_transcoder_basic_finalize (GObject * object);
static void transcoder_interface_init (XfburnTranscoderInterface *iface, gpointer iface_data);
@@ -115,7 +115,7 @@ xfburn_transcoder_basic_get_type (void)
}
static void
-xfburn_transcoder_basic_class_init (XfburnTranscoderBasicClass * klass)
+xfburn_transcoder_basic_class_init (XfburnTranscoderBasicClass * klass, gpointer data)
{
GObjectClass *object_class = G_OBJECT_CLASS (klass);
@@ -134,7 +134,7 @@ xfburn_transcoder_basic_class_init (XfburnTranscoderBasicClass * klass)
}
static void
-xfburn_transcoder_basic_init (XfburnTranscoderBasic * obj)
+xfburn_transcoder_basic_init (XfburnTranscoderBasic * obj, gpointer data)
{
//XfburnTranscoderBasicPrivate *priv = XFBURN_TRANSCODER_BASIC_GET_PRIVATE (obj);
}
diff --git a/xfburn/xfburn-transcoder-gst.c b/xfburn/xfburn-transcoder-gst.c
index e540428..87872b8 100644
--- a/xfburn/xfburn-transcoder-gst.c
+++ b/xfburn/xfburn-transcoder-gst.c
@@ -64,8 +64,8 @@
/** Prototypes **/
/* class initialization */
-static void xfburn_transcoder_gst_class_init (XfburnTranscoderGstClass * klass);
-static void xfburn_transcoder_gst_init (XfburnTranscoderGst * obj);
+static void xfburn_transcoder_gst_class_init (XfburnTranscoderGstClass * klass, gpointer data);
+static void xfburn_transcoder_gst_init (XfburnTranscoderGst * obj, gpointer data);
static void xfburn_transcoder_gst_finalize (GObject * object);
static void transcoder_interface_init (XfburnTranscoderInterface *iface, gpointer iface_data);
@@ -190,7 +190,7 @@ xfburn_transcoder_gst_get_type (void)
}
static void
-xfburn_transcoder_gst_class_init (XfburnTranscoderGstClass * klass)
+xfburn_transcoder_gst_class_init (XfburnTranscoderGstClass * klass, gpointer data)
{
GObjectClass *object_class = G_OBJECT_CLASS (klass);
@@ -209,7 +209,7 @@ xfburn_transcoder_gst_class_init (XfburnTranscoderGstClass * klass)
}
static void
-xfburn_transcoder_gst_init (XfburnTranscoderGst * obj)
+xfburn_transcoder_gst_init (XfburnTranscoderGst * obj, gpointer data)
{
XfburnTranscoderGstPrivate *priv = XFBURN_TRANSCODER_GST_GET_PRIVATE (obj);
diff --git a/xfburn/xfburn-udev-manager.c b/xfburn/xfburn-udev-manager.c
index 0cd9567..4917755 100644
--- a/xfburn/xfburn-udev-manager.c
+++ b/xfburn/xfburn-udev-manager.c
@@ -41,8 +41,8 @@
#include "xfburn-udev-manager.h"
-static void xfburn_udev_manager_class_init (XfburnUdevManagerClass * klass);
-static void xfburn_udev_manager_init (XfburnUdevManager * obj);
+static void xfburn_udev_manager_class_init (XfburnUdevManagerClass * klass, gpointer data);
+static void xfburn_udev_manager_init (XfburnUdevManager * obj, gpointer data);
static void xfburn_udev_manager_finalize (GObject * object);
static GObject * xfburn_udev_manager_new (void);
@@ -104,7 +104,7 @@ xfburn_udev_manager_get_type (void)
}
static void
-xfburn_udev_manager_class_init (XfburnUdevManagerClass * klass)
+xfburn_udev_manager_class_init (XfburnUdevManagerClass * klass, gpointer data)
{
GObjectClass *object_class = G_OBJECT_CLASS (klass);
@@ -121,7 +121,7 @@ xfburn_udev_manager_class_init (XfburnUdevManagerClass * klass)
}
static void
-xfburn_udev_manager_init (XfburnUdevManager * obj)
+xfburn_udev_manager_init (XfburnUdevManager * obj, gpointer data)
{
XfburnUdevManagerPrivate *priv = XFBURN_UDEV_MANAGER_GET_PRIVATE (obj);
const gchar* const subsystems[] = { "block", NULL };
diff --git a/xfburn/xfburn-utils.c b/xfburn/xfburn-utils.c
index 750d9bb..629ce31 100644
--- a/xfburn/xfburn-utils.c
+++ b/xfburn/xfburn-utils.c
@@ -306,5 +306,5 @@ xfburn_create_progress_bar (const gchar *text)
gtk_progress_bar_set_show_text (pbar, TRUE);
if (text != NULL && *text != '\0')
gtk_progress_bar_set_text (pbar, text);
- return pbar;
+ return GTK_WIDGET (pbar);
}
diff --git a/xfburn/xfburn-welcome-tab.c b/xfburn/xfburn-welcome-tab.c
index fa892f7..89ab120 100644
--- a/xfburn/xfburn-welcome-tab.c
+++ b/xfburn/xfburn-welcome-tab.c
@@ -39,8 +39,8 @@
#include "xfburn-blank-dialog.h"
/* prototypes */
-static void xfburn_welcome_tab_class_init (XfburnWelcomeTabClass * klass);
-static void xfburn_welcome_tab_init (XfburnWelcomeTab * sp);
+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))
@@ -94,7 +94,7 @@ xfburn_welcome_tab_get_type (void)
}
static void
-xfburn_welcome_tab_class_init (XfburnWelcomeTabClass * klass)
+xfburn_welcome_tab_class_init (XfburnWelcomeTabClass * klass, gpointer data)
{
GObjectClass *object_class = G_OBJECT_CLASS (klass);
@@ -106,7 +106,7 @@ xfburn_welcome_tab_class_init (XfburnWelcomeTabClass * klass)
}
static void
-xfburn_welcome_tab_init (XfburnWelcomeTab * obj)
+xfburn_welcome_tab_init (XfburnWelcomeTab * obj, gpointer data)
{
XfburnWelcomeTabPrivate *priv = XFBURN_WELCOME_TAB_GET_PRIVATE (obj);
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the Xfce4-commits
mailing list