GNOME.org
 

[brasero] Silence a lot of warnings due to the fact that the *_get_type definition of objects did not include

commit e339d840707bc0086cdaaa27a720742858bfab32
Author: Philippe Rouquier <bonfire-app wanadoo fr>
Date:   Fri Oct 23 13:12:54 2009 +0200

    Silence a lot of warnings due to the fact that the *_get_type definition of objects did not include void

 libbrasero-burn/Makefile.am                   |    3 +-
 libbrasero-burn/brasero-blank-dialog.h        |    4 +-
 libbrasero-burn/brasero-burn-dialog.c         |    1 -
 libbrasero-burn/brasero-burn-dialog.h         |    2 +-
 libbrasero-burn/brasero-burn.h                |    4 +-
 libbrasero-burn/brasero-caps-burn.c           |    2 +
 libbrasero-burn/brasero-caps-plugin.c         |   13 +---
 libbrasero-burn/brasero-caps-session.c        |    1 +
 libbrasero-burn/brasero-image-type-chooser.h  |    4 +-
 libbrasero-burn/brasero-plugin-information.h  |   40 -----------
 libbrasero-burn/brasero-plugin-private.h      |   87 +++++++++++++++++++++++++
 libbrasero-burn/brasero-plugin-registration.h |   19 +++++-
 libbrasero-burn/brasero-plugin.h              |   19 ------
 libbrasero-burn/brasero-progress.h            |    4 +-
 libbrasero-burn/brasero-session.h             |    4 +-
 libbrasero-burn/brasero-sum-dialog.h          |    4 +-
 libbrasero-burn/brasero-tool-dialog.h         |    2 +-
 libbrasero-burn/brasero-tray.h                |    4 +-
 libbrasero-burn/burn-basics.c                 |    1 +
 libbrasero-burn/burn-caps.h                   |    4 +-
 libbrasero-burn/burn-debug.c                  |    2 +
 libbrasero-burn/burn-job.h                    |    2 +-
 libbrasero-burn/burn-plugin-manager.c         |    1 +
 libbrasero-burn/burn-plugin.c                 |    4 +-
 libbrasero-burn/burn-process.h                |    4 +-
 libbrasero-burn/burn-task.h                   |    4 +-
 libbrasero-media/Makefile.am                  |    2 +-
 libbrasero-utils/brasero-async-task-manager.h |   14 +++--
 libbrasero-utils/brasero-jacket-edit.c        |    1 +
 libbrasero-utils/brasero-metadata.c           |   18 ++----
 libbrasero-utils/brasero-metadata.h           |   21 ++++--
 libbrasero-utils/brasero-misc.h               |    2 +
 32 files changed, 176 insertions(+), 121 deletions(-)
---
diff --git a/libbrasero-burn/Makefile.am b/libbrasero-burn/Makefile.am
index 5322ff9..83e9d12 100644
--- a/libbrasero-burn/Makefile.am
+++ b/libbrasero-burn/Makefile.am
@@ -194,7 +194,8 @@ libbrasero_burn_la_SOURCES = 		\
 	brasero-video-options.h                 \
 	brasero-video-options.c                 \
 	brasero-session-span.h                 \
-	brasero-session-span.c
+	brasero-session-span.c                 \
+	brasero-plugin-private.h
 
 if BUILD_INOTIFY
 libbrasero_burn_la_SOURCES += brasero-file-monitor.c brasero-file-monitor.h
diff --git a/libbrasero-burn/brasero-blank-dialog.h b/libbrasero-burn/brasero-blank-dialog.h
index f6c1f87..5a45f5c 100644
--- a/libbrasero-burn/brasero-blank-dialog.h
+++ b/libbrasero-burn/brasero-blank-dialog.h
@@ -55,9 +55,9 @@ typedef struct {
 	BraseroToolDialogClass parent_class;
 } BraseroBlankDialogClass;
 
-GType brasero_blank_dialog_get_type ();
+GType brasero_blank_dialog_get_type (void);
 
-BraseroBlankDialog *brasero_blank_dialog_new ();
+BraseroBlankDialog *brasero_blank_dialog_new (void);
 
 G_END_DECLS
 
