[rhythmbox/deprecations: 1/13] replace gtk_show_uri() with gtk_show_uri_on_window()

[Jonathan Matthew <jmatthew src gnome org>]

commit d9e07009bf4d246cc777676ae8b658ef72ec6a66
Author: Jonathan Matthew <jonathan d14n org>
Date:   Thu Nov 14 08:48:38 2019 +1000

    replace gtk_show_uri() with gtk_show_uri_on_window()

 configure.ac                                            | 6 +++---
 plugins/audiocd/rb-audiocd-source.c                     | 4 +++-
 plugins/audioscrobbler/rb-audioscrobbler-account.c      | 5 -----
 plugins/audioscrobbler/rb-audioscrobbler-profile-page.c | 6 ++++--
 shell/rb-application.c                                  | 8 ++++----
 shell/rb-shell-preferences.c                            | 9 +++++----
 6 files changed, 19 insertions(+), 19 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 9e1ffa42d..71901276f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -42,7 +42,7 @@ m4_ifdef([LT_OUTPUT], [LT_OUTPUT])
 AC_C_BIGENDIAN
 AC_CHECK_SIZEOF(long)
 
-GTK_REQS=3.20.0
+GTK_REQS=3.22.0
 
 GST_REQS=1.4.0
 GDK_PIXBUF_REQS=2.18.0
@@ -494,8 +494,8 @@ fi
 dnl Set required and max glib/gdk versions
 AC_DEFINE(GLIB_VERSION_MIN_REQUIRED, GLIB_VERSION_2_38, [minimum glib version])
 AC_DEFINE(GLIB_VERSION_MAX_ALLOWED, GLIB_VERSION_2_38, [maximum glib version])
-AC_DEFINE(GDK_VERSION_MIN_REQUIRED, GDK_VERSION_3_16, [minimum gdk version])
-AC_DEFINE(GDK_VERSION_MAX_ALLOWED, GDK_VERSION_3_16, [maximum gdk version])
+AC_DEFINE(GDK_VERSION_MIN_REQUIRED, GDK_VERSION_3_22, [minimum gdk version])
+AC_DEFINE(GDK_VERSION_MAX_ALLOWED, GDK_VERSION_3_22, [maximum gdk version])
 
 dnl Check for -fno-strict-aliasing
 FLAGS="-fno-strict-aliasing"
diff --git a/plugins/audiocd/rb-audiocd-source.c b/plugins/audiocd/rb-audiocd-source.c
index 597cc1eff..d55045854 100644
--- a/plugins/audiocd/rb-audiocd-source.c
+++ b/plugins/audiocd/rb-audiocd-source.c
@@ -566,12 +566,14 @@ submit_info_bar_response_cb (GtkInfoBar *info_bar, gint response_id, RBAudioCdSo
 
        if (response_id == GTK_RESPONSE_OK) {
                char *submit_url;
+               GtkWidget *window;
 
                submit_url = rb_musicbrainz_create_submit_url (
                        source->priv->disc_info->musicbrainz_disc_id,
                        source->priv->disc_info->musicbrainz_full_disc_id);
 
-               if (!gtk_show_uri (NULL, submit_url, GDK_CURRENT_TIME, &error)) {
+               window = gtk_widget_get_toplevel (GTK_WIDGET (info_bar));
+               if (!gtk_show_uri_on_window (GTK_WINDOW (window), submit_url, GDK_CURRENT_TIME, &error)) {
                        rb_debug ("Could not launch submit URL %s: %s", submit_url, error->message);
                        g_error_free (error);
                }
diff --git a/plugins/audioscrobbler/rb-audioscrobbler-account.c 
b/plugins/audioscrobbler/rb-audioscrobbler-account.c
index 5f69d7273..9192c0c2d 100644
--- a/plugins/audioscrobbler/rb-audioscrobbler-account.c
+++ b/plugins/audioscrobbler/rb-audioscrobbler-account.c
@@ -54,11 +54,6 @@ struct _RBAudioscrobblerAccountPrivate
        gchar *session_key;
        RBAudioscrobblerAccountLoginStatus login_status;
 
-       /* Widgets for the prefs pane */
-       GtkWidget *config_widget;
-       GtkWidget *login_status_label;
-       GtkWidget *auth_button;
-
        /* Timeout notifications */
        guint session_key_timeout_id;
 
diff --git a/plugins/audioscrobbler/rb-audioscrobbler-profile-page.c 
b/plugins/audioscrobbler/rb-audioscrobbler-profile-page.c
index 15a20af85..f24fb1fce 100644
--- a/plugins/audioscrobbler/rb-audioscrobbler-profile-page.c
+++ b/plugins/audioscrobbler/rb-audioscrobbler-profile-page.c
@@ -1731,18 +1731,20 @@ list_item_view_url_activated_cb (GtkMenuItem *menuitem,
                                  RBAudioscrobblerProfilePage *page)
 {
        GtkWidget *menu;
+       GtkWindow *window;
        RBAudioscrobblerUserData *data;
 
        menu = gtk_widget_get_parent (GTK_WIDGET (menuitem));
+       window = GTK_WINDOW (gtk_widget_get_toplevel (menu));
        data = g_hash_table_lookup (page->priv->popup_menu_to_data_map, menu);
 
        /* some urls are given to us without the http:// prefix */
        if (g_str_has_prefix (data->url, "http://";) || g_str_has_prefix (data->url, "https://";)) {
-               gtk_show_uri (NULL, data->url, GDK_CURRENT_TIME, NULL);
+               gtk_show_uri_on_window (window, data->url, GDK_CURRENT_TIME, NULL);
        } else {
                char *url;
                url = g_strdup_printf ("%s%s", "http://";, data->url);
-               gtk_show_uri (NULL, url, GDK_CURRENT_TIME, NULL);
+               gtk_show_uri_on_window (window, url, GDK_CURRENT_TIME, NULL);
                g_free (url);
        }
 }
diff --git a/shell/rb-application.c b/shell/rb-application.c
index 37afb36fb..eef4ef6f2 100644
--- a/shell/rb-application.c
+++ b/shell/rb-application.c
@@ -221,10 +221,10 @@ help_action_cb (GSimpleAction *action, GVariant *parameters, gpointer user_data)
 
        g_object_get (app->priv->shell, "window", &window, NULL);
 
-       gtk_show_uri (gtk_widget_get_screen (GTK_WIDGET (window)),
-                     "help:rhythmbox",
-                     gtk_get_current_event_time (),
-                     &error);
+       gtk_show_uri_on_window (window,
+                               "help:rhythmbox",
+                               gtk_get_current_event_time (),
+                               &error);
 
        if (error != NULL) {
                rb_error_dialog (NULL, _("Couldn't display help"),
diff --git a/shell/rb-shell-preferences.c b/shell/rb-shell-preferences.c
index 7b91f926c..e7d9062e4 100644
--- a/shell/rb-shell-preferences.c
+++ b/shell/rb-shell-preferences.c
@@ -152,11 +152,12 @@ help_cb (GtkWidget *widget,
         RBShellPreferences *shell_preferences)
 {
        GError *error = NULL;
+       GtkWidget *window = gtk_widget_get_toplevel (widget);
 
-       gtk_show_uri (gtk_widget_get_screen (widget),
-                     "help:rhythmbox/prefs",
-                     gtk_get_current_event_time (),
-                     &error);
+       gtk_show_uri_on_window (GTK_WINDOW (window),
+                               "help:rhythmbox/prefs",
+                               gtk_get_current_event_time (),
+                               &error);
 
        if (error != NULL) {
                rb_error_dialog (NULL,