[file-roller: 1/2] fix some gtk/gdk deprecation warnings

[Paolo Bacchilega <paobac src gnome org>]

commit e895a3e6c337c4fa0248a20c9cca7ca36a008366
Author: Peter Keresztes Schmidt <carbenium outlook com>
Date:   Tue Aug 6 20:18:03 2019 +0200

    fix some gtk/gdk deprecation warnings
    
    To support the used gtk_show_uri_on_window function
    we have to bump the gtk dependency to 3.22.0.

 meson.build                   |  2 +-
 src/dlg-add.c                 |  9 ++++-----
 src/dlg-package-installer.c   |  2 +-
 src/fr-file-selector-dialog.c |  8 +-------
 src/fr-window.c               | 29 +++++------------------------
 src/gtk-utils.c               |  2 +-
 6 files changed, 13 insertions(+), 39 deletions(-)
---
diff --git a/meson.build b/meson.build
index 5a742706..99585745 100644
--- a/meson.build
+++ b/meson.build
@@ -5,7 +5,7 @@ project('file-roller', 'c',
 )
 
 glib_version = '>=2.36'
-gtk_version = '>=3.13.2'
+gtk_version = '>=3.22.0'
 nautilus_version = '>=2.22.2'
 json_glib_version = '>=0.14.0'
 libnotify_version = '>=0.4.3'
