|
1 | | ---- a/src/libnma/nma-cert-chooser.c |
2 | | -+++ b/src/libnma/nma-cert-chooser.c |
| 1 | +--- a/src/nma-cert-chooser.c |
| 2 | ++++ b/src/nma-cert-chooser.c |
3 | 3 | @@ -597,7 +597,9 @@ constructor (GType type, guint n_constru |
4 | 4 | NMACertChooserPrivate *priv; |
5 | 5 | int i; |
|
10 | 10 | object = G_OBJECT_CLASS (nma_cert_chooser_parent_class)->constructor (type, |
11 | 11 | n_construct_properties, |
12 | 12 | construct_properties); |
13 | | -@@ -620,6 +622,8 @@ constructor (GType type, guint n_constru |
| 13 | +@@ -643,6 +643,8 @@ constructor (GType type, guint n_construct_properties, GObjectConstructParam *co |
14 | 14 | priv->vtable->init (cert_chooser); |
15 | 15 | priv->vtable->set_flags (cert_chooser, flags); |
16 | 16 | priv->vtable->set_title (cert_chooser, title); |
|
19 | 19 |
|
20 | 20 | return object; |
21 | 21 | } |
22 | | ---- a/src/libnma/nma-file-cert-chooser.c |
23 | | -+++ b/src/libnma/nma-file-cert-chooser.c |
| 22 | +--- a/src/nma-file-cert-chooser.c |
| 23 | ++++ b/src/nma-file-cert-chooser.c |
24 | 24 | @@ -238,6 +238,15 @@ show_toggled_cb (GtkCheckButton *button, |
25 | 25 | } |
26 | 26 |
|
|
36 | 36 | +static void |
37 | 37 | set_title (NMACertChooser *cert_chooser, const gchar *title) |
38 | 38 | { |
39 | | - NMAFileCertChooserPrivate *priv = NMA_FILE_CERT_CHOOSER_GET_PRIVATE (cert_chooser); |
40 | | -@@ -389,6 +398,7 @@ const NMACertChooserVtable nma_cert_choo |
| 39 | + NMAFileCertChooserPrivate *priv = NMA_FILE_CERT_CHOOSER_GET_PRIVATE (cert_chooser); |
| 40 | +@@ -430,6 +441,7 @@ const NMACertChooserVtable nma_cert_chooser_vtable_file = { |
| 41 | + .init = init, |
41 | 42 |
|
42 | 43 | .set_title = set_title, |
43 | | - .set_flags = set_flags, |
44 | 44 | + .set_folder = set_folder, |
| 45 | + .set_flags = set_flags, |
| 46 | + |
| 47 | + .set_cert_uri = set_cert_uri, |
| 48 | +--- a/src/nma-pkcs11-cert-chooser.c |
| 49 | ++++ b/src/nma-pkcs11-cert-chooser.c |
| 50 | +@@ -354,6 +354,15 @@ show_toggled_cb (GtkCheckButton *button, gpointer user_data) |
| 51 | + gtk_entry_set_visibility (GTK_ENTRY (priv->key_password), active); |
| 52 | + } |
| 53 | + |
| 54 | ++static void |
| 55 | ++set_folder (NMACertChooser *cert_chooser, const gchar *folder) |
| 56 | ++{ |
| 57 | ++ NMAPkcs11CertChooserPrivate *priv = NMA_PKCS11_CERT_CHOOSER_GET_PRIVATE (cert_chooser); |
| 58 | ++ |
| 59 | ++ if (folder) |
| 60 | ++ gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (priv->cert_button), folder); |
| 61 | ++} |
| 62 | ++ |
| 63 | + static void |
| 64 | + set_title (NMACertChooser *cert_chooser, const gchar *title) |
| 65 | + { |
| 66 | +@@ -536,6 +553,7 @@ const NMACertChooserVtable nma_cert_chooser_vtable_pkcs11 = { |
| 67 | + .init = init, |
45 | 68 |
|
| 69 | + .set_title = set_title, |
| 70 | ++ .set_folder = set_folder, |
| 71 | + .set_flags = set_flags, |
46 | 72 | .set_cert_uri = set_cert_uri, |
47 | 73 | .get_cert_uri = get_cert_uri, |
48 | 74 | --- a/shared/nm-default.h |
49 | 75 | +++ b/shared/nm-default.h |
50 | | -@@ -53,6 +53,9 @@ |
| 76 | +@@ -52,6 +52,9 @@ |
51 | 77 |
|
52 | 78 | #include <gtk/gtk.h> |
53 | 79 |
|
|
57 | 83 | /*****************************************************************************/ |
58 | 84 |
|
59 | 85 | #if !((NETWORKMANAGER_COMPILATION) & NM_NETWORKMANAGER_COMPILATION_LIB_LEGACY) |
60 | | ---- a/src/libnma/nma-cert-chooser-private.h |
61 | | -+++ b/src/libnma/nma-cert-chooser-private.h |
| 86 | +--- a/src/nma-cert-chooser-private.h |
| 87 | ++++ b/src/nma-cert-chooser-private.h |
62 | 88 | @@ -99,6 +99,7 @@ struct _NMACertChooserClass { |
63 | 89 | * password if one is present. |
64 | 90 | * @set_title: Setup the title property |
|
0 commit comments