aboutsummaryrefslogtreecommitdiffstats
path: root/smime
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@redhat.com>2012-07-12 20:02:18 +0800
committerMatthew Barnes <mbarnes@redhat.com>2012-08-20 02:17:55 +0800
commitc85109fc322137596bf34cffc5445d568223c60d (patch)
tree711e6d5b2eb3d6c7780d1d01e20d980c67a77f9e /smime
parent7d1751cc26a75166019917ec8c3b35e1083d27d6 (diff)
downloadgsoc2013-evolution-c85109fc322137596bf34cffc5445d568223c60d.tar.gz
gsoc2013-evolution-c85109fc322137596bf34cffc5445d568223c60d.tar.zst
gsoc2013-evolution-c85109fc322137596bf34cffc5445d568223c60d.zip
Coding style and whitespace cleanup.
Diffstat (limited to 'smime')
-rw-r--r--smime/gui/ca-trust-dialog.c6
-rw-r--r--smime/gui/cert-trust-dialog.c8
-rw-r--r--smime/gui/certificate-manager.c6
-rw-r--r--smime/gui/certificate-viewer.c4
-rw-r--r--smime/gui/e-cert-selector.c14
-rw-r--r--smime/lib/e-cert-db.c14
-rw-r--r--smime/lib/e-cert.c20
7 files changed, 36 insertions, 36 deletions
diff --git a/smime/gui/ca-trust-dialog.c b/smime/gui/ca-trust-dialog.c
index 5827d9821a..7037b26677 100644
--- a/smime/gui/ca-trust-dialog.c
+++ b/smime/gui/ca-trust-dialog.c
@@ -62,7 +62,7 @@ catd_response (GtkWidget *w,
case GTK_RESPONSE_ACCEPT: {
GtkWidget *dialog = certificate_viewer_show (data->cert);
- g_signal_stop_emission_by_name(w, "response");
+ g_signal_stop_emission_by_name (w, "response");
gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (data->dialog));
gtk_dialog_run (GTK_DIALOG (dialog));
gtk_widget_destroy (dialog);
@@ -103,8 +103,8 @@ ca_trust_dialog_show (ECert *cert,
ctd_data->email_checkbutton = e_builder_get_widget (ctd_data->builder, "email_trust_checkbutton");
ctd_data->objsign_checkbutton = e_builder_get_widget (ctd_data->builder, "objsign_trust_checkbutton");
- 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));
+ 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);
diff --git a/smime/gui/cert-trust-dialog.c b/smime/gui/cert-trust-dialog.c
index f18a28f446..3a52b82657 100644
--- a/smime/gui/cert-trust-dialog.c
+++ b/smime/gui/cert-trust-dialog.c
@@ -83,7 +83,7 @@ ctd_response (GtkWidget *w,
/* *icert is already declared earlier in this function? */
CERTCertificate *icert = e_cert_get_internal_cert (data->cacert);
- g_signal_stop_emission_by_name(w, "response");
+ g_signal_stop_emission_by_name (w, "response");
ca_trust_dialog_set_trust (dialog,
e_cert_trust_has_trusted_ca (icert->trust, TRUE, FALSE, FALSE),
@@ -125,10 +125,10 @@ 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->trust_button = e_builder_get_widget(ctd_data->builder, "cert-trust");
- ctd_data->notrust_button = e_builder_get_widget(ctd_data->builder, "cert-notrust");
+ 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");
- ctd_data->label = e_builder_get_widget(ctd_data->builder, "trust-label");
+ ctd_data->label = e_builder_get_widget (ctd_data->builder, "trust-label");
g_signal_connect (
ctd_data->dialog, "response",
diff --git a/smime/gui/certificate-manager.c b/smime/gui/certificate-manager.c
index f8a3a1b118..3f8648feee 100644
--- a/smime/gui/certificate-manager.c
+++ b/smime/gui/certificate-manager.c
@@ -89,7 +89,7 @@ static CertTreeColumn yourcerts_columns[] = {
{ G_TYPE_OBJECT, NULL, NULL, FALSE } /* Hidden column for ECert * object */
};
-static const gchar* yourcerts_mime_types[] = { "application/x-x509-user-cert", "application/x-pkcs12", NULL };
+static const gchar * yourcerts_mime_types[] = { "application/x-x509-user-cert", "application/x-pkcs12", NULL };
static CertTreeColumn contactcerts_columns[] = {
@@ -109,7 +109,7 @@ static CertTreeColumn contactcerts_columns[] = {
{ G_TYPE_OBJECT, NULL, NULL, FALSE }
};
-static const gchar* contactcerts_mime_types[] = { "application/x-x509-email-cert", "application/x-x509-ca-cert", NULL };
+static const gchar * contactcerts_mime_types[] = { "application/x-x509-email-cert", "application/x-x509-ca-cert", NULL };
static CertTreeColumn authoritycerts_columns[] = {
@@ -127,7 +127,7 @@ static CertTreeColumn authoritycerts_columns[] = {
{ G_TYPE_OBJECT, NULL, NULL, FALSE }
};
-static const gchar* authoritycerts_mime_types[] = { "application/x-x509-ca-cert", NULL };
+static const gchar * authoritycerts_mime_types[] = { "application/x-x509-ca-cert", NULL };
typedef struct {
GtkTreeView *treeview;
diff --git a/smime/gui/certificate-viewer.c b/smime/gui/certificate-viewer.c
index 6691d1fbec..9273ae90e6 100644
--- a/smime/gui/certificate-viewer.c
+++ b/smime/gui/certificate-viewer.c
@@ -270,7 +270,7 @@ fill_in_details (CertificateViewerData *cvm_data,
GTK_TREE_MODEL (cvm_data->hierarchy_store));
gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (cvm_data->hierarchy_tree),
- -1, "Cert", gtk_cell_renderer_text_new(),
+ -1, "Cert", gtk_cell_renderer_text_new (),
"text", 0, NULL);
selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (cvm_data->hierarchy_tree));
@@ -282,7 +282,7 @@ fill_in_details (CertificateViewerData *cvm_data,
cvm_data->fields_tree = e_builder_get_widget (cvm_data->builder, "cert-fields-treeview");
gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (cvm_data->fields_tree),
- -1, "Field", gtk_cell_renderer_text_new(),
+ -1, "Field", gtk_cell_renderer_text_new (),
"text", 0, NULL);
selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (cvm_data->fields_tree));
diff --git a/smime/gui/e-cert-selector.c b/smime/gui/e-cert-selector.c
index a5135d2c7d..71f3545770 100644
--- a/smime/gui/e-cert-selector.c
+++ b/smime/gui/e-cert-selector.c
@@ -115,12 +115,12 @@ ecs_cert_changed (GtkWidget *w,
GtkTextBuffer *buffer;
GString *text;
- text = g_string_new("");
+ text = g_string_new ("");
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);
+ 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);
@@ -167,13 +167,13 @@ e_cert_selector_new (gint type,
builder = gtk_builder_new ();
e_load_ui_builder_definition (builder, "smime-ui.ui");
- p->combobox = e_builder_get_widget(builder, "cert_combobox");
- p->description = e_builder_get_widget(builder, "cert_description");
+ p->combobox = e_builder_get_widget (builder, "cert_combobox");
+ p->description = e_builder_get_widget (builder, "cert_description");
- w = e_builder_get_widget(builder, "cert_selector_vbox");
+ w = e_builder_get_widget (builder, "cert_selector_vbox");
content_area = gtk_dialog_get_content_area (GTK_DIALOG (ecs));
gtk_box_pack_start (GTK_BOX (content_area), w, TRUE, TRUE, 3);
- gtk_window_set_title(GTK_WINDOW(ecs), _("Select certificate"));
+ gtk_window_set_title (GTK_WINDOW (ecs), _("Select certificate"));
switch (type) {
case E_CERT_SELECTOR_SIGNER:
diff --git a/smime/lib/e-cert-db.c b/smime/lib/e-cert-db.c
index c9dc1cae24..c74ac0a176 100644
--- a/smime/lib/e-cert-db.c
+++ b/smime/lib/e-cert-db.c
@@ -495,7 +495,7 @@ install_loadable_roots (void)
};
for (i = 0; i < G_N_ELEMENTS (paths_to_check); i++) {
- gchar *dll_path = g_module_build_path (paths_to_check [i], "nssckbi");
+ gchar *dll_path = g_module_build_path (paths_to_check[i], "nssckbi");
if (g_file_test (dll_path, G_FILE_TEST_EXISTS)) {
PRInt32 modType;
@@ -503,7 +503,7 @@ install_loadable_roots (void)
/* Delete the existing module */
SECMOD_DeleteModule ("Mozilla Root Certs", &modType);
- SECMOD_AddNewModule("Mozilla Root Certs",dll_path, 0, 0);
+ SECMOD_AddNewModule ("Mozilla Root Certs",dll_path, 0, 0);
g_free (dll_path);
break;
}
@@ -937,7 +937,7 @@ handle_ca_cert_download (ECertDB *cert_db,
CERT_NewTempCertificate (certdb, &der, nsnull, PR_FALSE, PR_TRUE);
if (!tmpCert2) {
- NS_ASSERTION(0, "Couldn't create temp cert from DER blob\n");
+ NS_ASSERTION (0, "Couldn't create temp cert from DER blob\n");
continue; /* Let's try to import the rest of 'em */
}
nickname.Adopt (CERT_MakeCANickname (tmpCert2));
@@ -1163,14 +1163,14 @@ default_nickname (CERTCertificate *cert)
username = CERT_GetCommonName (&cert->subject);
if (username == NULL)
- username = PL_strdup("");
+ username = PL_strdup ("");
if (username == NULL)
goto loser;
caname = CERT_GetOrgName (&cert->issuer);
if (caname == NULL)
- caname = PL_strdup("");
+ caname = PL_strdup ("");
if (caname == NULL)
goto loser;
@@ -1190,7 +1190,7 @@ default_nickname (CERTCertificate *cert)
goto loser;
}
if (!PK11_IsInternal (slot)) {
- tmp = PR_smprintf("%s:%s", PK11_GetTokenName(slot), nickname);
+ tmp = PR_smprintf ("%s:%s", PK11_GetTokenName (slot), nickname);
PR_Free (nickname);
nickname = tmp;
tmp = NULL;
@@ -1198,7 +1198,7 @@ default_nickname (CERTCertificate *cert)
tmp = nickname;
while (1) {
if (count > 1) {
- nickname = PR_smprintf("%s #%d", tmp, count);
+ nickname = PR_smprintf ("%s #%d", tmp, count);
}
if (nickname == NULL)
diff --git a/smime/lib/e-cert.c b/smime/lib/e-cert.c
index c3d0b7e351..7b06a80b59 100644
--- a/smime/lib/e-cert.c
+++ b/smime/lib/e-cert.c
@@ -198,7 +198,7 @@ e_cert_populate (ECert *cert)
exploded_tm.tm_mday = explodedTime.tm_mday;
exploded_tm.tm_mon = explodedTime.tm_month;
exploded_tm.tm_year = explodedTime.tm_year - 1900;
- e_utf8_strftime (buf, sizeof(buf), _("%d/%m/%Y"), &exploded_tm);
+ e_utf8_strftime (buf, sizeof (buf), _("%d/%m/%Y"), &exploded_tm);
cert->priv->issued_on_string = g_strdup (buf);
PR_ExplodeTime (
@@ -210,7 +210,7 @@ e_cert_populate (ECert *cert)
exploded_tm.tm_mday = explodedTime.tm_mday;
exploded_tm.tm_mon = explodedTime.tm_month;
exploded_tm.tm_year = explodedTime.tm_year - 1900;
- e_utf8_strftime (buf, sizeof(buf), _("%d/%m/%Y"), &exploded_tm);
+ e_utf8_strftime (buf, sizeof (buf), _("%d/%m/%Y"), &exploded_tm);
cert->priv->expires_on_string = g_strdup (buf);
}
@@ -396,13 +396,13 @@ e_cert_get_usage (ECert *cert)
{
if (cert->priv->usage_string == NULL) {
gint i;
- GString *str = g_string_new("");
+ GString *str = g_string_new ("");
CERTCertificate *icert = e_cert_get_internal_cert (cert);
for (i = 0; i < G_N_ELEMENTS (usageinfo); i++) {
if (icert->keyUsage & usageinfo[i].bit) {
if (str->len != 0)
- g_string_append(str, ", ");
+ g_string_append (str, ", ");
g_string_append (str, _(usageinfo[i].text));
}
}
@@ -561,7 +561,7 @@ get_default_oid_format (SECItem *oid,
gulong val = oid->data[0];
guint i = val % 40;
val /= 40;
- written = PR_snprintf(buf, 300, "%lu %u ", val, i);
+ written = PR_snprintf (buf, 300, "%lu %u ", val, i);
if (written < 0)
return FALSE;
len = written;
@@ -581,7 +581,7 @@ get_default_oid_format (SECItem *oid,
val = (val << 7) | (j & 0x7f);
if (j & 0x80)
continue;
- written = PR_snprintf(&buf[len], sizeof(buf)-len, "%lu ", val);
+ written = PR_snprintf (&buf[len], sizeof (buf) - len, "%lu ", val);
if (written < 0)
return FALSE;
@@ -690,7 +690,7 @@ process_raw_bytes (SECItem *data,
PRUint32 i;
gchar buffer[5];
for (i = 0; i < data->len; i++) {
- PR_snprintf(buffer, 5, "%02x ", data->data[i]);
+ PR_snprintf (buffer, 5, "%02x ", data->data[i]);
g_string_append (str, buffer);
if ((i + 1) % 16 == 0) {
g_string_append (str, "\n");
@@ -1097,11 +1097,11 @@ create_tbs_certificate_asn1_struct (ECert *cert,
#ifdef notyet
nsCOMPtr < nsIASN1Sequence> validitySequence = new nsNSSASN1Sequence ();
- nssComponent->GetPIPNSSBundleString(NS_LITERAL_STRING("CertDumpValidity").get(),
+ nssComponent->GetPIPNSSBundleString (NS_LITERAL_STRING ("CertDumpValidity").get (),
text);
validitySequence->SetDisplayName (text);
asn1Objects->AppendElement (validitySequence, PR_FALSE);
- nssComponent->GetPIPNSSBundleString(NS_LITERAL_STRING("CertDumpNotBefore").get(),
+ nssComponent->GetPIPNSSBundleString (NS_LITERAL_STRING ("CertDumpNotBefore").get (),
text);
nsCOMPtr < nsIX509CertValidity> validityData;
GetValidity (getter_AddRefs (validityData));
@@ -1114,7 +1114,7 @@ create_tbs_certificate_asn1_struct (ECert *cert,
if (NS_FAILED (rv))
return rv;
- nssComponent->GetPIPNSSBundleString(NS_LITERAL_STRING("CertDumpNotAfter").get(),
+ nssComponent->GetPIPNSSBundleString (NS_LITERAL_STRING ("CertDumpNotAfter").get (),
text);
rv = ProcessTime (notAfter, text.get (), validitySequence);
if (NS_FAILED (rv))