diff --git a/src/dlg-add.c b/src/dlg-add.c
index 85dfdd63..465a5f9d 100644
--- a/src/dlg-add.c
+++ b/src/dlg-add.c
@@ -73,6 +73,9 @@ file_selector_response_cb (GtkWidget    *widget,
        const char  *exclude_folders;
        GList       *files;
 
+       if (response == GTK_RESPONSE_NONE)
+               return TRUE;
+
        dlg_add_folder_save_last_options (data);
 
        if ((response == GTK_RESPONSE_CANCEL) || (response == GTK_RESPONSE_DELETE_EVENT)) {
@@ -207,11 +210,7 @@ dlg_add (FrWindow *window)
        /* add the buttons */
 
        if (! use_header)
-               gtk_box_pack_start (GTK_BOX (gtk_dialog_get_action_area (GTK_DIALOG (data->dialog))),
-                                   options_button,
-                                   FALSE,
-                                   FALSE,
-                                   0);
+               gtk_dialog_add_action_widget (GTK_DIALOG (data->dialog), options_button, GTK_RESPONSE_NONE);
 
        gtk_dialog_add_button (GTK_DIALOG (data->dialog),
                               _GTK_LABEL_CANCEL,
diff --git a/src/dlg-package-installer.c b/src/dlg-package-installer.c
index 466444c5..bb521bb4 100644
--- a/src/dlg-package-installer.c
+++ b/src/dlg-package-installer.c
@@ -175,7 +175,7 @@ install_packages (InstallerData *idata)
                if (window != NULL) {
                        GdkCursor *cursor;
 
-                       cursor = gdk_cursor_new (GDK_WATCH);
+                       cursor = gdk_cursor_new_for_display (gdk_display_get_default(), GDK_WATCH);
                        gdk_window_set_cursor (window, cursor);
 
                        g_object_unref (cursor);
diff --git a/src/fr-file-selector-dialog.c b/src/fr-file-selector-dialog.c
index 32a729ca..5c4e036a 100644
--- a/src/fr-file-selector-dialog.c
+++ b/src/fr-file-selector-dialog.c
@@ -574,13 +574,7 @@ files_treeview_button_press_event_cb (GtkWidget      *widget,
        FrFileSelectorDialog *self = user_data;
 
        if (event->button == 3) {
-               gtk_menu_popup (GTK_MENU (GET_WIDGET ("file_list_context_menu")),
-                               NULL,
-                               NULL,
-                               NULL,
-                               NULL,
-                               event->button,
-                               event->time);
+               gtk_menu_popup_at_pointer (GTK_MENU (GET_WIDGET ("file_list_context_menu")),  (GdkEvent *) 
event);
 
                return TRUE;
        }
diff --git a/src/fr-window.c b/src/fr-window.c
index f01b0996..8ff09752 100644
--- a/src/fr-window.c
+++ b/src/fr-window.c
@@ -2158,9 +2158,7 @@ show_folder (GtkWindow *parent_window,
        char   *uri;
 
        uri = g_file_get_uri (folder);
-       if (! gtk_show_uri (parent_window != NULL ? gtk_window_get_screen (parent_window) : NULL,
-                           uri,
-                           GDK_CURRENT_TIME, &error))
+       if (! gtk_show_uri_on_window (parent_window, uri, GDK_CURRENT_TIME, &error))
        {
                GtkWidget *d;
                char      *utf8_name;
@@ -2567,7 +2565,6 @@ create_the_progress_dialog (FrWindow *window)
        gtk_window_set_title (GTK_WINDOW (dialog), title);
        gtk_window_set_transient_for (GTK_WINDOW (dialog), parent);
        gtk_window_set_modal (GTK_WINDOW (dialog), (flags & GTK_DIALOG_MODAL));
-       gtk_button_box_set_layout (GTK_BUTTON_BOX (gtk_dialog_get_action_area (GTK_DIALOG (dialog))), 
GTK_BUTTONBOX_EXPAND);
        gtk_window_set_destroy_with_parent (GTK_WINDOW (dialog), (flags & GTK_DIALOG_DESTROY_WITH_PARENT));
        g_object_weak_ref (G_OBJECT (dialog), (GWeakNotify) g_object_unref, builder);
 
@@ -3617,11 +3614,7 @@ dir_tree_button_press_cb (GtkWidget      *widget,
                                gtk_tree_selection_select_iter (selection, &iter);
                        }
 
-                       gtk_menu_popup (GTK_MENU (window->priv->sidebar_folder_popup_menu),
-                                       NULL, NULL, NULL,
-                                       window,
-                                       event->button,
-                                       event->time);
+                       gtk_menu_popup_at_pointer (GTK_MENU (window->priv->sidebar_folder_popup_menu), 
(GdkEvent *) event);
                }
                else
                        gtk_tree_selection_unselect_all (selection);
@@ -3809,17 +3802,9 @@ file_button_press_cb (GtkWidget      *widget,
 
                n_selected = fr_window_get_n_selected_files (window);
                if ((n_selected == 1) && selection_has_a_dir (window))
-                       gtk_menu_popup (GTK_MENU (window->priv->folder_popup_menu),
-                                       NULL, NULL, NULL,
-                                       window,
-                                       event->button,
-                                       event->time);
+                       gtk_menu_popup_at_pointer (GTK_MENU (window->priv->folder_popup_menu),  (GdkEvent *) 
event);
                else
-                       gtk_menu_popup (GTK_MENU (window->priv->file_popup_menu),
-                                       NULL, NULL, NULL,
-                                       window,
-                                       event->button,
-                                       event->time);
+                       gtk_menu_popup_at_pointer (GTK_MENU (window->priv->file_popup_menu), (GdkEvent *) 
event);
                return TRUE;
        }
        else if ((event->type == GDK_BUTTON_PRESS) && (event->button == 1)) {
@@ -4847,11 +4832,7 @@ key_press_cb (GtkWidget   *widget,
                        if (selection == NULL)
                                return FALSE;
 
-                       gtk_menu_popup (GTK_MENU (window->priv->file_popup_menu),
-                                       NULL, NULL, NULL,
-                                       window,
-                                       3,
-                                       GDK_CURRENT_TIME);
+                       gtk_menu_popup_at_pointer (GTK_MENU (window->priv->file_popup_menu), (GdkEvent *) 
event);
                        retval = TRUE;
                }
                break;
diff --git a/src/gtk-utils.c b/src/gtk-utils.c
index ebf95bc4..5805bbb8 100644
--- a/src/gtk-utils.c
+++ b/src/gtk-utils.c
@@ -502,7 +502,7 @@ _gtk_show_help_dialog (GtkWindow  *parent,
        GError *error = NULL;
 
        uri = g_strconcat ("help:file-roller", section ? "?" : NULL, section, NULL);
-       if (! gtk_show_uri (gtk_window_get_screen (parent), uri, GDK_CURRENT_TIME, &error)) {
+       if (! gtk_show_uri_on_window (parent, uri, GDK_CURRENT_TIME, &error)) {
                GtkWidget *dialog;
 
                dialog = _gtk_message_dialog_new (parent,