diff options
| author | Matthew Barnes <mbarnes@src.gnome.org> | 2009-02-19 20:31:06 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@src.gnome.org> | 2009-02-19 20:31:06 +0800 |
| commit | 1b782407524f2ca4a2dc4849098a21f9d1bdff09 (patch) | |
| tree | 95a676e1deb4cec0c1e2930636e6953c87cb8022 /smime | |
| parent | 1a40acf554290883d6cf2a491dc36685842fd26b (diff) | |
| download | gsoc2013-evolution-1b782407524f2ca4a2dc4849098a21f9d1bdff09.tar gsoc2013-evolution-1b782407524f2ca4a2dc4849098a21f9d1bdff09.tar.gz gsoc2013-evolution-1b782407524f2ca4a2dc4849098a21f9d1bdff09.tar.bz2 gsoc2013-evolution-1b782407524f2ca4a2dc4849098a21f9d1bdff09.tar.lz gsoc2013-evolution-1b782407524f2ca4a2dc4849098a21f9d1bdff09.tar.xz gsoc2013-evolution-1b782407524f2ca4a2dc4849098a21f9d1bdff09.tar.zst gsoc2013-evolution-1b782407524f2ca4a2dc4849098a21f9d1bdff09.zip | |
Fix crash on startup.
svn path=/branches/kill-bonobo/; revision=37295
Diffstat (limited to 'smime')
| -rw-r--r-- | smime/gui/certificate-manager.c | 6 | ||||
| -rw-r--r-- | smime/gui/certificate-manager.h | 3 |
2 files changed, 5 insertions, 4 deletions
diff --git a/smime/gui/certificate-manager.c b/smime/gui/certificate-manager.c index c8c45b7070..1f1bbb9f13 100644 --- a/smime/gui/certificate-manager.c +++ b/smime/gui/certificate-manager.c @@ -977,14 +977,15 @@ populate_ui (CertificateManagerData *cfm) } void -certificate_manager_config_init (void) +certificate_manager_config_init (EShell *shell) { CertificateManagerData *cfm_data; GtkWidget *preferences_window; GtkWidget *widget; - EShell *shell; char *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,7 +1032,6 @@ certificate_manager_config_init (void) gtk_widget_set_sensitive(cfm_data->backup_your_button, FALSE); gtk_widget_set_sensitive(cfm_data->backup_all_your_button, FALSE); - shell = e_shell_get_default (); preferences_window = e_shell_get_preferences_window (shell); e_preferences_window_add_page ( E_PREFERENCES_WINDOW (preferences_window), diff --git a/smime/gui/certificate-manager.h b/smime/gui/certificate-manager.h index 27813fab26..326b363fd4 100644 --- a/smime/gui/certificate-manager.h +++ b/smime/gui/certificate-manager.h @@ -24,10 +24,11 @@ #define _CERTIFICATE_MANAGER_H #include <glib.h> +#include <shell/e-shell.h> G_BEGIN_DECLS -void certificate_manager_config_init (void); +void certificate_manager_config_init (EShell *shell); G_END_DECLS |