From cd53ba990035bdb4861d9660917d457533d4ecb2 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sat, 11 Sep 2010 14:56:28 -0400 Subject: Coding style cleanups. --- smime/gui/ca-trust-dialog.c | 6 ++-- smime/gui/cert-trust-dialog.c | 32 +++++++++---------- smime/gui/certificate-manager.c | 66 +++++++++++++++++++------------------- smime/gui/e-cert-selector.c | 70 ++++++++++++++++++++--------------------- 4 files changed, 87 insertions(+), 87 deletions(-) (limited to 'smime/gui') diff --git a/smime/gui/ca-trust-dialog.c b/smime/gui/ca-trust-dialog.c index 47f4d5db81..a8169dd2e7 100644 --- a/smime/gui/ca-trust-dialog.c +++ b/smime/gui/ca-trust-dialog.c @@ -54,7 +54,7 @@ free_data (gpointer data) } static void -catd_response(GtkWidget *w, guint id, CATrustDialogData *data) +catd_response (GtkWidget *w, guint id, CATrustDialogData *data) { switch (id) { case GTK_RESPONSE_ACCEPT: { @@ -102,8 +102,8 @@ ca_trust_dialog_show (ECert *cert, gboolean importing) w = e_builder_get_widget(ctd_data->builder, "ca-trust-label"); txt = g_strdup_printf(_("Certificate '%s' is a CA certificate.\n\nEdit trust settings:"), e_cert_get_cn(cert)); - gtk_label_set_text((GtkLabel *)w, txt); - g_free(txt); + gtk_label_set_text ((GtkLabel *)w, txt); + g_free (txt); g_signal_connect (ctd_data->dialog, "response", G_CALLBACK (catd_response), ctd_data); diff --git a/smime/gui/cert-trust-dialog.c b/smime/gui/cert-trust-dialog.c index 9c87c666ab..cfd8ce464f 100644 --- a/smime/gui/cert-trust-dialog.c +++ b/smime/gui/cert-trust-dialog.c @@ -60,20 +60,20 @@ free_data (gpointer data) } static void -ctd_response(GtkWidget *w, guint id, CertTrustDialogData *data) +ctd_response (GtkWidget *w, guint id, CertTrustDialogData *data) { CERTCertTrust trust; CERTCertificate *icert; switch (id) { case GTK_RESPONSE_OK: - icert = e_cert_get_internal_cert(data->cert); - e_cert_trust_init(&trust); - e_cert_trust_set_valid_peer(&trust); + icert = e_cert_get_internal_cert (data->cert); + e_cert_trust_init (&trust); + e_cert_trust_set_valid_peer (&trust); e_cert_trust_add_peer_trust (&trust, FALSE, - gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON (data->trust_button)), + gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (data->trust_button)), FALSE); - CERT_ChangeCertTrust (CERT_GetDefaultCertDB(), icert, &trust); + CERT_ChangeCertTrust (CERT_GetDefaultCertDB (), icert, &trust); break; case GTK_RESPONSE_ACCEPT: { /* just *what on earth* was chris thinking here!?!?! copied from certificate-manager.c */ @@ -101,7 +101,7 @@ ctd_response(GtkWidget *w, guint id, CertTrustDialogData *data) trust_email, trust_objsign); - CERT_ChangeCertTrust(CERT_GetDefaultCertDB(), icert, &trust); + CERT_ChangeCertTrust (CERT_GetDefaultCertDB (), icert, &trust); } gtk_widget_destroy (dialog); @@ -122,7 +122,7 @@ cert_trust_dialog_show (ECert *cert) ctd_data->dialog = e_builder_get_widget (ctd_data->builder, "cert-trust-dialog"); ctd_data->cert = g_object_ref (cert); - ctd_data->cacert = e_cert_get_ca_cert(cert); + ctd_data->cacert = e_cert_get_ca_cert (cert); ctd_data->trust_button = e_builder_get_widget(ctd_data->builder, "cert-trust"); ctd_data->notrust_button = e_builder_get_widget(ctd_data->builder, "cert-notrust"); @@ -132,19 +132,19 @@ cert_trust_dialog_show (ECert *cert) g_object_set_data_full (G_OBJECT (ctd_data->dialog), "CertTrustDialogData", ctd_data, free_data); - icert = e_cert_get_internal_cert(cert); - if (e_cert_trust_has_trusted_peer(icert->trust, FALSE, TRUE, FALSE)) - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON (ctd_data->trust_button), TRUE); + icert = e_cert_get_internal_cert (cert); + if (e_cert_trust_has_trusted_peer (icert->trust, FALSE, TRUE, FALSE)) + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (ctd_data->trust_button), TRUE); else - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON (ctd_data->notrust_button), TRUE); + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (ctd_data->notrust_button), TRUE); - icert = e_cert_get_internal_cert(ctd_data->cacert); - if (e_cert_trust_has_trusted_ca(icert->trust, FALSE, TRUE, FALSE)) - gtk_label_set_text((GtkLabel *)ctd_data->label, + icert = e_cert_get_internal_cert (ctd_data->cacert); + if (e_cert_trust_has_trusted_ca (icert->trust, FALSE, TRUE, FALSE)) + gtk_label_set_text ((GtkLabel *)ctd_data->label, _("Because you trust the certificate authority that issued this certificate, " "then you trust the authenticity of this certificate unless otherwise indicated here")); else - gtk_label_set_text((GtkLabel *)ctd_data->label, + gtk_label_set_text ((GtkLabel *)ctd_data->label, _("Because you do not trust the certificate authority that issued this certificate, " "then you do not trust the authenticity of this certificate unless otherwise indicated here")); diff --git a/smime/gui/certificate-manager.c b/smime/gui/certificate-manager.c index d0823b8acb..103b319ec3 100644 --- a/smime/gui/certificate-manager.c +++ b/smime/gui/certificate-manager.c @@ -153,7 +153,7 @@ import_your (GtkWidget *widget, CertificateManagerData *cfm) NULL); gtk_dialog_set_default_response (GTK_DIALOG (filesel), GTK_RESPONSE_OK); - filter = gtk_file_filter_new(); + filter = gtk_file_filter_new (); gtk_file_filter_set_name (filter, _("All PKCS12 files")); gtk_file_filter_add_mime_type (filter, "application/x-x509-user-cert"); gtk_file_filter_add_mime_type (filter, "application/x-pkcs12"); @@ -192,7 +192,7 @@ delete_your (GtkWidget *widget, CertificateManagerData *cfm) { GtkTreeIter iter; - if (gtk_tree_selection_get_selected (gtk_tree_view_get_selection (GTK_TREE_VIEW(cfm->yourcerts_treeview)), + if (gtk_tree_selection_get_selected (gtk_tree_view_get_selection (GTK_TREE_VIEW (cfm->yourcerts_treeview)), NULL, &iter)) { ECert *cert; @@ -227,7 +227,7 @@ view_your (GtkWidget *widget, CertificateManagerData *cfm) { GtkTreeIter iter; - if (gtk_tree_selection_get_selected (gtk_tree_view_get_selection (GTK_TREE_VIEW(cfm->yourcerts_treeview)), + if (gtk_tree_selection_get_selected (gtk_tree_view_get_selection (GTK_TREE_VIEW (cfm->yourcerts_treeview)), NULL, &iter)) { ECert *cert; @@ -353,7 +353,7 @@ initialize_yourcerts_ui (CertificateManagerData *cfm) cell, "text", 0, NULL); - gtk_tree_view_column_set_resizable(column, TRUE); + gtk_tree_view_column_set_resizable (column, TRUE); gtk_tree_view_append_column (GTK_TREE_VIEW (cfm->yourcerts_treeview), column); gtk_tree_view_column_set_sort_column_id (column, 0); @@ -362,7 +362,7 @@ initialize_yourcerts_ui (CertificateManagerData *cfm) cell, "text", 1, NULL); - gtk_tree_view_column_set_resizable(column, TRUE); + gtk_tree_view_column_set_resizable (column, TRUE); gtk_tree_view_append_column (GTK_TREE_VIEW (cfm->yourcerts_treeview), column); gtk_tree_view_column_set_sort_column_id (column, 1); @@ -407,7 +407,7 @@ view_contact (GtkWidget *widget, CertificateManagerData *cfm) { GtkTreeIter iter; - if (gtk_tree_selection_get_selected (gtk_tree_view_get_selection (GTK_TREE_VIEW(cfm->contactcerts_treeview)), + if (gtk_tree_selection_get_selected (gtk_tree_view_get_selection (GTK_TREE_VIEW (cfm->contactcerts_treeview)), NULL, &iter)) { ECert *cert; @@ -431,7 +431,7 @@ edit_contact (GtkWidget *widget, CertificateManagerData *cfm) { GtkTreeIter iter; - if (gtk_tree_selection_get_selected (gtk_tree_view_get_selection (GTK_TREE_VIEW(cfm->contactcerts_treeview)), + if (gtk_tree_selection_get_selected (gtk_tree_view_get_selection (GTK_TREE_VIEW (cfm->contactcerts_treeview)), NULL, &iter)) { ECert *cert; @@ -465,7 +465,7 @@ import_contact (GtkWidget *widget, CertificateManagerData *cfm) NULL); gtk_dialog_set_default_response (GTK_DIALOG (filesel), GTK_RESPONSE_OK); - filter = gtk_file_filter_new(); + filter = gtk_file_filter_new (); gtk_file_filter_set_name (filter, _("All email certificate files")); gtk_file_filter_add_mime_type (filter, "application/x-x509-email-cert"); gtk_file_filter_add_mime_type (filter, "application/x-x509-ca-cert"); @@ -514,7 +514,7 @@ delete_contact (GtkWidget *widget, CertificateManagerData *cfm) { GtkTreeIter iter; - if (gtk_tree_selection_get_selected (gtk_tree_view_get_selection (GTK_TREE_VIEW(cfm->contactcerts_treeview)), + if (gtk_tree_selection_get_selected (gtk_tree_view_get_selection (GTK_TREE_VIEW (cfm->contactcerts_treeview)), NULL, &iter)) { ECert *cert; @@ -575,7 +575,7 @@ initialize_contactcerts_ui (CertificateManagerData *cfm) cell, "text", 0, NULL); - gtk_tree_view_column_set_resizable(column, TRUE); + gtk_tree_view_column_set_resizable (column, TRUE); gtk_tree_view_append_column (GTK_TREE_VIEW (cfm->contactcerts_treeview), column); gtk_tree_view_column_set_sort_column_id (column, 0); @@ -584,7 +584,7 @@ initialize_contactcerts_ui (CertificateManagerData *cfm) cell, "text", 1, NULL); - gtk_tree_view_column_set_resizable(column, TRUE); + gtk_tree_view_column_set_resizable (column, TRUE); gtk_tree_view_append_column (GTK_TREE_VIEW (cfm->contactcerts_treeview), column); gtk_tree_view_column_set_sort_column_id (column, 1); @@ -593,7 +593,7 @@ initialize_contactcerts_ui (CertificateManagerData *cfm) cell, "text", 2, NULL); - gtk_tree_view_column_set_resizable(column, TRUE); + gtk_tree_view_column_set_resizable (column, TRUE); gtk_tree_view_append_column (GTK_TREE_VIEW (cfm->contactcerts_treeview), column); gtk_tree_view_column_set_sort_column_id (column, 2); @@ -622,7 +622,7 @@ view_ca (GtkWidget *widget, CertificateManagerData *cfm) { GtkTreeIter iter; - if (gtk_tree_selection_get_selected (gtk_tree_view_get_selection (GTK_TREE_VIEW(cfm->authoritycerts_treeview)), + if (gtk_tree_selection_get_selected (gtk_tree_view_get_selection (GTK_TREE_VIEW (cfm->authoritycerts_treeview)), NULL, &iter)) { ECert *cert; @@ -646,7 +646,7 @@ edit_ca (GtkWidget *widget, CertificateManagerData *cfm) { GtkTreeIter iter; - if (gtk_tree_selection_get_selected (gtk_tree_view_get_selection (GTK_TREE_VIEW(cfm->authoritycerts_treeview)), + if (gtk_tree_selection_get_selected (gtk_tree_view_get_selection (GTK_TREE_VIEW (cfm->authoritycerts_treeview)), NULL, &iter)) { ECert *cert; @@ -679,7 +679,7 @@ edit_ca (GtkWidget *widget, CertificateManagerData *cfm) trust_email, trust_objsign); - CERT_ChangeCertTrust (CERT_GetDefaultCertDB(), icert, &trust); + CERT_ChangeCertTrust (CERT_GetDefaultCertDB (), icert, &trust); } gtk_widget_destroy (dialog); @@ -702,7 +702,7 @@ import_ca (GtkWidget *widget, CertificateManagerData *cfm) NULL); gtk_dialog_set_default_response (GTK_DIALOG (filesel), GTK_RESPONSE_OK); - filter = gtk_file_filter_new(); + filter = gtk_file_filter_new (); gtk_file_filter_set_name (filter, _("All CA certificate files")); gtk_file_filter_add_mime_type (filter, "application/x-x509-ca-cert"); gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (filesel), filter); @@ -749,7 +749,7 @@ delete_ca (GtkWidget *widget, CertificateManagerData *cfm) { GtkTreeIter iter; - if (gtk_tree_selection_get_selected (gtk_tree_view_get_selection (GTK_TREE_VIEW(cfm->authoritycerts_treeview)), + if (gtk_tree_selection_get_selected (gtk_tree_view_get_selection (GTK_TREE_VIEW (cfm->authoritycerts_treeview)), NULL, &iter)) { ECert *cert; @@ -858,17 +858,17 @@ add_user_cert (CertificateManagerData *cfm, ECert *cert) if (e_cert_get_cn (cert)) gtk_tree_store_set (GTK_TREE_STORE (model), &iter, 0, e_cert_get_cn (cert), - 1, e_cert_get_usage(cert), - 2, e_cert_get_serial_number(cert), - 3, e_cert_get_expires_on(cert), + 1, e_cert_get_usage (cert), + 2, e_cert_get_serial_number (cert), + 3, e_cert_get_expires_on (cert), 4, cert, -1); else gtk_tree_store_set (GTK_TREE_STORE (model), &iter, 0, e_cert_get_nickname (cert), - 1, e_cert_get_usage(cert), - 2, e_cert_get_serial_number(cert), - 3, e_cert_get_expires_on(cert), + 1, e_cert_get_usage (cert), + 2, e_cert_get_serial_number (cert), + 3, e_cert_get_expires_on (cert), 4, cert, -1); } @@ -903,14 +903,14 @@ add_contact_cert (CertificateManagerData *cfm, ECert *cert) gtk_tree_store_set (GTK_TREE_STORE (model), &iter, 0, e_cert_get_cn (cert), 1, e_cert_get_email (cert), - 2, e_cert_get_usage(cert), + 2, e_cert_get_usage (cert), 3, cert, -1); else gtk_tree_store_set (GTK_TREE_STORE (model), &iter, 0, e_cert_get_nickname (cert), 1, e_cert_get_email (cert), - 2, e_cert_get_usage(cert), + 2, e_cert_get_usage (cert), 3, cert, -1); } @@ -1052,9 +1052,9 @@ load_certs (CertificateManagerData *cfm, certList = PK11_ListCerts (PK11CertListUnique, NULL); - for (node = CERT_LIST_HEAD(certList); - !CERT_LIST_END(node, certList); - node = CERT_LIST_NEXT(node)) { + for (node = CERT_LIST_HEAD (certList); + !CERT_LIST_END (node, certList); + node = CERT_LIST_NEXT (node)) { ECert *cert = e_cert_new (CERT_DupCertificate ((CERTCertificate*)node->cert)); ECertType ct = e_cert_get_cert_type (cert); @@ -1135,9 +1135,9 @@ certificate_manager_config_new (EPreferencesWindow *window) cfm_data->import_ca_button = e_builder_get_widget (cfm_data->builder, "authority-import-button"); cfm_data->delete_ca_button = e_builder_get_widget (cfm_data->builder, "authority-delete-button"); - initialize_yourcerts_ui(cfm_data); - initialize_contactcerts_ui(cfm_data); - initialize_authoritycerts_ui(cfm_data); + initialize_yourcerts_ui (cfm_data); + initialize_contactcerts_ui (cfm_data); + initialize_authoritycerts_ui (cfm_data); /* Run this in an idle callback so Evolution has a chance to * fully initialize itself and start its main loop before we @@ -1152,8 +1152,8 @@ certificate_manager_config_new (EPreferencesWindow *window) gtk_container_remove (GTK_CONTAINER (parent), widget); /* FIXME: remove when implemented */ - gtk_widget_set_sensitive(cfm_data->backup_your_button, FALSE); - gtk_widget_set_sensitive(cfm_data->backup_all_your_button, FALSE); + gtk_widget_set_sensitive (cfm_data->backup_your_button, FALSE); + gtk_widget_set_sensitive (cfm_data->backup_all_your_button, FALSE); return widget; } diff --git a/smime/gui/e-cert-selector.c b/smime/gui/e-cert-selector.c index 71f2c00504..064b31f90e 100644 --- a/smime/gui/e-cert-selector.c +++ b/smime/gui/e-cert-selector.c @@ -63,46 +63,46 @@ Issued by: */ static CERTCertListNode * -ecs_find_current(ECertSelector *ecs) +ecs_find_current (ECertSelector *ecs) { struct _ECertSelectorPrivate *p = ecs->priv; CERTCertListNode *node; gint n; - if (p->certlist == NULL || CERT_LIST_EMPTY(p->certlist)) + if (p->certlist == NULL || CERT_LIST_EMPTY (p->certlist)) return NULL; n = gtk_combo_box_get_active (GTK_COMBO_BOX (p->combobox)); - node = CERT_LIST_HEAD(p->certlist); - while (n>0 && !CERT_LIST_END(node, p->certlist)) { + node = CERT_LIST_HEAD (p->certlist); + while (n>0 && !CERT_LIST_END (node, p->certlist)) { n--; - node = CERT_LIST_NEXT(node); + node = CERT_LIST_NEXT (node); } - g_return_val_if_fail (!CERT_LIST_END(node, p->certlist), NULL); + g_return_val_if_fail (!CERT_LIST_END (node, p->certlist), NULL); return node; } static void -e_cert_selector_response(GtkDialog *dialog, gint button) +e_cert_selector_response (GtkDialog *dialog, gint button) { CERTCertListNode *node; switch (button) { case GTK_RESPONSE_OK: - node = ecs_find_current((ECertSelector *)dialog); + node = ecs_find_current ((ECertSelector *)dialog); break; default: node = NULL; break; } - g_signal_emit(dialog, ecs_signals[ECS_SELECTED], 0, node?node->cert->nickname:NULL); + g_signal_emit (dialog, ecs_signals[ECS_SELECTED], 0, node?node->cert->nickname:NULL); } static void -ecs_cert_changed(GtkWidget *w, ECertSelector *ecs) +ecs_cert_changed (GtkWidget *w, ECertSelector *ecs) { struct _ECertSelectorPrivate *p = ecs->priv; CERTCertListNode *node; @@ -110,16 +110,16 @@ ecs_cert_changed(GtkWidget *w, ECertSelector *ecs) GString *text; text = g_string_new(""); - node = ecs_find_current(ecs); + node = ecs_find_current (ecs); if (node) { /* FIXME: add serial no, validity date, uses */ g_string_append_printf(text, _("Issued to:\n Subject: %s\n"), node->cert->subjectName); g_string_append_printf(text, _("Issued by:\n Subject: %s\n"), node->cert->issuerName); } - buffer = gtk_text_view_get_buffer((GtkTextView *)p->description); - gtk_text_buffer_set_text(buffer, text->str, text->len); - g_string_free(text, TRUE); + buffer = gtk_text_view_get_buffer ((GtkTextView *)p->description); + gtk_text_buffer_set_text (buffer, text->str, text->len); + g_string_free (text, TRUE); } /** @@ -140,7 +140,7 @@ ecs_cert_changed(GtkWidget *w, ECertSelector *ecs) * Return value: A dialogue to be shown. **/ GtkWidget * -e_cert_selector_new(gint type, const gchar *currentid) +e_cert_selector_new (gint type, const gchar *currentid) { ECertSelector *ecs; struct _ECertSelectorPrivate *p; @@ -152,7 +152,7 @@ e_cert_selector_new(gint type, const gchar *currentid) GtkWidget *w; gint n=0, active=0; - ecs = g_object_new(e_cert_selector_get_type(), NULL); + ecs = g_object_new (e_cert_selector_get_type (), NULL); p = ecs->priv; builder = gtk_builder_new (); @@ -178,23 +178,23 @@ e_cert_selector_new(gint type, const gchar *currentid) gtk_list_store_clear (GTK_LIST_STORE (gtk_combo_box_get_model (GTK_COMBO_BOX (p->combobox)))); - certlist = CERT_FindUserCertsByUsage(CERT_GetDefaultCertDB(), usage, FALSE, TRUE, NULL); + certlist = CERT_FindUserCertsByUsage (CERT_GetDefaultCertDB (), usage, FALSE, TRUE, NULL); ecs->priv->certlist = certlist; if (certlist != NULL) { - node = CERT_LIST_HEAD(certlist); - while (!CERT_LIST_END(node, certlist)) { + node = CERT_LIST_HEAD (certlist); + while (!CERT_LIST_END (node, certlist)) { if (node->cert->nickname || node->cert->emailAddr) { gtk_combo_box_append_text (GTK_COMBO_BOX (p->combobox), node->cert->nickname?node->cert->nickname:node->cert->emailAddr); if (currentid != NULL - && ((node->cert->nickname != NULL && strcmp(node->cert->nickname, currentid) == 0) - || (node->cert->emailAddr != NULL && strcmp(node->cert->emailAddr, currentid) == 0))) + && ((node->cert->nickname != NULL && strcmp (node->cert->nickname, currentid) == 0) + || (node->cert->emailAddr != NULL && strcmp (node->cert->emailAddr, currentid) == 0))) active = n; n++; } - node = CERT_LIST_NEXT(node); + node = CERT_LIST_NEXT (node); } } @@ -202,47 +202,47 @@ e_cert_selector_new(gint type, const gchar *currentid) g_signal_connect (p->combobox, "changed", G_CALLBACK(ecs_cert_changed), ecs); - g_object_unref(builder); + g_object_unref (builder); - ecs_cert_changed(p->combobox, ecs); + ecs_cert_changed (p->combobox, ecs); - return GTK_WIDGET(ecs); + return GTK_WIDGET (ecs); } static void -e_cert_selector_init(ECertSelector *ecs) +e_cert_selector_init (ECertSelector *ecs) { - gtk_dialog_add_buttons((GtkDialog *)ecs, + gtk_dialog_add_buttons ((GtkDialog *)ecs, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, GTK_STOCK_OK, GTK_RESPONSE_OK, NULL); - ecs->priv = g_malloc0(sizeof(*ecs->priv)); + ecs->priv = g_malloc0 (sizeof (*ecs->priv)); } static void -e_cert_selector_finalise(GObject *o) +e_cert_selector_finalise (GObject *o) { ECertSelector *ecs = (ECertSelector *)o; if (ecs->priv->certlist) - CERT_DestroyCertList(ecs->priv->certlist); + CERT_DestroyCertList (ecs->priv->certlist); - g_free(ecs->priv); + g_free (ecs->priv); - ((GObjectClass *)e_cert_selector_parent_class)->finalize(o); + ((GObjectClass *)e_cert_selector_parent_class)->finalize (o); } static void -e_cert_selector_class_init(ECertSelectorClass *klass) +e_cert_selector_class_init (ECertSelectorClass *klass) { ((GObjectClass *)klass)->finalize = e_cert_selector_finalise; ((GtkDialogClass *)klass)->response = e_cert_selector_response; ecs_signals[ECS_SELECTED] = g_signal_new("selected", - G_OBJECT_CLASS_TYPE(klass), + G_OBJECT_CLASS_TYPE (klass), G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET(ECertSelectorClass, selected), + G_STRUCT_OFFSET (ECertSelectorClass, selected), NULL, NULL, g_cclosure_marshal_VOID__POINTER, G_TYPE_NONE, 1, G_TYPE_POINTER); -- cgit v1.2.3