diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2009-08-30 13:37:36 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2009-08-30 13:40:49 +0800 |
| commit | cfb9c32b6657165e4d5e11aa7b47804f679a61f8 (patch) | |
| tree | 1f9c8954df7a357b5dc20a13ac82bf31c1112083 /smime/gui/certificate-manager.c | |
| parent | fefeb30f58447f2fa7bcbee16dbe68a9333ce89d (diff) | |
| parent | 0f7f4cfe38b3c4cd83efbe9922ae15c5aee00317 (diff) | |
| download | gsoc2013-evolution-cfb9c32b6657165e4d5e11aa7b47804f679a61f8.tar gsoc2013-evolution-cfb9c32b6657165e4d5e11aa7b47804f679a61f8.tar.gz gsoc2013-evolution-cfb9c32b6657165e4d5e11aa7b47804f679a61f8.tar.bz2 gsoc2013-evolution-cfb9c32b6657165e4d5e11aa7b47804f679a61f8.tar.lz gsoc2013-evolution-cfb9c32b6657165e4d5e11aa7b47804f679a61f8.tar.xz gsoc2013-evolution-cfb9c32b6657165e4d5e11aa7b47804f679a61f8.tar.zst gsoc2013-evolution-cfb9c32b6657165e4d5e11aa7b47804f679a61f8.zip | |
Merge commit 'origin/kill-bonobo'
Diffstat (limited to 'smime/gui/certificate-manager.c')
| -rw-r--r-- | smime/gui/certificate-manager.c | 26 |
1 files changed, 18 insertions, 8 deletions
diff --git a/smime/gui/certificate-manager.c b/smime/gui/certificate-manager.c index 8026ba1472..030946e3cb 100644 --- a/smime/gui/certificate-manager.c +++ b/smime/gui/certificate-manager.c @@ -32,7 +32,6 @@ #include <glib/gi18n.h> #include <glade/glade.h> -#include "evolution-config-control.h" #include "ca-trust-dialog.h" #include "cert-trust-dialog.h" #include "certificate-manager.h" @@ -49,7 +48,9 @@ #include <pkcs11.h> #include <pk11func.h> +#include "shell/e-shell.h" #include "e-util/e-util-private.h" +#include "widgets/misc/e-preferences-window.h" typedef struct { GladeXML *gui; @@ -987,13 +988,16 @@ populate_ui (CertificateManagerData *cfm) gtk_tree_view_expand_all (GTK_TREE_VIEW (cfm->contactcerts_treeview)); } -EvolutionConfigControl* -certificate_manager_config_control_new (void) +void +certificate_manager_config_init (EShell *shell) { CertificateManagerData *cfm_data; - GtkWidget *control_widget; + GtkWidget *preferences_window; + GtkWidget *widget; gchar *gladefile; + g_return_if_fail (E_IS_SHELL (shell)); + /* We need to peek the db here to make sure it (and NSS) are fully initialized. */ e_cert_db_peek (); @@ -1031,14 +1035,20 @@ certificate_manager_config_control_new (void) populate_ui (cfm_data); - control_widget = glade_xml_get_widget (cfm_data->gui, "cert-manager-notebook"); - g_object_ref (control_widget); + widget = glade_xml_get_widget (cfm_data->gui, "cert-manager-notebook"); + g_object_ref (widget); - gtk_container_remove (GTK_CONTAINER (control_widget->parent), control_widget); + gtk_container_remove (GTK_CONTAINER (widget->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); - return evolution_config_control_new (control_widget); + preferences_window = e_shell_get_preferences_window (shell); + e_preferences_window_add_page ( + E_PREFERENCES_WINDOW (preferences_window), + "certificates", + "preferences-certificates", + _("Certificates"), + widget, 700); } |