diff --git a/libbrasero-burn/brasero-burn-dialog.c b/libbrasero-burn/brasero-burn-dialog.c
index 90479ff..fa2fe43 100644
--- a/libbrasero-burn/brasero-burn-dialog.c
+++ b/libbrasero-burn/brasero-burn-dialog.c
@@ -70,7 +70,6 @@
 
 G_DEFINE_TYPE (BraseroBurnDialog, brasero_burn_dialog, GTK_TYPE_DIALOG);
 
-
 static void
 brasero_burn_dialog_cancel_clicked_cb (GtkWidget *button,
 				       BraseroBurnDialog *dialog);
diff --git a/libbrasero-burn/brasero-burn-dialog.h b/libbrasero-burn/brasero-burn-dialog.h
index b13da2f..10caa38 100644
--- a/libbrasero-burn/brasero-burn-dialog.h
+++ b/libbrasero-burn/brasero-burn-dialog.h
@@ -55,7 +55,7 @@ typedef struct {
 	GtkDialogClass parent_class;
 } BraseroBurnDialogClass;
 
-GType brasero_burn_dialog_get_type () G_GNUC_CONST;
+GType brasero_burn_dialog_get_type (void) G_GNUC_CONST;
 
 GtkWidget *brasero_burn_dialog_new (void);
 
diff --git a/libbrasero-burn/brasero-burn.h b/libbrasero-burn/brasero-burn.h
index 9f1ccf9..d730f66 100644
--- a/libbrasero-burn/brasero-burn.h
+++ b/libbrasero-burn/brasero-burn.h
@@ -86,8 +86,8 @@ typedef struct {
 									 BraseroBurnAction action);
 } BraseroBurnClass;
 
