gui/ca-trust-dialog.c (ca_trust_dialog_show) gui/cert-trust-dialog.c

2005-12-18  Tor Lillqvist  <tml@novell.com>

	* gui/ca-trust-dialog.c (ca_trust_dialog_show)
	* gui/cert-trust-dialog.c (cert_trust_dialog_show)
	* gui/certificate-manager.c (certificate_manager_config_control_new)
	* gui/certificate-viewer.c (certificate_viewer_show)
	* gui/e-cert-selector.c (e_cert_selector_new):
	Construct glade file pathname at run-time.

svn path=/trunk/; revision=30857

7 files changed, 56 insertions, 5 deletions

diff --git a/smime/ChangeLog b/smime/ChangeLog
index 01fdbfd7eb..1e16cc28af 100644
--- a/smime/ChangeLog
+++ b/smime/ChangeLog
@@ -1,3 +1,14 @@
+2005-12-18  Tor Lillqvist  <tml@novell.com>
+
+	* gui/Makefile.am: Link with libeutil.
+
+	* gui/ca-trust-dialog.c (ca_trust_dialog_show)
+	* gui/cert-trust-dialog.c (cert_trust_dialog_show)
+	* gui/certificate-manager.c (certificate_manager_config_control_new)
+	* gui/certificate-viewer.c (certificate_viewer_show)
+	* gui/e-cert-selector.c (e_cert_selector_new):
+	Construct glade file pathname at run-time.
+
 2005-07-28  Mengjie Yu  <meng-jie.yu@sun.com>
 
 	* lib/e-cert-db.c:
diff --git a/smime/gui/Makefile.am b/smime/gui/Makefile.am
index 6356d48737..44667d88a2 100644
--- a/smime/gui/Makefile.am
+++ b/smime/gui/Makefile.am
@@ -34,6 +34,7 @@ libevolution_smime_la_SOURCES = 	\
 
 
 libevolution_smime_la_LIBADD =			\
+	$(top_builddir)/e-util/libeutil.la	\
 	$(top_builddir)/shell/libeshell.la	\
 	$(top_builddir)/smime/lib/libessmime.la	\
 	$(CERT_UI_LIBS)
diff --git a/smime/gui/ca-trust-dialog.c b/smime/gui/ca-trust-dialog.c
index f5c2aba259..9278a13537 100644
--- a/smime/gui/ca-trust-dialog.c
+++ b/smime/gui/ca-trust-dialog.c
@@ -33,6 +33,8 @@
 #include <libgnome/gnome-i18n.h>
 #include <glade/glade.h>
 
