commit b9ae2fd75c147988653093d0ecbf66188d81f8fc
author Adrian Johnson <ajohnson@redneon.com> Sun Oct 22 18:29:31 2017 +1030
committer Adrian Johnson <ajohnson@redneon.com> Sat Oct 28 19:54:45 2017 +1030
tree d1a2d7bcbfb524dcad2e58996ad7f668831b04dc
parent d72f0383b959d8495a452d2d32377e588b15ad65

glib demo: correct the previous warnings fix

Bug 103050

glib/demo/utils.c

diff --git a/glib/demo/utils.c b/glib/demo/utils.c
index ad9405a..aa6cd76 100644
--- a/glib/demo/utils.c
+++ b/glib/demo/utils.c
@@ -275,8 +275,11 @@
 		g_object_unref (file);
 		if (uri) {
 #if GTK_CHECK_VERSION(3, 22, 0)
-			gtk_show_uri_on_window (GTK_WINDOW(gtk_widget_get_window (button)),
-				      uri, GDK_CURRENT_TIME, NULL);
+			GtkWidget *toplevel;
+
+			toplevel = gtk_widget_get_toplevel (button);
+			gtk_show_uri_on_window (gtk_widget_is_toplevel (toplevel) ? GTK_WINDOW (toplevel) : NULL,
+						uri, GDK_CURRENT_TIME, NULL);
 #else
 			gtk_show_uri (gtk_widget_get_screen (button),
 				      uri, GDK_CURRENT_TIME, NULL);
@@ -543,13 +546,16 @@
 	g_object_unref (file);
 	if (uri) {
 #if GTK_CHECK_VERSION(3, 22, 0)
-	    gtk_show_uri_on_window (GTK_WINDOW(gtk_widget_get_window (button)),
-				    uri, GDK_CURRENT_TIME, NULL);
+		GtkWidget *toplevel;
+
+		toplevel = gtk_widget_get_toplevel (button);
+		gtk_show_uri_on_window (gtk_widget_is_toplevel (toplevel) ? GTK_WINDOW (toplevel) : NULL,
+		uri, GDK_CURRENT_TIME, NULL);
 #else
-	    gtk_show_uri (gtk_widget_get_screen (button),
-			  uri, GDK_CURRENT_TIME, NULL);
+		gtk_show_uri (gtk_widget_get_screen (button),
+			      uri, GDK_CURRENT_TIME, NULL);
 #endif
-	    g_free (uri);
+		g_free (uri);
 	}
 }