[network-manager-pptp/NM_0_8] ui: fix compilation with -DGSEAL_ENABLED
- From: Dan Williams <dcbw src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [network-manager-pptp/NM_0_8] ui: fix compilation with -DGSEAL_ENABLED
- Date: Mon, 2 Aug 2010 21:19:46 +0000 (UTC)
commit c3fab072ad6a8f259015111d86d31d9564cd60d4
Author: Dan Williams <dcbw redhat com>
Date: Mon Aug 2 16:20:57 2010 -0700
ui: fix compilation with -DGSEAL_ENABLED
configure.ac | 2 +-
properties/nm-pptp.c | 4 ++++
2 files changed, 5 insertions(+), 1 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 877d93b..a78afd3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -74,7 +74,7 @@ AC_SUBST(NM_UTILS_CFLAGS)
AC_SUBST(NM_UTILS_LIBS)
if test x"$with_gnome" != xno; then
- PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.6)
+ PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.14)
AC_SUBST(GTK_CFLAGS)
AC_SUBST(GTK_LIBS)
diff --git a/properties/nm-pptp.c b/properties/nm-pptp.c
index 62d5d48..cab601a 100644
--- a/properties/nm-pptp.c
+++ b/properties/nm-pptp.c
@@ -188,7 +188,11 @@ advanced_button_clicked_cb (GtkWidget *button, gpointer user_data)
GtkWidget *dialog, *toplevel;
toplevel = gtk_widget_get_toplevel (priv->widget);
+#if GTK_CHECK_VERSION(2,18,0)
+ g_return_if_fail (gtk_widget_is_toplevel (toplevel));
+#else
g_return_if_fail (GTK_WIDGET_TOPLEVEL (toplevel));
+#endif
dialog = advanced_dialog_new (priv->advanced);
if (!dialog) {
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]