From e0c501b7018f12d37b10e32923f95b7a01c7982c Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@src.gnome.org>
Date: Fri, 29 Aug 2008 22:32:46 +0000
Subject: Progress update:

	- Contacts module partially working!

	- Implement UI merging.  Also merge EInfoLabel into ESidebar.
	  The shell window now manages the icon and labels and keeps
	  them up-to-date via EShellView properties.


svn path=/branches/kill-bonobo/; revision=36214
---
 smime/gui/Makefile.am           |  2 ++
 smime/gui/certificate-manager.c | 24 +++++++++++++++---------
 smime/gui/certificate-manager.h |  8 ++++++--
 3 files changed, 23 insertions(+), 11 deletions(-)

(limited to 'smime')

diff --git a/smime/gui/Makefile.am b/smime/gui/Makefile.am
index 44667d88a2..5a8640c57d 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)"\"	\
diff --git a/smime/gui/certificate-manager.c b/smime/gui/certificate-manager.c
index dfd2bf48e9..64623a7176 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;
@@ -975,11 +976,11 @@ 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 (void)
 {
 	CertificateManagerData *cfm_data;
-	GtkWidget *control_widget;
+	GtkWidget *widget;
 	char *gladefile;
 
 	/* We need to peek the db here to make sure it (and NSS) are fully initialized. */
@@ -1019,14 +1020,19 @@ 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);
+	e_preferences_window_add_page (
+		e_shell_get_preferences_window (),
+		"certificates",
+		"preferences-certificates",
+		_("Certificates"),
+		widget, 700);
 }
diff --git a/smime/gui/certificate-manager.h b/smime/gui/certificate-manager.h
index 888f92a752..92e4fa3085 100644
--- a/smime/gui/certificate-manager.h
+++ b/smime/gui/certificate-manager.h
@@ -23,8 +23,12 @@
 #ifndef _CERTIFICATE_MANAGER_H_
 #define _CERTIFICATE_MANAGER_H
 
-#include "evolution-config-control.h"
+#include <glib.h>
 
-EvolutionConfigControl* certificate_manager_config_control_new (void);
+G_BEGIN_DECLS
+
+void		certificate_manager_config_init	(void);
+
+G_END_DECLS
 
 #endif /* _CERTIFICATE_MANAGER_H_ */
-- 
cgit v1.2.3