[network-manager-openconnect] build: require Gtk+ 3.4
- From: Dan Winship <danw src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [network-manager-openconnect] build: require Gtk+ 3.4
- Date: Wed, 27 Feb 2013 09:29:25 +0000 (UTC)
commit b813e713a3e854a88ed3c4e1df1f3531c18a9d92
Author: Dan Winship <danw gnome org>
Date: Tue Feb 26 10:46:14 2013 +0100
build: require Gtk+ 3.4
auth-dialog/main.c | 36 ------------------------------------
configure.ac | 18 ++----------------
2 files changed, 2 insertions(+), 52 deletions(-)
---
diff --git a/auth-dialog/main.c b/auth-dialog/main.c
index bb7d111..0dee11b 100644
--- a/auth-dialog/main.c
+++ b/auth-dialog/main.c
@@ -214,11 +214,7 @@ static void ssl_box_add_error(auth_ui_data *ui_data, const char *msg)
{
GtkWidget *hbox, *text, *image;
-#if GTK_CHECK_VERSION(3,1,6)
hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 8);
-#else
- hbox = gtk_hbox_new(FALSE, 8);
-#endif
gtk_box_pack_start(GTK_BOX(ui_data->ssl_box), hbox, FALSE, FALSE, 0);
image = gtk_image_new_from_stock(GTK_STOCK_DIALOG_ERROR,
@@ -235,11 +231,7 @@ static void ssl_box_add_notice(auth_ui_data *ui_data, const char *msg)
{
GtkWidget *hbox, *text, *image;
-#if GTK_CHECK_VERSION(3,1,6)
hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 8);
-#else
- hbox = gtk_hbox_new(FALSE, 8);
-#endif
gtk_box_pack_start(GTK_BOX(ui_data->ssl_box), hbox, FALSE, FALSE, 0);
image = gtk_image_new_from_stock(GTK_STOCK_DIALOG_WARNING,
@@ -392,11 +384,7 @@ static gboolean ui_write_prompt (ui_fragment_data *data)
visible = (data->opt->type == OC_FORM_OPT_TEXT);
}
-#if GTK_CHECK_VERSION(3,1,6)
hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
-#else
- hbox = gtk_hbox_new(FALSE, 0);
-#endif
gtk_box_pack_start(GTK_BOX(data->ui_data->ssl_box), hbox, FALSE, FALSE, 0);
text = gtk_label_new(label);
@@ -434,11 +422,7 @@ static gboolean ui_add_select (ui_fragment_data *data)
struct oc_form_opt_select *sopt = (void *)data->opt;
int i;
-#if GTK_CHECK_VERSION(3,1,6)
hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
-#else
- hbox = gtk_hbox_new(FALSE, 0);
-#endif
gtk_box_pack_start(GTK_BOX(data->ui_data->ssl_box), hbox, FALSE, FALSE, 0);
text = gtk_label_new(data->opt->label);
@@ -1481,20 +1465,12 @@ static void build_main_dialog(auth_ui_data *ui_data)
G_CALLBACK(gtk_main_quit), NULL);
g_free(title);
-#if GTK_CHECK_VERSION(3,1,6)
vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 8);
-#else
- vbox = gtk_vbox_new(FALSE, 8);
-#endif
gtk_box_pack_start(GTK_BOX (gtk_dialog_get_content_area(GTK_DIALOG (ui_data->dialog))), vbox, TRUE,
TRUE, 0);
gtk_container_set_border_width(GTK_CONTAINER(vbox), 8);
gtk_widget_show(vbox);
-#if GTK_CHECK_VERSION(3,1,6)
hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 4);
-#else
- hbox = gtk_hbox_new(FALSE, 4);
-#endif
gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
gtk_widget_show(hbox);
@@ -1530,11 +1506,7 @@ static void build_main_dialog(auth_ui_data *ui_data)
gtk_widget_set_size_request(frame, -1, -1);
gtk_widget_show(frame);
-#if GTK_CHECK_VERSION(3,1,6)
frame_box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 4);
-#else
- frame_box = gtk_vbox_new(FALSE, 4);
-#endif
gtk_container_set_border_width(GTK_CONTAINER(frame_box), 8);
gtk_container_add(GTK_CONTAINER(frame), frame_box);
gtk_widget_show(frame_box);
@@ -1548,19 +1520,11 @@ static void build_main_dialog(auth_ui_data *ui_data)
gtk_widget_set_sensitive(ui_data->getting_form_label, FALSE);
gtk_box_pack_start(GTK_BOX(frame_box), ui_data->getting_form_label, FALSE, FALSE, 0);
-#if GTK_CHECK_VERSION(3,1,6)
ui_data->ssl_box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 4);
-#else
- ui_data->ssl_box = gtk_vbox_new(FALSE, 4);
-#endif
gtk_box_pack_start(GTK_BOX(frame_box), ui_data->ssl_box, FALSE, FALSE, 0);
gtk_widget_show(ui_data->ssl_box);
-#if GTK_CHECK_VERSION(3,1,6)
hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
-#else
- hbox = gtk_hbox_new (FALSE, 6);
-#endif
gtk_box_pack_end(GTK_BOX(frame_box), hbox, FALSE, FALSE, 0);
gtk_widget_show(hbox);
diff --git a/configure.ac b/configure.ac
index 03cbaec..0409fbe 100644
--- a/configure.ac
+++ b/configure.ac
@@ -66,24 +66,10 @@ AC_SUBST(DBUS_CFLAGS)
AC_SUBST(DBUS_LIBS)
if test x"$with_gnome" != xno; then
- AC_ARG_WITH([gtkver], AS_HELP_STRING([--with-gtkver], [The major version of GTK+ to build with]),
- with_gtkver="$withval",with_gtkver=0)
-
- gtk2_req=2.24
- gtk3_req=2.91.4
- case "${with_gtkver}" in
- 0) PKG_CHECK_MODULES(GTK, gtk+-3.0 > $gtk3_req, ,
- [PKG_CHECK_MODULES(GTK, gtk+-2.0 > $gtk2_req)])
- ;;
- 2) PKG_CHECK_MODULES(GTK, gtk+-2.0 >= $gtk2_req)
- ;;
- 3) PKG_CHECK_MODULES(GTK, gtk+-3.0 >= $gtk3_req)
- ;;
- *) AC_MSG_ERROR(unknown GTK+ version $with_gtkver!)
- ;;
- esac
+ PKG_CHECK_MODULES(GTK, gtk+-3.0 >= 3.4)
AC_SUBST(GTK_CFLAGS)
AC_SUBST(GTK_LIBS)
+ GTK_CFLAGS="$GTK_CFLAGS -DGDK_VERSION_MIN_REQUIRED=GDK_VERSION_3_4"
PKG_CHECK_MODULES(GNOMEKEYRING, gnome-keyring-1)
AC_SUBST(GNOMEKEYRING_CFLAGS)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]