From 2f637e0646a008637d0882147fdb4dc3f4e7dbbe Mon Sep 17 00:00:00 2001
From: Andrea Zagli <azagli@libero.it>
Date: Thu, 25 Jul 2013 09:45:28 +0200
Subject: [PATCH] Changes to compile with gtk3 and libgda5.
---
configure.ac | 6 +++---
tests/query_editor.c | 6 +++---
tests/test_prefix.c | 2 --
3 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/configure.ac b/configure.ac
index 19df4b0..cc49e04 100644
--- a/configure.ac
+++ b/configure.ac
@@ -41,9 +41,9 @@ AM_GLIB_GNU_GETTEXT
# Checks for libraries.
PKG_CHECK_MODULES(GDAEX, [gmodule-2.0 >= 2
- libgda-4.0 >= 4
- gio-2.0 >= 2.24
- gtk+-2.0 >= 2.20])
+ libgda-5.0 >= 5
+ gio-2.0 >= 2.36
+ gtk+-3.0 >= 3])
AC_SUBST(GDAEX_CFLAGS)
AC_SUBST(GDAEX_LIBS)
diff --git a/tests/query_editor.c b/tests/query_editor.c
index d6a9fcc..c0dbad6 100644
--- a/tests/query_editor.c
+++ b/tests/query_editor.c
@@ -379,15 +379,15 @@ main (int argc, char *argv[])
g_signal_connect (G_OBJECT (w), "delete-event",
gtk_main_quit, NULL);
- vbox = gtk_vbox_new (FALSE, 5);
+ vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 5);
gtk_container_add (GTK_CONTAINER (w), vbox);
widget_qe = gdaex_query_editor_get_widget (qe);
gtk_box_pack_start (GTK_BOX (vbox), widget_qe, TRUE, TRUE, 5);
- hbtnbox = gtk_hbutton_box_new ();
+ hbtnbox = gtk_button_box_new (GTK_ORIENTATION_HORIZONTAL);
gtk_button_box_set_layout (GTK_BUTTON_BOX (hbtnbox), GTK_BUTTONBOX_END);
- gtk_button_box_set_spacing (GTK_BUTTON_BOX (hbtnbox), 5);
+ gtk_box_set_spacing (GTK_BOX (hbtnbox), 5);
gtk_box_pack_start (GTK_BOX (vbox), hbtnbox, FALSE, FALSE, 5);
btn_clean = gtk_button_new_from_stock ("gtk-clear");
diff --git a/tests/test_prefix.c b/tests/test_prefix.c
index 6bc1852..7411be7 100644
--- a/tests/test_prefix.c
+++ b/tests/test_prefix.c
@@ -25,8 +25,6 @@ main (int argc, char **argv)
GError *error;
GOptionContext *context;
- g_type_init ();
-
gdaex = gdaex_new_from_string (g_strdup_printf ("SQLite://DB_DIR=%s;DB_NAME=test_prefix.db", TESTSDIR));
error = NULL;
--
2.49.0