[network-manager-applet] core: use gtk_widget_is_toplevel() when possible (bgo #610884)

[Dan Williams <dcbw src gnome org>]

commit ce77062f1ca6b0711cd5d99605fd25f68d1ae14c
Author: Martin Pitt <martin pitt ubuntu com>
Date:   Tue Feb 23 15:53:44 2010 -0800

    core: use gtk_widget_is_toplevel() when possible (bgo #610884)
    
    GTK_WIDGET_TOPLEVEL is deprecated since GTK+ 2.20.  GTK_CHECK_VERSION
    coexistence fixups by dcbw.

 src/connection-editor/ce-page.h              |    4 ++++
 src/connection-editor/page-ip4.c             |    2 +-
 src/connection-editor/page-ip6.c             |    2 +-
 src/connection-editor/page-mobile.c          |    2 +-
 src/connection-editor/page-ppp.c             |    2 +-
 src/gnome-bluetooth/network-manager-applet.c |    4 ++++
 src/wireless-security/eap-method-tls.c       |    4 ++++
 7 files changed, 16 insertions(+), 4 deletions(-)
---
diff --git a/src/connection-editor/ce-page.h b/src/connection-editor/ce-page.h
index 88d4c0b..08762e2 100644
--- a/src/connection-editor/ce-page.h
+++ b/src/connection-editor/ce-page.h
@@ -32,6 +32,10 @@
 #include <dbus/dbus-glib.h>
 #include <nm-connection.h>
 
+#if !GTK_CHECK_VERSION(2,18,0)
+#define gtk_widget_is_toplevel GTK_WIDGET_TOPLEVEL
+#endif
+
 typedef void (*PageNewConnectionResultFunc) (NMConnection *connection,
                                              gboolean canceled,
                                              GError *error,
diff --git a/src/connection-editor/page-ip4.c b/src/connection-editor/page-ip4.c
index fb2a73b..c5ae72d 100644
--- a/src/connection-editor/page-ip4.c
+++ b/src/connection-editor/page-ip4.c
@@ -575,7 +575,7 @@ routes_button_clicked_cb (GtkWidget *button, gpointer user_data)
 	char *tmp;
 
 	toplevel = gtk_widget_get_toplevel (CE_PAGE (self)->page);
-	g_return_if_fail (GTK_WIDGET_TOPLEVEL (toplevel));
+	g_return_if_fail (gtk_widget_is_toplevel (toplevel));
 
 	method = nm_setting_ip4_config_get_method (priv->setting);
 	if (!method || !strcmp (method, NM_SETTING_IP4_CONFIG_METHOD_AUTO))
diff --git a/src/connection-editor/page-ip6.c b/src/connection-editor/page-ip6.c
index 315e43c..eeeb373 100644
--- a/src/connection-editor/page-ip6.c
+++ b/src/connection-editor/page-ip6.c
@@ -552,7 +552,7 @@ routes_button_clicked_cb (GtkWidget *button, gpointer user_data)
 	char *tmp;
 
 	toplevel = gtk_widget_get_toplevel (CE_PAGE (self)->page);
-	g_return_if_fail (GTK_WIDGET_TOPLEVEL (toplevel));
+	g_return_if_fail (gtk_widget_is_toplevel (toplevel));
 
 	method = nm_setting_ip6_config_get_method (priv->setting);
 	if (!method || !strcmp (method, NM_SETTING_IP6_CONFIG_METHOD_AUTO))
diff --git a/src/connection-editor/page-mobile.c b/src/connection-editor/page-mobile.c
index 2c964e2..bdec3e5 100644
--- a/src/connection-editor/page-mobile.c
+++ b/src/connection-editor/page-mobile.c
@@ -244,7 +244,7 @@ apn_button_clicked (GtkButton *button, gpointer user_data)
 	GtkWidget *toplevel;
 
 	toplevel = gtk_widget_get_toplevel (CE_PAGE (self)->page);
-	g_return_if_fail (GTK_WIDGET_TOPLEVEL (toplevel));
+	g_return_if_fail (gtk_widget_is_toplevel (toplevel));
 
 	if (!priv->window_added) {
 		gtk_window_group_add_window (priv->window_group, GTK_WINDOW (toplevel));
diff --git a/src/connection-editor/page-ppp.c b/src/connection-editor/page-ppp.c
index 4684f38..0678c7d 100644
--- a/src/connection-editor/page-ppp.c
+++ b/src/connection-editor/page-ppp.c
@@ -177,7 +177,7 @@ auth_methods_button_clicked_cb (GtkWidget *button, gpointer user_data)
 	char *tmp;
 
 	toplevel = gtk_widget_get_toplevel (CE_PAGE (self)->page);
-	g_return_if_fail (GTK_WIDGET_TOPLEVEL (toplevel));
+	g_return_if_fail (gtk_widget_is_toplevel (toplevel));
 
 	dialog = ppp_auth_methods_dialog_new (priv->refuse_eap,
 	                                      priv->refuse_pap,
diff --git a/src/gnome-bluetooth/network-manager-applet.c b/src/gnome-bluetooth/network-manager-applet.c
index 2ca8fdd..52fff02 100644
--- a/src/gnome-bluetooth/network-manager-applet.c
+++ b/src/gnome-bluetooth/network-manager-applet.c
@@ -555,7 +555,11 @@ modem_get_all_cb (DBusGProxy *proxy, DBusGProxyCall *call, gpointer user_data)
 		info->dun_timeout_id = 0;
 
 		parent = gtk_widget_get_toplevel (info->hbox);
+#if GTK_CHECK_VERSION(2,18,0)
+		if (gtk_widget_is_toplevel (parent)) {
+#else
 		if (GTK_WIDGET_TOPLEVEL (parent)) {
+#endif
 			info->window_group = gtk_window_group_new ();
 			gtk_window_group_add_window (info->window_group, GTK_WINDOW (parent));
 		} else {
diff --git a/src/wireless-security/eap-method-tls.c b/src/wireless-security/eap-method-tls.c
index b7a2175..c0950b9 100644
--- a/src/wireless-security/eap-method-tls.c
+++ b/src/wireless-security/eap-method-tls.c
@@ -248,7 +248,11 @@ private_key_picker_helper (EAPMethod *parent, const char *filename, gboolean cha
 		GtkWindow *parent_window = NULL;
 
 		toplevel = gtk_widget_get_toplevel (parent->ui_widget);
+#if GTK_CHECK_VERSION(2,18,0)
+		if (gtk_widget_is_toplevel (toplevel))
+#else
 		if (GTK_WIDGET_TOPLEVEL (toplevel))
+#endif
 			parent_window = GTK_WINDOW (toplevel);
 
 		dialog = gtk_message_dialog_new (parent_window,