[bijiben] src: Avoid deprecated gtk_show_uri()

[Jonathan Kang <jonathankang src gnome org>]

commit 5ff688e564ea2d17be4b4836307ce9c27f10c606
Author: Iñigo Martínez <inigomartinez gmail com>
Date:   Tue May 9 15:47:08 2017 +0200

    src: Avoid deprecated gtk_show_uri()
    
    Replaced deprecated gtk_show_uri by gtk_show_uri_on_window.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=771225

 src/bjb-app-menu.c                      |    6 +++++-
 src/libbiji/editor/biji-webkit-editor.c |   27 ++++++++++++++++-----------
 2 files changed, 21 insertions(+), 12 deletions(-)
---
diff --git a/src/bjb-app-menu.c b/src/bjb-app-menu.c
index c4071c5..c0828e0 100644
--- a/src/bjb-app-menu.c
+++ b/src/bjb-app-menu.c
@@ -126,7 +126,11 @@ help_activated (GSimpleAction *action,
                 gpointer       user_data)
 {
   GError *error = NULL;
-  gtk_show_uri (NULL, "help:bijiben", gtk_get_current_event_time (), &error);
+
+  gtk_show_uri_on_window (gtk_application_get_active_window (user_data),
+                          "help:bijiben",
+                          GDK_CURRENT_TIME,
+                          &error);
 
   if (error)
   {
diff --git a/src/libbiji/editor/biji-webkit-editor.c b/src/libbiji/editor/biji-webkit-editor.c
index add451f..180d8e7 100644
--- a/src/libbiji/editor/biji-webkit-editor.c
+++ b/src/libbiji/editor/biji-webkit-editor.c
@@ -332,16 +332,6 @@ on_note_color_changed (BijiNoteObj *note, BijiWebkitEditor *self)
     set_editor_color (WEBKIT_WEB_VIEW (self), &color);
 }
 
-
-static void
-open_url ( const char *uri)
-{
-  gtk_show_uri (gdk_screen_get_default (),
-                uri,
-                gtk_get_current_event_time (),
-                NULL);
-}
-
 static gboolean
 on_navigation_request (WebKitWebView           *web_view,
                        WebKitPolicyDecision    *decision,
@@ -351,6 +341,8 @@ on_navigation_request (WebKitWebView           *web_view,
   WebKitNavigationPolicyDecision *navigation_decision;
   WebKitNavigationAction *action;
   const char *requested_uri;
+  GtkWidget *toplevel;
+  GError *error = NULL;
 
   if (decision_type != WEBKIT_POLICY_DECISION_TYPE_NAVIGATION_ACTION)
     return FALSE;
@@ -361,7 +353,20 @@ on_navigation_request (WebKitWebView           *web_view,
   if (g_strcmp0 (webkit_web_view_get_uri (web_view), requested_uri) == 0)
     return FALSE;
 
-  open_url (requested_uri);
+  toplevel = gtk_widget_get_toplevel (GTK_WIDGET (web_view));
+  g_return_val_if_fail (gtk_widget_is_toplevel (toplevel), FALSE);
+
+  gtk_show_uri_on_window (GTK_WINDOW (toplevel),
+                          requested_uri,
+                          GDK_CURRENT_TIME,
+                          &error);
+
+  if (error)
+  {
+    g_warning ("%s", error->message);
+    g_error_free (error);
+  }
+
   webkit_policy_decision_ignore (decision);
   return TRUE;
 }