[brasero] Fix a problem that led to a crash/assert() on plugin loading/registration



commit 6f89180447842a85797ac4a4a70a362e094194b4
Author: Philippe Rouquier <bonfire-app wanadoo fr>
Date:   Thu Oct 29 16:47:40 2009 +0100

    Fix a problem that led to a crash/assert() on plugin loading/registration

 libbrasero-burn/brasero-plugin-registration.h |   42 ++++++++++++-------------
 1 files changed, 20 insertions(+), 22 deletions(-)
---
diff --git a/libbrasero-burn/brasero-plugin-registration.h b/libbrasero-burn/brasero-plugin-registration.h
index db3d706..95b629d 100644
--- a/libbrasero-burn/brasero-plugin-registration.h
+++ b/libbrasero-burn/brasero-plugin-registration.h
@@ -216,28 +216,26 @@ brasero_plugin_register (BraseroPlugin *plugin);				\
 G_MODULE_EXPORT GType								\
 brasero_plugin_register (BraseroPlugin *plugin)				\
 {														\
-	if (brasero_plugin_get_gtype (plugin) == G_TYPE_NONE) {	\
-		plugin_name##_export_caps (plugin);			\
-		static const GTypeInfo our_info = {					\
-			sizeof (PluginName##Class),					\
-			NULL,										\
-			NULL,										\
-			(GClassInitFunc)plugin_name##_class_init,			\
-			NULL,										\
-			NULL,										\
-			sizeof (PluginName),							\
-			0,											\
-			(GInstanceInitFunc)plugin_name##_init,			\
-		};												\
-		plugin_name##_type = g_type_module_register_type (G_TYPE_MODULE (plugin),		\
-								  PARENT_NAME,			\
-								  G_STRINGIFY (PluginName),		\
-								  &our_info,				\
-								  0);						\
-		return plugin_name##_type;						\
-	}													\
-	return brasero_plugin_get_gtype (plugin);				\
-}														\
+	if (brasero_plugin_get_gtype (plugin) == G_TYPE_NONE)	\
+		plugin_name##_export_caps (plugin);					\
+	static const GTypeInfo our_info = {					\
+		sizeof (PluginName##Class),					\
+		NULL,										\
+		NULL,										\
+		(GClassInitFunc)plugin_name##_class_init,			\
+		NULL,										\
+		NULL,										\
+		sizeof (PluginName),							\
+		0,											\
+		(GInstanceInitFunc)plugin_name##_init,			\
+	};												\
+	plugin_name##_type = g_type_module_register_type (G_TYPE_MODULE (plugin),		\
+							  PARENT_NAME,			\
+							  G_STRINGIFY (PluginName),		\
+							  &our_info,				\
+							  0);						\
+	return plugin_name##_type;						\
+}
 
 #define BRASERO_PLUGIN_ADD_STANDARD_CDR_FLAGS(plugin_MACRO, unsupported_MACRO)	\
 	/* Use DAO for first session since AUDIO need it to write CD-TEXT */	\



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]