From 23f5773903d64a554d977ae7d0ebbaca73528f1f Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Wed, 30 Nov 2011 20:53:20 -0600 Subject: Coding style and whitespace cleanup. --- smime/gui/ca-trust-dialog.c | 4 ++- smime/gui/cert-trust-dialog.c | 4 ++- smime/gui/certificate-manager.c | 39 ++++++++++++++++--------- smime/gui/certificate-manager.h | 2 +- smime/gui/certificate-viewer.c | 8 ++++-- smime/gui/component.c | 18 ++++++------ smime/gui/e-cert-selector.c | 64 ++++++++++++++++++++++++++--------------- smime/gui/e-cert-selector.h | 41 +++++++++++++++----------- 8 files changed, 114 insertions(+), 66 deletions(-) (limited to 'smime/gui') diff --git a/smime/gui/ca-trust-dialog.c b/smime/gui/ca-trust-dialog.c index df2a1f825a..5827d9821a 100644 --- a/smime/gui/ca-trust-dialog.c +++ b/smime/gui/ca-trust-dialog.c @@ -108,7 +108,9 @@ ca_trust_dialog_show (ECert *cert, gtk_label_set_text ((GtkLabel *) w, txt); g_free (txt); - g_signal_connect (ctd_data->dialog, "response", G_CALLBACK (catd_response), ctd_data); + g_signal_connect ( + ctd_data->dialog, "response", + G_CALLBACK (catd_response), ctd_data); g_object_set_data_full (G_OBJECT (ctd_data->dialog), "CATrustDialogData", ctd_data, free_data); diff --git a/smime/gui/cert-trust-dialog.c b/smime/gui/cert-trust-dialog.c index d4d6648b32..f18a28f446 100644 --- a/smime/gui/cert-trust-dialog.c +++ b/smime/gui/cert-trust-dialog.c @@ -130,7 +130,9 @@ cert_trust_dialog_show (ECert *cert) ctd_data->label = e_builder_get_widget(ctd_data->builder, "trust-label"); - g_signal_connect (ctd_data->dialog, "response", G_CALLBACK(ctd_response), ctd_data); + g_signal_connect ( + ctd_data->dialog, "response", + G_CALLBACK (ctd_response), ctd_data); g_object_set_data_full (G_OBJECT (ctd_data->dialog), "CertTrustDialogData", ctd_data, free_data); diff --git a/smime/gui/certificate-manager.c b/smime/gui/certificate-manager.c index be30929cda..ac42e1d5ad 100644 --- a/smime/gui/certificate-manager.c +++ b/smime/gui/certificate-manager.c @@ -51,6 +51,10 @@ #include "e-util/e-util-private.h" #include "widgets/misc/e-preferences-window.h" +#define E_CERT_MANAGER_CONFIG_GET_PRIVATE(obj) \ + (G_TYPE_INSTANCE_GET_PRIVATE \ + ((obj), E_TYPE_CERT_MANAGER_CONFIG, ECertManagerConfigPrivate)) + G_DEFINE_TYPE (ECertManagerConfig, e_cert_manager_config, GTK_TYPE_BOX); enum { @@ -406,7 +410,8 @@ treeview_add_column (CertPage *cp, gtk_tree_view_append_column (cp->treeview, column); header = gtk_tree_view_column_get_button (column); - g_signal_connect (header, "button-release-event", + g_signal_connect ( + header, "button-release-event", G_CALLBACK (treeview_header_clicked), cp->popup_menu); /* The first column should not be concealable so there's no point in displaying @@ -419,9 +424,11 @@ treeview_add_column (CertPage *cp, gettext (cp->columns[column_index].column_title)); gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (item), cp->columns[column_index].visible); gtk_menu_attach (cp->popup_menu, item, 0, 1, column_index - 1, column_index); - g_signal_connect (item, "toggled", + g_signal_connect ( + item, "toggled", G_CALLBACK (header_popup_item_toggled), column); - g_signal_connect (column, "notify::visible", + g_signal_connect ( + column, "notify::visible", G_CALLBACK (treeview_column_visibility_changed), item); } @@ -504,8 +511,9 @@ view_cert (GtkWidget *button, if (cert) { GtkWidget *dialog = certificate_viewer_show (cert); - g_signal_connect (dialog, "response", - G_CALLBACK (gtk_widget_destroy), NULL); + g_signal_connect ( + dialog, "response", + G_CALLBACK (gtk_widget_destroy), NULL); gtk_widget_show (dialog); } } @@ -816,23 +824,28 @@ initialize_ui (CertPage *cp) treeview_add_column (cp, i); selection = gtk_tree_view_get_selection (cp->treeview); - g_signal_connect (selection, "changed", + g_signal_connect ( + selection, "changed", G_CALLBACK (treeview_selection_changed), cp); if (cp->import_button) - g_signal_connect (cp->import_button, "clicked", + g_signal_connect ( + cp->import_button, "clicked", G_CALLBACK (import_cert), cp); if (cp->edit_button) - g_signal_connect (cp->edit_button, "clicked", + g_signal_connect ( + cp->edit_button, "clicked", G_CALLBACK (edit_cert), cp); if (cp->delete_button) - g_signal_connect (cp->delete_button, "clicked", + g_signal_connect ( + cp->delete_button, "clicked", G_CALLBACK (delete_cert), cp); if (cp->view_button) - g_signal_connect (cp->view_button, "clicked", + g_signal_connect ( + cp->view_button, "clicked", G_CALLBACK (view_cert), cp); } @@ -930,7 +943,8 @@ cert_manager_config_set_property (GObject *object, ecmc->priv->pref_window = g_value_get_object (value); /* When the preferences window is "closed" (= hidden), save * state of all treeviews. */ - g_signal_connect_swapped (ecmc->priv->pref_window, "hide", + g_signal_connect_swapped ( + ecmc->priv->pref_window, "hide", G_CALLBACK (cert_manager_config_window_hide), ecmc); return; } @@ -967,8 +981,7 @@ e_cert_manager_config_init (ECertManagerConfig *ecmc) GtkWidget *parent, *widget; CertPage *cp; - priv = G_TYPE_INSTANCE_GET_PRIVATE ( - ecmc, E_TYPE_CERT_MANAGER_CONFIG, ECertManagerConfigPrivate); + priv = E_CERT_MANAGER_CONFIG_GET_PRIVATE (ecmc); ecmc->priv = priv; /* We need to peek the db here to make sure it (and NSS) are fully initialized. */ diff --git a/smime/gui/certificate-manager.h b/smime/gui/certificate-manager.h index 13a60ce161..2eba92cd01 100644 --- a/smime/gui/certificate-manager.h +++ b/smime/gui/certificate-manager.h @@ -47,8 +47,8 @@ ((obj), E_TYPE_CERT_MANAGER_CONFIG, ECertManagerConfigClass)) typedef struct _ECertManagerConfig ECertManagerConfig; -typedef struct _ECertManagerConfigPrivate ECertManagerConfigPrivate; typedef struct _ECertManagerConfigClass ECertManagerConfigClass; +typedef struct _ECertManagerConfigPrivate ECertManagerConfigPrivate; struct _ECertManagerConfig { GtkBox parent; diff --git a/smime/gui/certificate-viewer.c b/smime/gui/certificate-viewer.c index 89f7d1fd8d..6691d1fbec 100644 --- a/smime/gui/certificate-viewer.c +++ b/smime/gui/certificate-viewer.c @@ -274,7 +274,9 @@ fill_in_details (CertificateViewerData *cvm_data, "text", 0, NULL); selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (cvm_data->hierarchy_tree)); - g_signal_connect (selection, "changed", G_CALLBACK (hierarchy_selection_changed), cvm_data); + g_signal_connect ( + selection, "changed", + G_CALLBACK (hierarchy_selection_changed), cvm_data); /* hook up all the fields tree foo */ cvm_data->fields_tree = e_builder_get_widget (cvm_data->builder, "cert-fields-treeview"); @@ -284,7 +286,9 @@ fill_in_details (CertificateViewerData *cvm_data, "text", 0, NULL); selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (cvm_data->fields_tree)); - g_signal_connect (selection, "changed", G_CALLBACK (fields_selection_changed), cvm_data); + g_signal_connect ( + selection, "changed", + G_CALLBACK (fields_selection_changed), cvm_data); /* hook up all the field display foo */ cvm_data->field_text = e_builder_get_widget (cvm_data->builder, "cert-field-value-textview"); diff --git a/smime/gui/component.c b/smime/gui/component.c index fcbb9faf9f..e902f43fd0 100644 --- a/smime/gui/component.c +++ b/smime/gui/component.c @@ -117,15 +117,15 @@ smime_component_init (void) return; init_done = TRUE; - g_signal_connect (e_cert_db_peek (), - "pk11_passwd", - G_CALLBACK (smime_pk11_passwd), NULL); + g_signal_connect ( + e_cert_db_peek (), "pk11_passwd", + G_CALLBACK (smime_pk11_passwd), NULL); - g_signal_connect (e_cert_db_peek (), - "pk11_change_passwd", - G_CALLBACK (smime_pk11_change_passwd), NULL); + g_signal_connect ( + e_cert_db_peek (), "pk11_change_passwd", + G_CALLBACK (smime_pk11_change_passwd), NULL); - g_signal_connect (e_cert_db_peek (), - "confirm_ca_cert_import", - G_CALLBACK (smime_confirm_ca_cert_import), NULL); + g_signal_connect ( + e_cert_db_peek (), "confirm_ca_cert_import", + G_CALLBACK (smime_confirm_ca_cert_import), NULL); } diff --git a/smime/gui/e-cert-selector.c b/smime/gui/e-cert-selector.c index 24cc9b374a..a5135d2c7d 100644 --- a/smime/gui/e-cert-selector.c +++ b/smime/gui/e-cert-selector.c @@ -37,6 +37,10 @@ #include "e-util/e-util.h" #include "e-util/e-util-private.h" +#define E_CERT_SELECTOR_GET_PRIVATE(obj) \ + (G_TYPE_INSTANCE_GET_PRIVATE \ + ((obj), E_TYPE_CERT_SELECTOR, ECertSelectorPrivate)) + struct _ECertSelectorPrivate { CERTCertList *certlist; @@ -209,7 +213,9 @@ e_cert_selector_new (gint type, gtk_combo_box_set_active (GTK_COMBO_BOX (p->combobox), active); - g_signal_connect (p->combobox, "changed", G_CALLBACK(ecs_cert_changed), ecs); + g_signal_connect ( + p->combobox, "changed", + G_CALLBACK (ecs_cert_changed), ecs); g_object_unref (builder); @@ -221,38 +227,50 @@ e_cert_selector_new (gint type, static void e_cert_selector_init (ECertSelector *ecs) { - gtk_dialog_add_buttons ((GtkDialog *) ecs, - GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, - GTK_STOCK_OK, GTK_RESPONSE_OK, NULL); + gtk_dialog_add_buttons ( + GTK_DIALOG (ecs), + GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, + GTK_STOCK_OK, GTK_RESPONSE_OK, NULL); - ecs->priv = g_malloc0 (sizeof (*ecs->priv)); + ecs->priv = E_CERT_SELECTOR_GET_PRIVATE (ecs); } static void -e_cert_selector_finalize (GObject *o) +e_cert_selector_finalize (GObject *object) { - ECertSelector *ecs = (ECertSelector *) o; + ECertSelectorPrivate *priv; - if (ecs->priv->certlist) - CERT_DestroyCertList (ecs->priv->certlist); + priv = E_CERT_SELECTOR_GET_PRIVATE (object); - g_free (ecs->priv); + if (priv->certlist) + CERT_DestroyCertList (priv->certlist); - ((GObjectClass *) e_cert_selector_parent_class)->finalize (o); + /* Chain up to parent's finalize() method. */ + G_OBJECT_CLASS (e_cert_selector_parent_class)->finalize (object); } static void -e_cert_selector_class_init (ECertSelectorClass *klass) +e_cert_selector_class_init (ECertSelectorClass *class) { - ((GObjectClass *) klass)->finalize = e_cert_selector_finalize; - ((GtkDialogClass *) klass)->response = e_cert_selector_response; - - ecs_signals[ECS_SELECTED] = - g_signal_new("selected", - G_OBJECT_CLASS_TYPE (klass), - G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (ECertSelectorClass, selected), - NULL, NULL, - g_cclosure_marshal_VOID__POINTER, - G_TYPE_NONE, 1, G_TYPE_POINTER); + GObjectClass *object_class; + GtkDialogClass *dialog_class; + + g_type_class_add_private (class, sizeof (ECertSelectorPrivate)); + + object_class = G_OBJECT_CLASS (class); + object_class->finalize = e_cert_selector_finalize; + + dialog_class = GTK_DIALOG_CLASS (class); + dialog_class->response = e_cert_selector_response; + + ecs_signals[ECS_SELECTED] = g_signal_new ( + "selected", + G_OBJECT_CLASS_TYPE (class), + G_SIGNAL_RUN_LAST, + G_STRUCT_OFFSET (ECertSelectorClass, selected), + NULL, NULL, + g_cclosure_marshal_VOID__POINTER, + G_TYPE_NONE, 1, + G_TYPE_POINTER); } + diff --git a/smime/gui/e-cert-selector.h b/smime/gui/e-cert-selector.h index 5520b5621c..e51f1263ef 100644 --- a/smime/gui/e-cert-selector.h +++ b/smime/gui/e-cert-selector.h @@ -26,24 +26,34 @@ #include -#ifdef cplusplus -extern "C" { -#pragma } -#endif /* cplusplus */ +/* Standard GObject macros */ +#define E_TYPE_CERT_SELECTOR \ + (e_cert_selector_get_type ()) +#define E_CERT_SELECTOR(obj) \ + (G_TYPE_CHECK_INSTANCE_CAST \ + ((obj), E_TYPE_CERT_SELECTOR, ECertSelector)) +#define E_CERT_SELECTOR_CLASS(cls) \ + (G_TYPE_CHECK_CLASS_CAST \ + ((cls), E_TYPE_CERT_SELECTOR, ECertSelectorClass)) +#define E_IS_CERT_SELECTOR(obj) \ + (G_TYPE_CHECK_INSTANCE_TYPE \ + ((obj), E_TYPE_CERT_SELECTOR)) +#define E_IS_CERT_SELECTOR_CLASS(cls) \ + (G_TYPE_CHECK_CLASS_TYPE \ + ((cls), E_TYPE_CERT_SELECTOR)) +#define E_CERT_SELECTOR_GET_CLASS(obj) \ + (G_TYPE_INSTANCE_GET_CLASS \ + ((obj), E_TYPE_CERT_SELECTOR, ECertSelectorClass)) -#define E_TYPE_CERT_SELECTOR (e_cert_selector_get_type ()) -#define E_CERT_SELECTOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), E_TYPE_CERT_SELECTOR, ECertSelector)) -#define E_CERT_SELECTOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), E_TYPE_CERT_SELECTOR, ECertSelectorClass)) -#define E_IS_CERT_SELECTOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), E_TYPE_CERT_SELECTOR)) -#define E_IS_CERT_SELECTOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), E_TYPE_CERT_SELECTOR)) +G_BEGIN_DECLS -typedef struct _ECertSelector ECertSelector; -typedef struct _ECertSelectorClass ECertSelectorClass; +typedef struct _ECertSelector ECertSelector; +typedef struct _ECertSelectorClass ECertSelectorClass; +typedef struct _ECertSelectorPrivate ECertSelectorPrivate; struct _ECertSelector { GtkDialog parent; - - struct _ECertSelectorPrivate *priv; + ECertSelectorPrivate *priv; }; struct _ECertSelectorClass { @@ -60,8 +70,7 @@ enum _e_cert_selector_type { GType e_cert_selector_get_type (void); GtkWidget *e_cert_selector_new (gint type, const gchar *currentid); -#ifdef cplusplus -} -#endif /* cplusplus */ +G_END_DECLS #endif /* E_CERT_SELECTOR_H */ + -- cgit v1.2.3