Commit 13033a8a authored by Philippe Rouquier's avatar Philippe Rouquier

Fix #608170 - Drive selection widget unusable from GtkBuilder

parent 66b1f2fe
......@@ -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)
......
......@@ -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 = \
......
......@@ -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));
......
......@@ -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 *
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment