[brasero] Fix #608170 - Drive selection widget unusable from GtkBuilder



commit 13033a8a854ddff809171e66eaa113979d2c28ba
Author: Philippe Rouquier <bonfire-app wanadoo fr>
Date:   Tue Feb 23 20:57:34 2010 +0100

    Fix #608170 -  Drive selection widget unusable from GtkBuilder

 configure.in                               |    7 +++++++
 libbrasero-media/Makefile.am               |   12 +++++++-----
 libbrasero-media/brasero-drive-selection.c |    2 +-
 libbrasero-media/brasero-drive-selection.h |    3 ++-
 4 files changed, 17 insertions(+), 7 deletions(-)
---
diff --git a/configure.in b/configure.in
index 5cf1320..93a0295 100644
--- a/configure.in
+++ b/configure.in
@@ -136,6 +136,7 @@ dnl ********** Required libraries **********************
 GLIB_REQUIRED=2.22.0
 GTHREAD_REQUIRED=2.6.0
 GMODULE_REQUIRED=2.6.0
+GMODULE_EXPORT_REQUIRED=2.6.0
 GIO_REQUIRED=2.22.0
 GDK_REQUIRED=2.6.0
 GTK_REQUIRED=2.17.10
@@ -206,6 +207,12 @@ PKG_CHECK_MODULES(BRASERO_GMODULE,		\
 AC_SUBST(BRASERO_GMODULE_CFLAGS)
 AC_SUBST(BRASERO_GMODULE_LIBS)
 
+PKG_CHECK_MODULES(BRASERO_GMODULE_EXPORT,		\
+	gmodule-export-2.0 >= $GMODULE_EXPORT_REQUIRED)
+
+AC_SUBST(BRASERO_GMODULE_EXPORT_CFLAGS)
+AC_SUBST(BRASERO_GMODULE_EXPORT_LIBS)
+
 PKG_CHECK_MODULES(BRASERO_GTK,			\
 	gdk-2.0 >= $GDK_REQUIRED		\
 	gtk+-2.0 >= $GTK_REQUIRED)
diff --git a/libbrasero-media/Makefile.am b/libbrasero-media/Makefile.am
index 15394d8..f434060 100644
--- a/libbrasero-media/Makefile.am
+++ b/libbrasero-media/Makefile.am
@@ -10,6 +10,7 @@ INCLUDES = \
 	$(WARN_CFLAGS)							\
 	$(DISABLE_DEPRECATED)						\
 	$(BRASERO_GLIB_CFLAGS)						\
+	$(BRASERO_GMODULE_EXPORT_CFLAGS)					\
 	$(BRASERO_GIO_CFLAGS)						\
 	$(BRASERO_GTK_CFLAGS)
 
@@ -35,11 +36,12 @@ libbraseromediainclude_HEADERS =	\
 	brasero-medium-selection.h	\
 	brasero-drive-selection.h
 
-libbrasero_media_la_LIBADD =					\
-	$(BRASERO_GLIB_LIBS)					\
-	$(BRASERO_GTHREAD_LIBS)				\
-	$(BRASERO_GIO_LIBS)					\
-	$(BRASERO_GTK_LIBS)					\
+libbrasero_media_la_LIBADD =                                     \
+	$(BRASERO_GLIB_LIBS)                                     \
+	$(BRASERO_GMODULE_EXPORT_LIBS)                                     \
+	$(BRASERO_GTHREAD_LIBS)                                     \
+	$(BRASERO_GIO_LIBS)                                     \
+	$(BRASERO_GTK_LIBS)                                     \
 	$(BRASERO_SCSI_LIBS)
 
 libbrasero_media_la_LDFLAGS =					\
diff --git a/libbrasero-media/brasero-drive-selection.c b/libbrasero-media/brasero-drive-selection.c
index f094759..c3f5b89 100644
--- a/libbrasero-media/brasero-drive-selection.c
+++ b/libbrasero-media/brasero-drive-selection.c
@@ -82,7 +82,7 @@ enum {
 static void
 brasero_drive_selection_buildable_init (GtkBuildableIface *iface)
 {
-  parent_buildable_iface = g_type_interface_peek_parent (iface);
+	parent_buildable_iface = g_type_interface_peek_parent (iface);
 }  
 
 G_DEFINE_TYPE_WITH_CODE (BraseroDriveSelection, brasero_drive_selection, GTK_TYPE_COMBO_BOX, G_IMPLEMENT_INTERFACE (GTK_TYPE_BUILDABLE, brasero_drive_selection_buildable_init));
diff --git a/libbrasero-media/brasero-drive-selection.h b/libbrasero-media/brasero-drive-selection.h
index 723053e..56fd6b7 100644
--- a/libbrasero-media/brasero-drive-selection.h
+++ b/libbrasero-media/brasero-drive-selection.h
@@ -64,7 +64,8 @@ struct _BraseroDriveSelection
 	GtkComboBox parent_instance;
 };
 
-GType brasero_drive_selection_get_type (void) G_GNUC_CONST;
+G_MODULE_EXPORT GType brasero_drive_selection_get_type (void) G_GNUC_CONST;
+
 GtkWidget* brasero_drive_selection_new (void);
 
 BraseroDrive *



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