add e-asn1-object.[ch]

2003-12-03  Chris Toshok  <toshok@ximian.com>

	* lib/Makefile.am (libessmime_la_SOURCES): add e-asn1-object.[ch]

	* gui/smime-ui.glade: rename the ca trust dialog, and give it a
	proper id.

	* gui/certificate-manager.c (yourcerts_selection_changed): just
	use @selection.
	(contactcerts_selection_changed): same.
	(authoritycerts_selection_changed): same.

	* gui/certificate-viewer.c (free_data): free the cert chain.
	(fill_in_general): move all the general tab stuff here.
	(hierarchy_selection_changed): new function.  not finished.
	(fields_selection_changed): new function, unimplemented.
	(fill_in_details): new function, fill in the heirarchy and hook up
	signals and stuff.
	(certificate_viewer_show): call fill_in_general/fill_in_details.

	* lib/e-cert.c (e_cert_get_chain): new function.

	* lib/e-cert.h: add prototype for e_cert_get_chain.

svn path=/trunk/; revision=23622

3 files changed, 120 insertions, 17 deletions

diff --git a/smime/gui/certificate-manager.c b/smime/gui/certificate-manager.c
index 41caa775a5..d2ae5e4fea 100644
--- a/smime/gui/certificate-manager.c
+++ b/smime/gui/certificate-manager.c
@@ -139,7 +139,7 @@ import_your (GtkWidget *widget, CertificateManagerData *cfm)
 static void
 yourcerts_selection_changed (GtkTreeSelection *selection, CertificateManagerData *cfm)
 {
-	handle_selection_changed (gtk_tree_view_get_selection (GTK_TREE_VIEW(cfm->yourcerts_treeview)),
+	handle_selection_changed (selection,
 				  4,
 				  cfm->view_your_button,
 				  cfm->backup_your_button, /* yes yes, not really "edit", it's a hack :) */
@@ -290,7 +290,7 @@ delete_contact (GtkWidget *widget, CertificateManagerData *cfm)
 static void
 contactcerts_selection_changed (GtkTreeSelection *selection, CertificateManagerData *cfm)
 {
-	handle_selection_changed (gtk_tree_view_get_selection (GTK_TREE_VIEW(cfm->contactcerts_treeview)),
+	handle_selection_changed (selection,
 				  3,
 				  cfm->view_contact_button,
 				  cfm->edit_contact_button,
@@ -447,7 +447,7 @@ delete_ca (GtkWidget *widget, CertificateManagerData *cfm)
 static void
 authoritycerts_selection_changed (GtkTreeSelection *selection, CertificateManagerData *cfm)
 {
-	handle_selection_changed (gtk_tree_view_get_selection (GTK_TREE_VIEW(cfm->authoritycerts_treeview)),
+	handle_selection_changed (selection,
 				  1,
 				  cfm->view_ca_button,
 				  cfm->edit_ca_button,
diff --git a/smime/gui/certificate-viewer.c b/smime/gui/certificate-viewer.c
index 4a0bc3327d..9314ac5c1e 100644
--- a/smime/gui/certificate-viewer.c
+++ b/smime/gui/certificate-viewer.c
@@ -22,6 +22,8 @@
 
 #include "certificate-viewer.h"
 
+#include "e-asn1-object.h"
+
 #include <gtk/gtk.h>
 
 #include <libgnome/gnome-i18n.h>
@@ -32,6 +34,11 @@
 typedef struct {
 	GladeXML *gui;
 	GtkWidget *dialog;
+	GtkTreeStore *hierarchy_store, *fields_store;
+	GtkWidget *hierarchy_tree, *fields_tree;
+	GtkWidget *field_text;
+
+	GList *cert_chain;
 } CertificateViewerData;
 
 static void
@@ -39,26 +46,20 @@ free_data (gpointer data, GObject *where_the_object_was)
 {
 	CertificateViewerData *cvm = data;
 
+	g_list_foreach (cvm->cert_chain, (GFunc)g_object_unref, NULL);
+	g_list_free (cvm->cert_chain);
+
 	g_object_unref (cvm->gui);
 	g_free (cvm);
 }
 
-
-GtkWidget*
-certificate_viewer_show (ECert *cert)
+static void
+fill_in_general (CertificateViewerData *cvm_data, ECert *cert)
 {
-	CertificateViewerData *cvm_data;
-	CERTCertificate *mcert;
+	CERTCertificate *mcert = e_cert_get_internal_cert (cert);
 	GtkWidget *label;
 	const char *text;
 
-	mcert = e_cert_get_internal_cert (cert);
-
-	cvm_data = g_new0 (CertificateViewerData, 1);
-	cvm_data->gui = glade_xml_new (EVOLUTION_GLADEDIR "/" GLADE_FILE_NAME, NULL, NULL);
-
-	cvm_data->dialog = glade_xml_get_widget (cvm_data->gui, "certificate-viewer-dialog");
-
 	/* issued to */
 	if (e_cert_get_cn (cert)) {
 		label = glade_xml_get_widget (cvm_data->gui, "issued-to-cn");
@@ -114,6 +115,108 @@ certificate_viewer_show (ECert *cert)
 	text = e_cert_get_md5_fingerprint (cert);
 	label = glade_xml_get_widget (cvm_data->gui, "fingerprints-md5");
 	gtk_label_set_text (GTK_LABEL (label), text);
+}
+
+static void
+hierarchy_selection_changed (GtkTreeSelection *selection, CertificateViewerData *cvm_data)
+{
+	GtkTreeIter iter;
+	GtkTreeModel *model;
+
+	if (gtk_tree_selection_get_selected (selection,
+					     &model,
+					     &iter)) {
+		EASN1Object *asn1_object;
+		ECert *cert;
+
+		gtk_tree_model_get (model,
+				    &iter,
+				    1, &cert,
+				    -1);
+
+		if (!cert)
+			return;
+
+		/* XXX show the selected fields somehow */
+		asn1_object = e_asn1_object_new_from_cert (cert);
+	}	
+}
+
+static void
+fields_selection_changed (GtkTreeSelection *selection, CertificateViewerData *cvm_data)
+{
+}
+
+static void
+fill_in_details (CertificateViewerData *cvm_data, ECert *cert)
+{
+	GList *l;
+	GtkTreeIter *root = NULL;
+	GtkTreeSelection *selection;
+
+	/* hook up all the hierarchy tree foo */
+	cvm_data->hierarchy_store = gtk_tree_store_new (2, G_TYPE_STRING, G_TYPE_OBJECT);
+	cvm_data->hierarchy_tree = glade_xml_get_widget (cvm_data->gui, "cert-hierarchy-treeview");
+	gtk_tree_view_set_model (GTK_TREE_VIEW (cvm_data->hierarchy_tree),
+				 GTK_TREE_MODEL (cvm_data->hierarchy_store));
+
+	gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (cvm_data->hierarchy_tree),
+						     -1, "Cert", gtk_cell_renderer_text_new(),
+						     "text", 0, NULL);
+
+	selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (cvm_data->hierarchy_tree));
+	g_signal_connect (selection, "changed", G_CALLBACK (hierarchy_selection_changed), cvm_data);
+
+	/* hook up all the fields tree foo */
+	cvm_data->fields_store = gtk_tree_store_new (1, G_TYPE_STRING);
+	cvm_data->fields_tree = glade_xml_get_widget (cvm_data->gui, "cert-fields-treeview");
+	gtk_tree_view_set_model (GTK_TREE_VIEW (cvm_data->fields_tree),
+				 GTK_TREE_MODEL (cvm_data->fields_store));
+
+	gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (cvm_data->fields_tree),
+						     -1, "Field", gtk_cell_renderer_text_new(),
+						     "text", 0, NULL);
+
+	selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (cvm_data->fields_tree));
+	g_signal_connect (selection, "changed", G_CALLBACK (fields_selection_changed), cvm_data);
+
+	/* hook up all the field display foo */
+	cvm_data->field_text = glade_xml_get_widget (cvm_data->gui, "cert-field-value-textview");
+
+	/* initially populate the hierarchy from the cert's chain */
+	cvm_data->cert_chain = e_cert_get_chain (cert);
+	cvm_data->cert_chain = g_list_reverse (cvm_data->cert_chain);
+	for (l = cvm_data->cert_chain; l; l = l->next) {
+		ECert *c = l->data;
+		const char *str;
+		GtkTreeIter new_iter;
+
+		str = e_cert_get_cn (c);
+		if (!str)
+			str = e_cert_get_subject_name (c);
+
+		gtk_tree_store_insert (cvm_data->hierarchy_store, &new_iter, root, -1);
+		gtk_tree_store_set (cvm_data->hierarchy_store, &new_iter,
+				    0, str,
+				    1, c,
+				    -1);
+
+		root = &new_iter;
+	}
+}
+
+GtkWidget*
+certificate_viewer_show (ECert *cert)
+{
+	CertificateViewerData *cvm_data;
+
+	cvm_data = g_new0 (CertificateViewerData, 1);
+	cvm_data->gui = glade_xml_new (EVOLUTION_GLADEDIR "/" GLADE_FILE_NAME, NULL, NULL);
+
+	cvm_data->dialog = glade_xml_get_widget (cvm_data->gui, "certificate-viewer-dialog");
+
+	fill_in_general (cvm_data, cert);
+	fill_in_details (cvm_data, cert);
 
 	g_object_weak_ref (G_OBJECT (cvm_data->dialog), free_data, cvm_data);
 
diff --git a/smime/gui/smime-ui.glade b/smime/gui/smime-ui.glade
index 57475c1cbc..36966f7443 100644
--- a/smime/gui/smime-ui.glade
+++ b/smime/gui/smime-ui.glade
@@ -1759,8 +1759,8 @@
   </child>
 </widget>
 
-<widget class="GtkDialog" id="dialog1">
-  <property name="title" translatable="yes">dialog1</property>
+<widget class="GtkDialog" id="ca-trust-dialog">
+  <property name="title" translatable="yes">Certificate Authority Trust</property>
   <property name="type">GTK_WINDOW_TOPLEVEL</property>
   <property name="window_position">GTK_WIN_POS_NONE</property>
   <property name="modal">False</property>