diff options
Diffstat (limited to 'smime')
| -rw-r--r-- | smime/gui/ca-trust-dialog.c | 12 | ||||
| -rw-r--r-- | smime/gui/certificate-manager.c | 4 | ||||
| -rw-r--r-- | smime/gui/certificate-viewer.c | 13 | ||||
| -rw-r--r-- | smime/gui/e-cert-selector.c | 4 |
4 files changed, 24 insertions, 9 deletions
diff --git a/smime/gui/ca-trust-dialog.c b/smime/gui/ca-trust-dialog.c index f21288dac0..47f4d5db81 100644 --- a/smime/gui/ca-trust-dialog.c +++ b/smime/gui/ca-trust-dialog.c @@ -72,6 +72,9 @@ GtkWidget* ca_trust_dialog_show (ECert *cert, gboolean importing) { CATrustDialogData *ctd_data; + GtkDialog *dialog; + GtkWidget *action_area; + GtkWidget *content_area; GtkWidget *w; gchar *txt; @@ -83,8 +86,13 @@ ca_trust_dialog_show (ECert *cert, gboolean importing) ctd_data->dialog = e_builder_get_widget (ctd_data->builder, "ca-trust-dialog"); gtk_widget_ensure_style (ctd_data->dialog); - gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (ctd_data->dialog)->vbox), 0); - gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (ctd_data->dialog)->action_area), 12); + + dialog = GTK_DIALOG (ctd_data->dialog); + action_area = gtk_dialog_get_action_area (dialog); + content_area = gtk_dialog_get_content_area (dialog); + + gtk_container_set_border_width (GTK_CONTAINER (action_area), 12); + gtk_container_set_border_width (GTK_CONTAINER (content_area), 0); ctd_data->cert = g_object_ref (cert); diff --git a/smime/gui/certificate-manager.c b/smime/gui/certificate-manager.c index 505ffaf30f..cc6d702d46 100644 --- a/smime/gui/certificate-manager.c +++ b/smime/gui/certificate-manager.c @@ -995,6 +995,7 @@ certificate_manager_config_init (EShell *shell) { CertificateManagerData *cfm_data; GtkWidget *preferences_window; + GtkWidget *parent; GtkWidget *widget; g_return_if_fail (E_IS_SHELL (shell)); @@ -1036,7 +1037,8 @@ certificate_manager_config_init (EShell *shell) widget = e_builder_get_widget (cfm_data->builder, "cert-manager-notebook"); g_object_ref (widget); - gtk_container_remove (GTK_CONTAINER (widget->parent), widget); + parent = gtk_widget_get_parent (widget); + gtk_container_remove (GTK_CONTAINER (parent), widget); /* FIXME: remove when implemented */ gtk_widget_set_sensitive(cfm_data->backup_your_button, FALSE); diff --git a/smime/gui/certificate-viewer.c b/smime/gui/certificate-viewer.c index f71993dc05..c78bd77a75 100644 --- a/smime/gui/certificate-viewer.c +++ b/smime/gui/certificate-viewer.c @@ -317,6 +317,8 @@ GtkWidget* certificate_viewer_show (ECert *cert) { CertificateViewerData *cvm_data; + GtkDialog *dialog; + GtkWidget *action_area; gchar *title; cvm_data = g_new0 (CertificateViewerData, 1); @@ -327,13 +329,14 @@ certificate_viewer_show (ECert *cert) cvm_data->dialog = e_builder_get_widget (cvm_data->builder, "certificate-viewer-dialog"); gtk_widget_realize (cvm_data->dialog); - gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (cvm_data->dialog)->action_area), 12); - title = g_strdup_printf (_("Certificate Viewer: %s"), e_cert_get_window_title (cert)); - - gtk_window_set_title (GTK_WINDOW (cvm_data->dialog), - title); + dialog = GTK_DIALOG (cvm_data->dialog); + action_area = gtk_dialog_get_action_area (dialog); + gtk_container_set_border_width (GTK_CONTAINER (action_area), 12); + title = g_strdup_printf ( + _("Certificate Viewer: %s"), e_cert_get_window_title (cert)); + gtk_window_set_title (GTK_WINDOW (cvm_data->dialog), title); g_free (title); fill_in_general (cvm_data, cert); diff --git a/smime/gui/e-cert-selector.c b/smime/gui/e-cert-selector.c index 5d500f5abf..71f2c00504 100644 --- a/smime/gui/e-cert-selector.c +++ b/smime/gui/e-cert-selector.c @@ -148,6 +148,7 @@ e_cert_selector_new(gint type, const gchar *currentid) CERTCertList *certlist; CERTCertListNode *node; GtkBuilder *builder; + GtkWidget *content_area; GtkWidget *w; gint n=0, active=0; @@ -161,7 +162,8 @@ e_cert_selector_new(gint type, const gchar *currentid) p->description = e_builder_get_widget(builder, "cert_description"); w = e_builder_get_widget(builder, "cert_selector_vbox"); - gtk_box_pack_start((GtkBox *)((GtkDialog *)ecs)->vbox, w, TRUE, TRUE, 3); + 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")); switch (type) { |