[network-manager-applet/lr/pkcs11] fixup! libnma: add certificate chooser button
- From: Thomas Haller <thaller src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [network-manager-applet/lr/pkcs11] fixup! libnma: add certificate chooser button
- Date: Thu, 2 Mar 2017 23:42:07 +0000 (UTC)
commit cd17ef7c98c88c24425430e708230f4451f55b82
Author: Thomas Haller <thaller redhat com>
Date: Thu Mar 2 23:44:31 2017 +0100
fixup! libnma: add certificate chooser button
src/libnma/nma-cert-chooser-button.c | 32 ++++++++++++++++----------------
1 files changed, 16 insertions(+), 16 deletions(-)
---
diff --git a/src/libnma/nma-cert-chooser-button.c b/src/libnma/nma-cert-chooser-button.c
index 88eb229..82bc279 100644
--- a/src/libnma/nma-cert-chooser-button.c
+++ b/src/libnma/nma-cert-chooser-button.c
@@ -83,7 +83,7 @@ modules_initialized (GObject *object, GAsyncResult *res, gpointer user_data)
GList *list_iter;
GError *error = NULL;
GList *modules;
- GtkTreeIter iter;
+ GtkTreeIter iter;
GtkListStore *model;
GckTokenInfo *info;
gchar *label;
@@ -145,7 +145,7 @@ modules_initialized (GObject *object, GAsyncResult *res, gpointer user_data)
static void
update_title (NMACertChooserButton *button)
{
- NMACertChooserButtonPrivate *priv = NMA_CERT_CHOOSER_BUTTON_GET_PRIVATE (button);
+ NMACertChooserButtonPrivate *priv = NMA_CERT_CHOOSER_BUTTON_GET_PRIVATE (button);
GckUriData *data;
GtkTreeIter iter;
GtkTreeModel *model;
@@ -194,7 +194,7 @@ update_title (NMACertChooserButton *button)
static void
select_from_token (NMACertChooserButton *button, GckSlot *slot)
{
- NMACertChooserButtonPrivate *priv = NMA_CERT_CHOOSER_BUTTON_GET_PRIVATE (button);
+ NMACertChooserButtonPrivate *priv = NMA_CERT_CHOOSER_BUTTON_GET_PRIVATE (button);
GtkWidget *toplevel;
GtkWidget *dialog;
@@ -212,7 +212,7 @@ select_from_token (NMACertChooserButton *button, GckSlot *slot)
_("Select"), GTK_RESPONSE_ACCEPT,
_("Cancel"), GTK_RESPONSE_CANCEL,
NULL);
- if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_ACCEPT) {
+ if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_ACCEPT) {
if (priv->uri)
g_free (priv->uri);
priv->uri = nma_pkcs11_cert_chooser_dialog_get_uri (NMA_PKCS11_CERT_CHOOSER_DIALOG (dialog));
@@ -221,7 +221,7 @@ select_from_token (NMACertChooserButton *button, GckSlot *slot)
priv->pin = nma_pkcs11_cert_chooser_dialog_get_pin (NMA_PKCS11_CERT_CHOOSER_DIALOG (dialog));
priv->remember_pin = nma_pkcs11_cert_chooser_dialog_get_remember_pin
(NMA_PKCS11_CERT_CHOOSER_DIALOG (dialog));
update_title (button);
- }
+ }
gtk_widget_destroy (dialog);
}
@@ -263,7 +263,7 @@ privkey_filter (const GtkFileFilterInfo *filter_info, gpointer user_data)
static void
select_from_file (NMACertChooserButton *button)
{
- NMACertChooserButtonPrivate *priv = NMA_CERT_CHOOSER_BUTTON_GET_PRIVATE (button);
+ NMACertChooserButtonPrivate *priv = NMA_CERT_CHOOSER_BUTTON_GET_PRIVATE (button);
GtkWidget *toplevel;
GtkWidget *dialog;
GtkFileFilter *filter;
@@ -291,7 +291,7 @@ select_from_file (NMACertChooserButton *button)
gtk_file_chooser_set_uri (GTK_FILE_CHOOSER (dialog), priv->uri);
gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_ACCEPT);
- if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_ACCEPT) {
+ if (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));
@@ -301,14 +301,14 @@ select_from_file (NMACertChooserButton *button)
}
priv->remember_pin = FALSE;
update_title (button);
- }
+ }
gtk_widget_destroy (dialog);
}
static void
dispose (GObject *object)
{
- NMACertChooserButtonPrivate *priv = NMA_CERT_CHOOSER_BUTTON_GET_PRIVATE (object);
+ NMACertChooserButtonPrivate *priv = NMA_CERT_CHOOSER_BUTTON_GET_PRIVATE (object);
GtkTreeModel *model;
model = gtk_combo_box_get_model (GTK_COMBO_BOX (object));
@@ -336,7 +336,7 @@ dispose (GObject *object)
static void
changed (GtkComboBox *combo_box)
{
- GtkTreeIter iter;
+ GtkTreeIter iter;
GtkTreeModel *model;
gchar *label;
GckSlot *slot;
@@ -406,7 +406,7 @@ row_separator (GtkTreeModel *model, GtkTreeIter *iter, gpointer data)
const gchar *
nma_cert_chooser_button_get_uri (NMACertChooserButton *button)
{
- NMACertChooserButtonPrivate *priv = NMA_CERT_CHOOSER_BUTTON_GET_PRIVATE (button);
+ NMACertChooserButtonPrivate *priv = NMA_CERT_CHOOSER_BUTTON_GET_PRIVATE (button);
return priv->uri;
}
@@ -421,7 +421,7 @@ nma_cert_chooser_button_get_uri (NMACertChooserButton *button)
void
nma_cert_chooser_button_set_uri (NMACertChooserButton *button, const gchar *uri)
{
- NMACertChooserButtonPrivate *priv = NMA_CERT_CHOOSER_BUTTON_GET_PRIVATE (button);
+ NMACertChooserButtonPrivate *priv = NMA_CERT_CHOOSER_BUTTON_GET_PRIVATE (button);
if (priv->uri)
g_free (priv->uri);
@@ -441,7 +441,7 @@ nma_cert_chooser_button_set_uri (NMACertChooserButton *button, const gchar *uri)
gchar *
nma_cert_chooser_button_get_pin (NMACertChooserButton *button)
{
- NMACertChooserButtonPrivate *priv = NMA_CERT_CHOOSER_BUTTON_GET_PRIVATE (button);
+ NMACertChooserButtonPrivate *priv = NMA_CERT_CHOOSER_BUTTON_GET_PRIVATE (button);
return g_strdup (priv->pin);
}
@@ -458,7 +458,7 @@ nma_cert_chooser_button_get_pin (NMACertChooserButton *button)
gboolean
nma_cert_chooser_button_get_remember_pin (NMACertChooserButton *button)
{
- NMACertChooserButtonPrivate *priv = NMA_CERT_CHOOSER_BUTTON_GET_PRIVATE (button);
+ NMACertChooserButtonPrivate *priv = NMA_CERT_CHOOSER_BUTTON_GET_PRIVATE (button);
return priv->remember_pin;
}
@@ -479,7 +479,7 @@ nma_cert_chooser_button_new (const gchar *title,
{
GtkWidget *self;
GtkListStore *model;
- GtkTreeIter iter;
+ GtkTreeIter iter;
GtkCellRenderer *cell;
NMACertChooserButtonPrivate *priv;
@@ -498,7 +498,7 @@ nma_cert_chooser_button_new (const gchar *title,
NULL,
NULL);
- /* The first entry with current object name. */
+ /* The first entry with current object name. */
gtk_list_store_insert_with_values (model, &iter, 0,
COLUMN_LABEL, NULL,
COLUMN_SLOT, NULL, -1);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]