+#include "e-util/e-util-private.h"
+
 #define GLADE_FILE_NAME "smime-ui.glade"
 
 typedef struct {
@@ -76,9 +78,15 @@ ca_trust_dialog_show (ECert *cert, gboolean importing)
 	CATrustDialogData *ctd_data;
 	GtkWidget *w;
 	char *txt;
+	char *gladefile;
 
 	ctd_data = g_new0 (CATrustDialogData, 1);
-	ctd_data->gui = glade_xml_new (EVOLUTION_GLADEDIR "/" GLADE_FILE_NAME, NULL, NULL);
+
+	gladefile = g_build_filename (EVOLUTION_GLADEDIR,
+				      GLADE_FILE_NAME,
+				      NULL);
+	ctd_data->gui = glade_xml_new (gladefile, NULL, NULL);
+	g_free (gladefile);
 
 	ctd_data->dialog = glade_xml_get_widget (ctd_data->gui, "ca-trust-dialog");
 
diff --git a/smime/gui/cert-trust-dialog.c b/smime/gui/cert-trust-dialog.c
index b36d99ff53..13c02e76b2 100644
--- a/smime/gui/cert-trust-dialog.c
+++ b/smime/gui/cert-trust-dialog.c
@@ -39,6 +39,8 @@
 #include <libgnome/gnome-i18n.h>
 #include <glade/glade.h>
 
+#include "e-util/e-util-private.h"
+
 #define GLADE_FILE_NAME "smime-ui.glade"
 
 typedef struct {
@@ -116,9 +118,15 @@ cert_trust_dialog_show (ECert *cert)
 {
 	CertTrustDialogData *ctd_data;
 	CERTCertificate *icert;
+	char *gladefile;
 
 	ctd_data = g_new0 (CertTrustDialogData, 1);
-	ctd_data->gui = glade_xml_new (EVOLUTION_GLADEDIR "/" GLADE_FILE_NAME, NULL, NULL);
+
+	gladefile = g_build_filename (EVOLUTION_GLADEDIR,
+				      GLADE_FILE_NAME,
+				      NULL);
+	ctd_data->gui = glade_xml_new (gladefile, NULL, NULL);
+	g_free (gladefile);
 
 	ctd_data->dialog = glade_xml_get_widget (ctd_data->gui, "cert-trust-dialog");
 	ctd_data->cert = g_object_ref (cert);
diff --git a/smime/gui/certificate-manager.c b/smime/gui/certificate-manager.c
index 867eed7b80..3191a793e0 100644
--- a/smime/gui/certificate-manager.c
+++ b/smime/gui/certificate-manager.c
@@ -49,6 +49,8 @@
 #include <pkcs11.h>
 #include <pk11func.h>
 
+#include "e-util/e-util-private.h"
+
 typedef struct {
 	GladeXML *gui;
 
@@ -970,12 +972,18 @@ certificate_manager_config_control_new (void)
 {
 	CertificateManagerData *cfm_data;
 	GtkWidget *control_widget;
+	char *gladefile;
 
 	/* We need to peek the db here to make sure it (and NSS) are fully initialized. */
 	e_cert_db_peek ();
 
 	cfm_data = g_new0 (CertificateManagerData, 1);
-	cfm_data->gui = glade_xml_new (EVOLUTION_GLADEDIR "/" GLADE_FILE_NAME, NULL, NULL);
+
+	gladefile = g_build_filename (EVOLUTION_GLADEDIR,
+				      GLADE_FILE_NAME,
+				      NULL);
+	cfm_data->gui = glade_xml_new (gladefile, NULL, NULL);
+	g_free (gladefile);
 
 	cfm_data->yourcerts_treeview = glade_xml_get_widget (cfm_data->gui, "yourcerts-treeview");
 	cfm_data->contactcerts_treeview = glade_xml_get_widget (cfm_data->gui, "contactcerts-treeview");
diff --git a/smime/gui/certificate-viewer.c b/smime/gui/certificate-viewer.c
index 4495ca8f2b..94799b7074 100644
--- a/smime/gui/certificate-viewer.c
+++ b/smime/gui/certificate-viewer.c
@@ -34,6 +34,8 @@
 #include <libgnome/gnome-i18n.h>
 #include <glade/glade.h>
 
+#include "e-util/e-util-private.h"
+
 #define GLADE_FILE_NAME "smime-ui.glade"
 
 typedef struct {
@@ -322,9 +324,15 @@ certificate_viewer_show (ECert *cert)
 {
 	CertificateViewerData *cvm_data;
 	char *title;
+	char *gladefile;
 
 	cvm_data = g_new0 (CertificateViewerData, 1);
-	cvm_data->gui = glade_xml_new (EVOLUTION_GLADEDIR "/" GLADE_FILE_NAME, NULL, NULL);
+
+	gladefile = g_build_filename (EVOLUTION_GLADEDIR,
+				      GLADE_FILE_NAME,
+				      NULL);
+	cvm_data->gui = glade_xml_new (gladefile, NULL, NULL);
+	g_free (gladefile);
 
 	cvm_data->dialog = glade_xml_get_widget (cvm_data->gui, "certificate-viewer-dialog");
 
diff --git a/smime/gui/e-cert-selector.c b/smime/gui/e-cert-selector.c
index ac4c6e8785..7241d867b6 100644
--- a/smime/gui/e-cert-selector.c
+++ b/smime/gui/e-cert-selector.c
@@ -40,6 +40,8 @@
 
 #include "e-cert-selector.h"
 
+#include "e-util/e-util-private.h"
+
 struct _ECertSelectorPrivate {
 	CERTCertList *certlist;
 
@@ -153,11 +155,16 @@ e_cert_selector_new(int type, const char *currentid)
 	GladeXML *gui;
 	GtkWidget *w, *menu;
 	int n=0, active=0;
+	char *gladefile;
 
 	ecs = g_object_new(e_cert_selector_get_type(), NULL);
 	p = ecs->priv;
 
-	gui = glade_xml_new(EVOLUTION_GLADEDIR "/smime-ui.glade", "cert_selector_vbox", NULL);
+	gladefile = g_build_filename(EVOLUTION_GLADEDIR,
+				     "smime-ui.glade",
+				     NULL);
+	gui = glade_xml_new(gladefile, "cert_selector_vbox", NULL);
+	g_free (gladefile);
 
 	p->menu = glade_xml_get_widget(gui, "cert_menu");
 	p->description = glade_xml_get_widget(gui, "cert_description");