-GType brasero_burn_get_type ();
-BraseroBurn *brasero_burn_new ();
+GType brasero_burn_get_type (void);
+BraseroBurn *brasero_burn_new (void);
 
 BraseroBurnResult 
 brasero_burn_record (BraseroBurn *burn,
diff --git a/libbrasero-burn/brasero-caps-burn.c b/libbrasero-burn/brasero-caps-burn.c
index b09ebf9..ded708c 100644
--- a/libbrasero-burn/brasero-caps-burn.c
+++ b/libbrasero-burn/brasero-caps-burn.c
@@ -40,6 +40,8 @@
 #include "brasero-caps-burn.h"
 #include "burn-caps.h"
 #include "burn-debug.h"
+#include "brasero-plugin.h"
+#include "brasero-plugin-private.h"
 #include "brasero-plugin-information.h"
 #include "burn-task.h"
 #include "brasero-session-helper.h"
diff --git a/libbrasero-burn/brasero-caps-plugin.c b/libbrasero-burn/brasero-caps-plugin.c
index 4f9c4b9..edc51e5 100644
--- a/libbrasero-burn/brasero-caps-plugin.c
+++ b/libbrasero-burn/brasero-caps-plugin.c
@@ -36,14 +36,15 @@
 
 #include <glib.h>
 
-#include "brasero-plugin-information.h"
-
 #include "brasero-media.h"
 #include "brasero-media-private.h"
 
 #include "burn-caps.h"
 #include "burn-debug.h"
 
+#include "brasero-plugin-private.h"
+#include "brasero-plugin-information.h"
+
 #define SUBSTRACT(a, b)		((a) &= ~((b)&(a)))
 
 /**
@@ -850,14 +851,6 @@ brasero_plugin_check_caps (BraseroPlugin *plugin,
 	}
 }
 
-/**
- * This is to register a plugin group 
- * This function is only define here (though it's implemented in burn-plugin.c).
- */
-
-void
-brasero_plugin_set_group (BraseroPlugin *plugin, gint group_id);
-
 void
 brasero_plugin_register_group (BraseroPlugin *plugin,
 			       const gchar *name)
diff --git a/libbrasero-burn/brasero-caps-session.c b/libbrasero-burn/brasero-caps-session.c
index 7389494..54c5884 100644
--- a/libbrasero-burn/brasero-caps-session.c
+++ b/libbrasero-burn/brasero-caps-session.c
@@ -40,6 +40,7 @@
 #include "burn-caps.h"
 #include "burn-debug.h"
 #include "brasero-plugin.h"
+#include "brasero-plugin-private.h"
 #include "brasero-plugin-information.h"
 #include "brasero-session-helper.h"
 
diff --git a/libbrasero-burn/brasero-image-type-chooser.h b/libbrasero-burn/brasero-image-type-chooser.h
index e4d9a0d..cc85128 100644
--- a/libbrasero-burn/brasero-image-type-chooser.h
+++ b/libbrasero-burn/brasero-image-type-chooser.h
@@ -57,8 +57,8 @@ struct _BraseroImageTypeChooserClass {
 	GtkHBoxClass parent_class;
 };
 
-GType brasero_image_type_chooser_get_type ();
-GtkWidget *brasero_image_type_chooser_new ();
+GType brasero_image_type_chooser_get_type (void);
+GtkWidget *brasero_image_type_chooser_new (void);
 
 guint
 brasero_image_type_chooser_set_formats (BraseroImageTypeChooser *self,
diff --git a/libbrasero-burn/brasero-plugin-information.h b/libbrasero-burn/brasero-plugin-information.h
index 468d926..8603779 100644
--- a/libbrasero-burn/brasero-plugin-information.h
+++ b/libbrasero-burn/brasero-plugin-information.h
@@ -78,46 +78,6 @@ brasero_plugin_get_compulsory (BraseroPlugin *plugin);
 guint
 brasero_plugin_get_priority (BraseroPlugin *plugin);
 
-gboolean
-brasero_plugin_check_image_flags (BraseroPlugin *plugin,
-				  BraseroMedia media,
-				  BraseroBurnFlag current);
-gboolean
-brasero_plugin_check_blank_flags (BraseroPlugin *plugin,
-				  BraseroMedia media,
-				  BraseroBurnFlag current);
-gboolean
-brasero_plugin_check_record_flags (BraseroPlugin *plugin,
-				   BraseroMedia media,
-				   BraseroBurnFlag current);
-gboolean
-brasero_plugin_check_media_restrictions (BraseroPlugin *plugin,
-					 BraseroMedia media);
-
-gboolean
-brasero_plugin_get_image_flags (BraseroPlugin *plugin,
-			        BraseroMedia media,
-				BraseroBurnFlag current,
-			        BraseroBurnFlag *supported,
-			        BraseroBurnFlag *compulsory);
-gboolean
-brasero_plugin_get_blank_flags (BraseroPlugin *plugin,
-				BraseroMedia media,
-				BraseroBurnFlag current,
-				BraseroBurnFlag *supported,
-				BraseroBurnFlag *compulsory);
-gboolean
-brasero_plugin_get_record_flags (BraseroPlugin *plugin,
-				 BraseroMedia media,
-				 BraseroBurnFlag current,
-				 BraseroBurnFlag *supported,
-				 BraseroBurnFlag *compulsory);
-
-gboolean
-brasero_plugin_get_process_flags (BraseroPlugin *plugin,
-				  BraseroPluginProcessFlag *flags);
-
-
 /** 
  * This is to find out what are the capacities of a plugin 
  */
diff --git a/libbrasero-burn/brasero-plugin-private.h b/libbrasero-burn/brasero-plugin-private.h
new file mode 100644
index 0000000..bb46d15
--- /dev/null
+++ b/libbrasero-burn/brasero-plugin-private.h
@@ -0,0 +1,87 @@
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
+/*
+ * Libbrasero-burn
+ * Copyright (C) Philippe Rouquier 2005-2009 <bonfire-app wanadoo fr>
+ *
+ * Libbrasero-burn is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * The Libbrasero-burn authors hereby grant permission for non-GPL compatible
+ * GStreamer plugins to be used and distributed together with GStreamer
+ * and Libbrasero-burn. This permission is above and beyond the permissions granted
+ * by the GPL license by which Libbrasero-burn is covered. If you modify this code
+ * you may extend this exception to your version of the code, but you are not
+ * obligated to do so. If you do not wish to do so, delete this exception
+ * statement from your version.
+ * 
+ * Libbrasero-burn is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Library General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to:
+ * 	The Free Software Foundation, Inc.,
+ * 	51 Franklin Street, Fifth Floor
+ * 	Boston, MA  02110-1301, USA.
+ */
+ 
+#ifndef _BURN_PLUGIN_PRIVATE_H
+#define _BURN_PLUGIN_PRIVATE_H
+
+#include <glib.h>
+
+#include "brasero-plugin.h"
+
+G_BEGIN_DECLS
+
+BraseroPlugin *
+brasero_plugin_new (const gchar *path);
+
+void
+brasero_plugin_set_group (BraseroPlugin *plugin, gint group_id);
+
+gboolean
+brasero_plugin_get_image_flags (BraseroPlugin *plugin,
+			        BraseroMedia media,
+				BraseroBurnFlag current,
+			        BraseroBurnFlag *supported,
+			        BraseroBurnFlag *compulsory);
+gboolean
+brasero_plugin_get_blank_flags (BraseroPlugin *plugin,
+				BraseroMedia media,
+				BraseroBurnFlag current,
+				BraseroBurnFlag *supported,
+				BraseroBurnFlag *compulsory);
+gboolean
+brasero_plugin_get_record_flags (BraseroPlugin *plugin,
+				 BraseroMedia media,
+				 BraseroBurnFlag current,
+				 BraseroBurnFlag *supported,
+				 BraseroBurnFlag *compulsory);
+
+gboolean
+brasero_plugin_get_process_flags (BraseroPlugin *plugin,
+				  BraseroPluginProcessFlag *flags);
+
+gboolean
+brasero_plugin_check_image_flags (BraseroPlugin *plugin,
+				  BraseroMedia media,
+				  BraseroBurnFlag current);
+gboolean
+brasero_plugin_check_blank_flags (BraseroPlugin *plugin,
+				  BraseroMedia media,
+				  BraseroBurnFlag current);
+gboolean
+brasero_plugin_check_record_flags (BraseroPlugin *plugin,
+				   BraseroMedia media,
+				   BraseroBurnFlag current);
+gboolean
+brasero_plugin_check_media_restrictions (BraseroPlugin *plugin,
+					 BraseroMedia media);
+
+G_END_DECLS
+
+#endif
diff --git a/libbrasero-burn/brasero-plugin-registration.h b/libbrasero-burn/brasero-plugin-registration.h
index e01c2d7..f21eba3 100644
--- a/libbrasero-burn/brasero-plugin-registration.h
+++ b/libbrasero-burn/brasero-plugin-registration.h
@@ -59,6 +59,9 @@ G_BEGIN_DECLS
 #define BRASERO_PLUGIN_BLANK_FLAG_MASK	(BRASERO_BURN_FLAG_NOGRACE|		\
 					 BRASERO_BURN_FLAG_FAST_BLANK)
 
+GType
+brasero_plugin_get_gtype (BraseroPlugin *plugin);
+
 /**
  * These are the functions a plugin must implement
  */
@@ -85,6 +88,19 @@ typedef enum {
 	BRASERO_PLUGIN_IO_ACCEPT_FILE		= 1 << 1,
 } BraseroPluginIOFlag;
 
+typedef enum {
+	BRASERO_PLUGIN_RUN_NEVER		= 0,
+
+	/* pre-process initial track */
+	BRASERO_PLUGIN_RUN_PREPROCESSING	= 1,
+
+	/* run before final image/disc is created */
+	BRASERO_PLUGIN_RUN_BEFORE_TARGET	= 1 << 1,
+
+	/* run after final image/disc is created: post-processing */
+	BRASERO_PLUGIN_RUN_AFTER_TARGET		= 1 << 2,
+} BraseroPluginProcessFlag;
+
 GSList *
 brasero_caps_image_new (BraseroPluginIOFlag flags,
 			BraseroImageFormat format);
@@ -195,7 +211,8 @@ static void plugin_name##_class_init (PluginName##Class *klass);		\
 static void plugin_name##_init (PluginName *sp);				\
 static void plugin_name##_finalize (GObject *object);				\
 static BraseroBurnResult plugin_name##_export_caps (BraseroPlugin *plugin, gchar **error);	\
-										\
+G_MODULE_EXPORT GType								\
+brasero_plugin_register (BraseroPlugin *plugin, gchar **error);		\
 G_MODULE_EXPORT GType								\
 brasero_plugin_register (BraseroPlugin *plugin, gchar **error)			\
 {										\
diff --git a/libbrasero-burn/brasero-plugin.h b/libbrasero-burn/brasero-plugin.h
index c7867f3..cfea5f8 100644
--- a/libbrasero-burn/brasero-plugin.h
+++ b/libbrasero-burn/brasero-plugin.h
@@ -61,12 +61,6 @@ struct _BraseroPlugin {
 
 GType brasero_plugin_get_type (void) G_GNUC_CONST;
 
-BraseroPlugin *
-brasero_plugin_new (const gchar *path);
-
-GType
-brasero_plugin_get_gtype (BraseroPlugin *plugin);
-
 /**
  * Plugin configure options
  */
@@ -80,19 +74,6 @@ typedef enum {
 	BRASERO_PLUGIN_OPTION_CHOICE
 } BraseroPluginConfOptionType;
 
-typedef enum {
-	BRASERO_PLUGIN_RUN_NEVER		= 0,
-
-	/* pre-process initial track */
-	BRASERO_PLUGIN_RUN_PREPROCESSING	= 1,
-
-	/* run before final image/disc is created */
-	BRASERO_PLUGIN_RUN_BEFORE_TARGET	= 1 << 1,
-
-	/* run after final image/disc is created: post-processing */
-	BRASERO_PLUGIN_RUN_AFTER_TARGET		= 1 << 2,
-} BraseroPluginProcessFlag;
-
 G_END_DECLS
 
 #endif /* _BURN_PLUGIN_H_ */
diff --git a/libbrasero-burn/brasero-progress.h b/libbrasero-burn/brasero-progress.h
index 663ebc9..6636b56 100644
--- a/libbrasero-burn/brasero-progress.h
+++ b/libbrasero-burn/brasero-progress.h
@@ -59,9 +59,9 @@ typedef struct {
 	GtkVBoxClass parent_class;
 } BraseroBurnProgressClass;
 
-GType brasero_burn_progress_get_type();
+GType brasero_burn_progress_get_type (void);
 
-GtkWidget *brasero_burn_progress_new();
+GtkWidget *brasero_burn_progress_new (void);
 
 void
 brasero_burn_progress_reset (BraseroBurnProgress *progress);
diff --git a/libbrasero-burn/brasero-session.h b/libbrasero-burn/brasero-session.h
index 916ead7..c87207b 100644
--- a/libbrasero-burn/brasero-session.h
+++ b/libbrasero-burn/brasero-session.h
@@ -85,9 +85,9 @@ struct _BraseroBurnSessionClass {
 							 BraseroMedium *former_medium);
 };
 
-GType brasero_burn_session_get_type ();
+GType brasero_burn_session_get_type (void);
 
-BraseroBurnSession *brasero_burn_session_new ();
+BraseroBurnSession *brasero_burn_session_new (void);
 
 
 /**
diff --git a/libbrasero-burn/brasero-sum-dialog.h b/libbrasero-burn/brasero-sum-dialog.h
index 69997a2..5c29635 100644
--- a/libbrasero-burn/brasero-sum-dialog.h
+++ b/libbrasero-burn/brasero-sum-dialog.h
@@ -58,9 +58,9 @@ struct _BraseroSumDialogClass {
 	BraseroToolDialogClass parent_class;
 };
 
-GType brasero_sum_dialog_get_type ();
+GType brasero_sum_dialog_get_type (void);
 
-BraseroSumDialog *brasero_sum_dialog_new ();
+BraseroSumDialog *brasero_sum_dialog_new (void);
 
 G_END_DECLS
 
diff --git a/libbrasero-burn/brasero-tool-dialog.h b/libbrasero-burn/brasero-tool-dialog.h
index 7efc694..8ce1ec4 100644
--- a/libbrasero-burn/brasero-tool-dialog.h
+++ b/libbrasero-burn/brasero-tool-dialog.h
@@ -70,7 +70,7 @@ struct _BraseroToolDialogClass {
 						 BraseroMedium *medium);
 };
 
-GType brasero_tool_dialog_get_type ();
+GType brasero_tool_dialog_get_type (void);
 
 gboolean
 brasero_tool_dialog_cancel (BraseroToolDialog *dialog);
diff --git a/libbrasero-burn/brasero-tray.h b/libbrasero-burn/brasero-tray.h
index b5a299b..2d50ef5 100644
--- a/libbrasero-burn/brasero-tray.h
+++ b/libbrasero-burn/brasero-tray.h
@@ -63,8 +63,8 @@ typedef struct {
 
 } BraseroTrayIconClass;
 
-GType brasero_tray_icon_get_type ();
-BraseroTrayIcon *brasero_tray_icon_new ();
+GType brasero_tray_icon_get_type (void);
+BraseroTrayIcon *brasero_tray_icon_new (void);
 
 void
 brasero_tray_icon_set_progress (BraseroTrayIcon *tray,
diff --git a/libbrasero-burn/burn-basics.c b/libbrasero-burn/burn-basics.c
index df1d661..c59077e 100644
--- a/libbrasero-burn/burn-basics.c
+++ b/libbrasero-burn/burn-basics.c
@@ -54,6 +54,7 @@
 #include "brasero-medium-monitor.h"
 
 #include "brasero-burn-lib.h"
+#include "burn-caps.h"
 
 static BraseroPluginManager *plugin_manager = NULL;
 static BraseroMediumMonitor *medium_manager = NULL;
diff --git a/libbrasero-burn/burn-caps.h b/libbrasero-burn/burn-caps.h
index 7039812..ee72065 100644
--- a/libbrasero-burn/burn-caps.h
+++ b/libbrasero-burn/burn-caps.h
@@ -89,9 +89,9 @@ typedef struct {
 	GObjectClass parent_class;
 } BraseroBurnCapsClass;
 
-GType brasero_burn_caps_get_type();
+GType brasero_burn_caps_get_type (void);
 
-BraseroBurnCaps *brasero_burn_caps_get_default ();
+BraseroBurnCaps *brasero_burn_caps_get_default (void);
 
 gboolean
 brasero_caps_link_active (BraseroCapsLink *link);
diff --git a/libbrasero-burn/burn-debug.c b/libbrasero-burn/burn-debug.c
index 97887b2..fea0eff 100644
--- a/libbrasero-burn/burn-debug.c
+++ b/libbrasero-burn/burn-debug.c
@@ -45,6 +45,8 @@
 #include "brasero-track.h"
 #include "brasero-media.h"
 
+#include "brasero-burn-lib.h"
+
 static gboolean debug = FALSE;
 
 static const GOptionEntry options [] = {
diff --git a/libbrasero-burn/burn-job.h b/libbrasero-burn/burn-job.h
index 25b417d..59c9173 100644
--- a/libbrasero-burn/burn-job.h
+++ b/libbrasero-burn/burn-job.h
@@ -106,7 +106,7 @@ typedef struct {
 							 BraseroBurnError error);
 } BraseroJobClass;
 
-GType brasero_job_get_type ();
+GType brasero_job_get_type (void);
 
 /**
  * These functions are to be used to get information for running jobs.
diff --git a/libbrasero-burn/burn-plugin-manager.c b/libbrasero-burn/burn-plugin-manager.c
index 19b5bf8..38fb0be 100644
--- a/libbrasero-burn/burn-plugin-manager.c
+++ b/libbrasero-burn/burn-plugin-manager.c
@@ -45,6 +45,7 @@
 #include "burn-debug.h"
 #include "brasero-track.h"
 #include "brasero-plugin.h"
+#include "brasero-plugin-private.h"
 #include "brasero-plugin-information.h"
 #include "burn-plugin-manager.h"
 
diff --git a/libbrasero-burn/burn-plugin.c b/libbrasero-burn/burn-plugin.c
index fb3a554..ae35cb2 100644
--- a/libbrasero-burn/burn-plugin.c
+++ b/libbrasero-burn/burn-plugin.c
@@ -42,13 +42,15 @@
 
 #include "brasero-media-private.h"
 
+#include "brasero-media.h"
+
 #include "burn-basics.h"
 #include "burn-debug.h"
 #include "brasero-plugin.h"
+#include "brasero-plugin-private.h"
 #include "brasero-plugin-information.h"
 #include "brasero-plugin-registration.h"
 #include "burn-caps.h"
-#include "brasero-media.h"
 
 #define BRASERO_PLUGIN_PRIORITY_KEY			"/apps/brasero/config/priority"
 
diff --git a/libbrasero-burn/burn-process.h b/libbrasero-burn/burn-process.h
index e1b3a4e..04fdc09 100644
--- a/libbrasero-burn/burn-process.h
+++ b/libbrasero-burn/burn-process.h
@@ -67,7 +67,7 @@ typedef struct {
 	BraseroBurnResult      	(*post)       	(BraseroJob *job);
 } BraseroProcessClass;
 
-GType brasero_process_get_type();
+GType brasero_process_get_type (void);
 
 /**
  * This function allows to set an error that is used if the process doesn't 
@@ -88,4 +88,6 @@ void
 brasero_process_set_working_directory (BraseroProcess *process,
 				       const gchar *directory);
 
+G_END_DECLS
+
 #endif /* PROCESS_H */
diff --git a/libbrasero-burn/burn-task.h b/libbrasero-burn/burn-task.h
index 8e855f7..0526eef 100644
--- a/libbrasero-burn/burn-task.h
+++ b/libbrasero-burn/burn-task.h
@@ -59,9 +59,9 @@ struct _BraseroTaskClass {
 	BraseroTaskCtxClass parent_class;
 };
 
-GType brasero_task_get_type ();
+GType brasero_task_get_type (void);
 
-BraseroTask *brasero_task_new ();
+BraseroTask *brasero_task_new (void);
 
 void
 brasero_task_add_item (BraseroTask *task, BraseroTaskItem *item);
diff --git a/libbrasero-media/Makefile.am b/libbrasero-media/Makefile.am
index 9a978e6..d7c37f9 100644
--- a/libbrasero-media/Makefile.am
+++ b/libbrasero-media/Makefile.am
@@ -127,7 +127,7 @@ libbrasero_media_la_SOURCES =		\
 	scsi-inquiry.c         \
 	scsi-prevent-allow-medium-removal.c         \
 	scsi-inquiry.h         \
-	brasero-drive-priv.h
+	brasero-drive-priv.h         
 
 # FreeBSD's SCSI CAM interface
 if HAVE_CAM_LIB_H
diff --git a/libbrasero-utils/brasero-async-task-manager.h b/libbrasero-utils/brasero-async-task-manager.h
index ce9a91c..13f2c86 100644
--- a/libbrasero-utils/brasero-async-task-manager.h
+++ b/libbrasero-utils/brasero-async-task-manager.h
@@ -46,17 +46,19 @@ G_BEGIN_DECLS
 #define BRASERO_ASYNC_TASK_MANAGER_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), BRASERO_TYPE_ASYNC_TASK_MANAGER, BraseroAsyncTaskManagerClass))
 
 typedef struct BraseroAsyncTaskManagerPrivate BraseroAsyncTaskManagerPrivate;
+typedef struct _BraseroAsyncTaskManagerClass BraseroAsyncTaskManagerClass;
+typedef struct _BraseroAsyncTaskManager BraseroAsyncTaskManager;
 
-typedef struct {
+struct _BraseroAsyncTaskManager {
 	GObject parent;
 	BraseroAsyncTaskManagerPrivate *priv;
-} BraseroAsyncTaskManager;
+};
 
-typedef struct {
+struct _BraseroAsyncTaskManagerClass {
 	GObjectClass parent_class;
-} BraseroAsyncTaskManagerClass;
+};
 
-GType brasero_async_task_manager_get_type ();
+GType brasero_async_task_manager_get_type (void);
 
 typedef enum {
 	BRASERO_ASYNC_TASK_FINISHED		= 0,
@@ -112,4 +114,6 @@ brasero_async_task_manager_find_urgent_task (BraseroAsyncTaskManager *manager,
 					     BraseroAsyncFindTask func,
 					     gpointer user_data);
 
+G_END_DECLS
+
 #endif /* ASYNC_JOB_MANAGER_H */
diff --git a/libbrasero-utils/brasero-jacket-edit.c b/libbrasero-utils/brasero-jacket-edit.c
index 956b96d..be508c9 100644
--- a/libbrasero-utils/brasero-jacket-edit.c
+++ b/libbrasero-utils/brasero-jacket-edit.c
@@ -34,6 +34,7 @@
 
 #include <glib.h>
 #include <glib/gi18n-lib.h>
+#include <glib-object.h>
 
 #include <gtk/gtk.h>
 
diff --git a/libbrasero-utils/brasero-metadata.c b/libbrasero-utils/brasero-metadata.c
index 327be12..ee8f4db 100644
--- a/libbrasero-utils/brasero-metadata.c
+++ b/libbrasero-utils/brasero-metadata.c
@@ -46,15 +46,11 @@
 #include <gst/pbutils/missing-plugins.h>
 #include <gst/tag/tag.h>
 
-#include "brasero-metadata.h"
 #include "brasero-misc.h"
+#include "brasero-metadata.h"
 
-#define BRASERO_METADATA_INITIAL_STATE		GST_STATE_PAUSED
-
-
-G_DEFINE_TYPE(BraseroMetadata, brasero_metadata, G_TYPE_OBJECT)
-
-#define BRASERO_METADATA_SILENCE_INTERVAL		100000000
+#define BRASERO_METADATA_SILENCE_INTERVAL		100000000LL
+#define BRASERO_METADATA_INITIAL_STATE			GST_STATE_PAUSED
 
 struct BraseroMetadataPrivate {
 	GstElement *pipeline;
@@ -115,7 +111,7 @@ static guint brasero_metadata_signals [LAST_SIGNAL] = { 0 };
 	(!((flags) & BRASERO_METADATA_FLAG_SILENCES) &&				\
 	((flags) & BRASERO_METADATA_FLAG_FAST))
 
-static GObjectClass *parent_class = NULL;
+G_DEFINE_TYPE (BraseroMetadata, brasero_metadata, G_TYPE_OBJECT)
 
 static GSList *downloading = NULL;
 static GSList *downloaded = NULL;
@@ -1058,7 +1054,7 @@ brasero_metadata_install_plugins_result (GstInstallPluginsReturn res,
 	brasero_metadata_install_plugins_free_data (downloads);
 }
 
-BraseroMetadataGstDownload *
+static BraseroMetadataGstDownload *
 brasero_metadata_is_downloading (const gchar *detail)
 {
 	GSList *iter;
@@ -2031,7 +2027,7 @@ brasero_metadata_finalize (GObject *object)
 		priv->mutex = NULL;
 	}
 
-	G_OBJECT_CLASS (parent_class)->finalize (object);
+	G_OBJECT_CLASS (brasero_metadata_parent_class)->finalize (object);
 }
 
 static void
@@ -2095,8 +2091,6 @@ brasero_metadata_class_init (BraseroMetadataClass *klass)
 {
 	GObjectClass *object_class = G_OBJECT_CLASS (klass);
 
-	parent_class = g_type_class_peek_parent (klass);
-
 	g_type_class_add_private (klass, sizeof (BraseroMetadataPrivate));
 
 	object_class->finalize = brasero_metadata_finalize;
diff --git a/libbrasero-utils/brasero-metadata.h b/libbrasero-utils/brasero-metadata.h
index 87f71ce..11349b3 100644
--- a/libbrasero-utils/brasero-metadata.h
+++ b/libbrasero-utils/brasero-metadata.h
@@ -28,8 +28,8 @@
  * 	Boston, MA  02110-1301, USA.
  */
 
-#ifndef METADATA_H
-#define METADATA_H
+#ifndef _METADATA_H
+#define _METADATA_H
 
 #include <glib.h>
 #include <glib-object.h>
@@ -93,11 +93,10 @@ brasero_metadata_info_clear (BraseroMetadataInfo *info);
 void
 brasero_metadata_info_free (BraseroMetadataInfo *info);
 
-typedef struct {
-	GObject parent;
-} BraseroMetadata;
+typedef struct _BraseroMetadataClass BraseroMetadataClass;
+typedef struct _BraseroMetadata BraseroMetadata;
 
-typedef struct {
+struct _BraseroMetadataClass {
 	GObjectClass parent_class;
 
 	void		(*completed)	(BraseroMetadata *meta,
@@ -105,9 +104,14 @@ typedef struct {
 	void		(*progress)	(BraseroMetadata *meta,
 					 gdouble progress);
 
-} BraseroMetadataClass;
+};
+
+struct _BraseroMetadata {
+	GObject parent;
+};
+
+GType brasero_metadata_get_type (void) G_GNUC_CONST;
 
-GType brasero_metadata_get_type ();
 BraseroMetadata *brasero_metadata_new (void);
 
 gboolean
@@ -143,5 +147,6 @@ gboolean
 brasero_metadata_get_result (BraseroMetadata *metadata,
 			     BraseroMetadataInfo *info,
 			     GError **error);
+G_END_DECLS
 
 #endif				/* METADATA_H */
diff --git a/libbrasero-utils/brasero-misc.h b/libbrasero-utils/brasero-misc.h
index 37fdda3..f3a008a 100644
--- a/libbrasero-utils/brasero-misc.h
+++ b/libbrasero-utils/brasero-misc.h
@@ -75,6 +75,8 @@ brasero_utils_debug_message (const gchar *domain,
 	g_free (escaped_basename);						\
 }
 
+void
+brasero_utils_init (void);
 
 gchar *
 brasero_utils_get_uri_name (const gchar *uri);
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]