Commit 6956457b authored by Philippe Rouquier's avatar Philippe Rouquier

Only build against gtk+3

parent 16362e90
......@@ -206,8 +206,7 @@ PKG_CHECK_MODULES(BRASERO_GMODULE_EXPORT, \
AC_SUBST(BRASERO_GMODULE_EXPORT_CFLAGS)
AC_SUBST(BRASERO_GMODULE_EXPORT_LIBS)
PKG_CHECK_MODULES(BRASERO_SM, \
sm)
PKG_CHECK_MODULES(BRASERO_SM, sm)
AC_SUBST(BRASERO_SM_CFLAGS)
AC_SUBST(BRASERO_SM_LIBS)
......@@ -216,26 +215,9 @@ AC_SUBST(BRASERO_SM_LIBS)
# GTK+ stuff (taken and adapted from empathy)
#
AC_MSG_CHECKING([which gtk+ version to compile against])
AC_ARG_WITH([gtk],
[AS_HELP_STRING([--with-gtk=2.0|3.0],[which gtk+ version to compile against (default: 2.0)])],
[case "$with_gtk" in
2.0|3.0) ;;
*) AC_MSG_ERROR([invalid gtk version specified]) ;;
esac],
[with_gtk=2.0])
AC_MSG_RESULT([$with_gtk])
case "$with_gtk" in
2.0) GTK_API_VERSION=2.0
GTK_REQUIRED=2.21.8
BRASERO_LIBRARY_SUFFIX=
;;
3.0) GTK_API_VERSION=3.0
GTK_REQUIRED=2.90.7
BRASERO_LIBRARY_SUFFIX=3
;;
esac
GTK_API_VERSION=3.0
GTK_REQUIRED=2.91.0
BRASERO_LIBRARY_SUFFIX=3
PKG_CHECK_MODULES([BRASERO_GTK],[gtk+-$GTK_API_VERSION >= $GTK_REQUIRED])
......@@ -251,14 +233,9 @@ AC_SUBST(BRASERO_GTK_LIBS)
CANBERRA_REQUIRED=0.1
case "$with_gtk" in
2.0) PKG_CHECK_MODULES(BRASERO_CANBERRA,
libcanberra >= $CANBERRA_REQUIRED
libcanberra-gtk >= $CANBERRA_REQUIRED) ;;
3.0) PKG_CHECK_MODULES(BRASERO_CANBERRA,
PKG_CHECK_MODULES(BRASERO_CANBERRA,
libcanberra >= $CANBERRA_REQUIRED
libcanberra-gtk3 >= $CANBERRA_REQUIRED) ;;
esac
libcanberra-gtk3 >= $CANBERRA_REQUIRED)
AC_SUBST(BRASERO_CANBERRA_CFLAGS)
AC_SUBST(BRASERO_CANBERRA_LIBS)
......
......@@ -757,8 +757,8 @@ brasero_jacket_view_set_side (BraseroJacketView *self,
if (priv->side == BRASERO_JACKET_BACK) {
GtkTextBuffer *sides_buffer;
GObject *vadj;
GObject *hadj;
GtkAdjustment *vadj;
GtkAdjustment *hadj;
sides_buffer = GTK_TEXT_BUFFER (brasero_jacket_buffer_new ());
g_signal_connect (sides_buffer,
......@@ -803,7 +803,7 @@ brasero_jacket_view_set_side (BraseroJacketView *self,
G_CALLBACK (brasero_jacket_view_scrolled_cb),
priv->sides);
gtk_widget_set_scroll_adjustments (priv->sides, GTK_ADJUSTMENT (hadj), GTK_ADJUSTMENT (vadj));
gtk_widget_set_scroll_adjustments (priv->sides, hadj, vadj);
}
else
brasero_jacket_buffer_set_default_text (BRASERO_JACKET_BUFFER (buffer), _("FRONT COVER"));
......@@ -1471,8 +1471,8 @@ brasero_jacket_view_init (BraseroJacketView *object)
{
BraseroJacketViewPrivate *priv;
GtkTextBuffer *buffer;
GObject *vadj;
GObject *hadj;
GtkAdjustment *vadj;
GtkAdjustment *hadj;
priv = BRASERO_JACKET_VIEW_PRIVATE (object);
......@@ -1521,9 +1521,7 @@ brasero_jacket_view_init (BraseroJacketView *object)
priv->edit);
gtk_container_set_focus_child (GTK_CONTAINER (object), priv->edit);
gtk_widget_set_scroll_adjustments (priv->edit,
GTK_ADJUSTMENT (hadj),
GTK_ADJUSTMENT (vadj));
gtk_widget_set_scroll_adjustments (priv->edit, hadj, vadj);
}
static void
......
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