[file-roller/wip/jtojnar/gtk4: 2/7] dlg-add: Asynchronize dialog
- From: Jan Tojnar <jtojnar src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [file-roller/wip/jtojnar/gtk4: 2/7] dlg-add: Asynchronize dialog
- Date: Tue, 21 Dec 2021 02:08:03 +0000 (UTC)
commit 55ba772f4100b6e686d2857100526cfa98f9cc3a
Author: Jan Tojnar <jtojnar gmail com>
Date: Tue Dec 21 00:06:55 2021 +0100
dlg-add: Asynchronize dialog
file_selector_response_cb is a response callback so it should not return value.
src/dlg-add.c | 21 +++++++++------------
1 file changed, 9 insertions(+), 12 deletions(-)
---
diff --git a/src/dlg-add.c b/src/dlg-add.c
index d6881d22..2395b05f 100644
--- a/src/dlg-add.c
+++ b/src/dlg-add.c
@@ -60,7 +60,7 @@ file_selector_destroy_cb (GtkWidget *widget,
static void dlg_add_folder_save_last_options (DialogData *data);
-static int
+static void
file_selector_response_cb (GtkWidget *widget,
int response,
DialogData *data)
@@ -74,13 +74,13 @@ file_selector_response_cb (GtkWidget *widget,
GList *files;
if (response == GTK_RESPONSE_NONE)
- return TRUE;
+ return;
dlg_add_folder_save_last_options (data);
if ((response == GTK_RESPONSE_CANCEL) || (response == GTK_RESPONSE_DELETE_EVENT)) {
gtk_widget_destroy (data->dialog);
- return TRUE;
+ return;
}
current_folder = fr_file_selector_dialog_get_current_folder (FR_FILE_SELECTOR_DIALOG (data->dialog));
@@ -89,9 +89,10 @@ file_selector_response_cb (GtkWidget *widget,
if (! _g_file_check_permissions (current_folder, R_OK)) {
GtkWidget *d;
- char *utf8_path;
+ g_autofree char *utf8_path;
utf8_path = g_file_get_parse_name (current_folder);
+ g_object_unref (current_folder);
d = _gtk_error_dialog_new (GTK_WINDOW (window),
GTK_DIALOG_MODAL,
@@ -99,13 +100,9 @@ file_selector_response_cb (GtkWidget *widget,
_("Could not add the files to the archive"),
_("You don’t have the right permissions to read files from folder
“%s”"),
utf8_path);
- gtk_dialog_run (GTK_DIALOG (d));
- gtk_widget_destroy (GTK_WIDGET (d));
-
- g_free (utf8_path);
- g_object_unref (current_folder);
-
- return FALSE;
+ g_signal_connect (d, "response", G_CALLBACK (gtk_widget_destroy), NULL);
+ gtk_widget_show (d);
+ return;
}
update = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (GET_WIDGET ("update_checkbutton")));
@@ -140,7 +137,7 @@ file_selector_response_cb (GtkWidget *widget,
gtk_widget_destroy (data->dialog);
- return TRUE;
+ return;
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]