[libnma/lr/gtk-4.0: 18/23] cert-chooser-button: use GFile with GtkFileChooser
- From: Lubomir Rintel <lkundrak src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [libnma/lr/gtk-4.0: 18/23] cert-chooser-button: use GFile with GtkFileChooser
- Date: Mon, 25 Oct 2021 13:06:09 +0000 (UTC)
commit ac4344ddaf79809c28e3bc7cdf104c638205bd22
Author: Lubomir Rintel <lkundrak v3 sk>
Date: Fri Oct 8 13:45:01 2021 +0200
cert-chooser-button: use GFile with GtkFileChooser
In Gtk4 the GtkFileChooser only deals with GFile instead of URIs and
file names.
src/nma-cert-chooser-button.c | 14 +++++++++++---
1 file changed, 11 insertions(+), 3 deletions(-)
---
diff --git a/src/nma-cert-chooser-button.c b/src/nma-cert-chooser-button.c
index a6df20d5..78fb2668 100644
--- a/src/nma-cert-chooser-button.c
+++ b/src/nma-cert-chooser-button.c
@@ -304,6 +304,7 @@ select_from_file (NMACertChooserButton *button)
NMACertChooserButtonPrivate *priv = NMA_CERT_CHOOSER_BUTTON_GET_PRIVATE (button);
GtkRoot *toplevel;
GtkWidget *dialog;
+ GFile *file;
toplevel = gtk_widget_get_root (GTK_WIDGET (button));
if (toplevel && !GTK_IS_WINDOW (toplevel))
@@ -321,13 +322,20 @@ select_from_file (NMACertChooserButton *button)
else
gtk_file_chooser_set_filter (GTK_FILE_CHOOSER (dialog), utils_cert_filter ());
- if (priv->uri)
- gtk_file_chooser_set_uri (GTK_FILE_CHOOSER (dialog), priv->uri);
+ if (priv->uri) {
+ file = g_file_new_for_uri (priv->uri);
+ gtk_file_chooser_set_file (GTK_FILE_CHOOSER (dialog), file, NULL);
+ g_object_unref (file);
+ }
gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_ACCEPT);
if (nma_gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_ACCEPT) {
if (priv->uri)
g_free (priv->uri);
- priv->uri = gtk_file_chooser_get_uri (GTK_FILE_CHOOSER (dialog));
+
+ file = gtk_file_chooser_get_file (GTK_FILE_CHOOSER (dialog));
+ priv->uri = g_file_get_uri (file);
+ g_object_unref (file);
+
if (priv->pin) {
g_free (priv->pin);
priv->pin = NULL;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]