aboutsummaryrefslogtreecommitdiffstats
path: root/smime
diff options
context:
space:
mode:
Diffstat (limited to 'smime')
-rw-r--r--smime/gui/Makefile.am11
-rw-r--r--smime/gui/certificate-manager.c28
-rw-r--r--smime/gui/certificate-manager.h9
3 files changed, 33 insertions, 15 deletions
diff --git a/smime/gui/Makefile.am b/smime/gui/Makefile.am
index 02bfd859f9..807e71ff51 100644
--- a/smime/gui/Makefile.am
+++ b/smime/gui/Makefile.am
@@ -6,6 +6,8 @@ INCLUDES = \
-I$(top_builddir)/smime/lib \
-I$(top_srcdir)/shell \
-I$(top_builddir)/shell \
+ -I$(top_srcdir)/widgets/misc \
+ -I$(top_builddir)/widgets/misc \
-DEVOLUTION_DATADIR=\""$(datadir)"\" \
-DEVOLUTION_GLADEDIR=\""$(gladedir)"\" \
-DEVOLUTION_ETSPECDIR=\""$(etspecdir)"\" \
@@ -33,10 +35,11 @@ libevolution_smime_la_SOURCES = \
component.h
-libevolution_smime_la_LIBADD = \
- $(top_builddir)/e-util/libeutil.la \
- $(top_builddir)/shell/libeshell.la \
- $(top_builddir)/smime/lib/libessmime.la \
+libevolution_smime_la_LIBADD = \
+ $(top_builddir)/e-util/libeutil.la \
+ $(top_builddir)/shell/libeshell.la \
+ $(top_builddir)/smime/lib/libessmime.la \
+ $(top_builddir)/widgets/misc/libemiscwidgets.la \
$(CERT_UI_LIBS)
libevolution_smime_la_LDFLAGS = $(NO_UNDEFINED)
diff --git a/smime/gui/certificate-manager.c b/smime/gui/certificate-manager.c
index c5261e879b..f697b32330 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 "e-util/e-util-private.h"
+#include <e-shell.h>
+#include <e-preferences-window.h>
+#include <e-util/e-util-private.h>
typedef struct {
GladeXML *gui;
@@ -989,13 +990,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;
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 ();
@@ -1033,14 +1037,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);
}
diff --git a/smime/gui/certificate-manager.h b/smime/gui/certificate-manager.h
index 73d3688859..9107e203de 100644
--- a/smime/gui/certificate-manager.h
+++ b/smime/gui/certificate-manager.h
@@ -23,8 +23,13 @@
#ifndef _CERTIFICATE_MANAGER_H_
#define _CERTIFICATE_MANAGER_H
-#include "evolution-config-control.h"
+#include <glib.h>
+#include <shell/e-shell.h>
-EvolutionConfigControl* certificate_manager_config_control_new (void);
+G_BEGIN_DECLS
+
+void certificate_manager_config_init (EShell *shell);
+
+G_END_DECLS
#endif /* _CERTIFICATE_MANAGER_H_ */