gui/contact-editor/e-contact-editor.c

2005-11-26  Tor Lillqvist  <tml@novell.com>

	* gui/contact-editor/e-contact-editor.c
	* gui/contact-editor/e-contact-editor-address.c
	* gui/contact-editor/e-contact-editor-fullname.c
	* gui/contact-editor/e-contact-editor-im.c
	* gui/contact-list-editor/e-contact-list-editor.c
	* gui/merging/eab-contact-merging.c
	* gui/widgets/e-addressbook-view.c
	* printing/e-contact-print.c
	* printing/e-contact-print-style-editor.c: Include
	e-util-private.h to get redefinition of compile-time pathnames as
	calls to functions on Windows. Construct the pathnames of files
	and directories under the installation prefix at run-time to
	enable install-anywhere on Windows. No effect on functionality on
	Unix.

svn path=/trunk/; revision=30678

1 files changed, 14 insertions, 2 deletions

diff --git a/addressbook/gui/contact-list-editor/e-contact-list-editor.c b/addressbook/gui/contact-list-editor/e-contact-list-editor.c
index f141f005d9..87a3946314 100644
--- a/addressbook/gui/contact-list-editor/e-contact-list-editor.c
+++ b/addressbook/gui/contact-list-editor/e-contact-list-editor.c
@@ -22,6 +22,7 @@
 
 #include "e-contact-list-editor.h"
 #include <e-util/e-icon-factory.h>
+#include <e-util/e-util-private.h>
 
 #include <string.h>
 
@@ -191,6 +192,7 @@ e_contact_list_editor_init (EContactListEditor *editor)
 {
 	GladeXML *gui;
 	GList *icon_list;
+	char *gladefile;
 
 	editor->contact = NULL;
 	editor->changed = FALSE;
@@ -203,7 +205,12 @@ e_contact_list_editor_init (EContactListEditor *editor)
 	editor->load_source_id = 0;
 	editor->load_book = NULL;
 
-	gui = glade_xml_new (EVOLUTION_GLADEDIR "/contact-list-editor.glade", NULL, NULL);
+	gladefile = g_build_filename (EVOLUTION_GLADEDIR,
+				      "contact-list-editor.glade",
+				      NULL);
+	gui = glade_xml_new (gladefile, NULL, NULL);
+	g_free (gladefile);
+
 	editor->gui = gui;
 
 	editor->app = glade_xml_get_widget (gui, "contact list editor");
@@ -642,13 +649,18 @@ e_contact_list_editor_create_table(gchar *name,
 	
 	ETableModel *model;
 	GtkWidget *table;
+	char *etspecfile;
 
 	model = e_contact_list_model_new ();
 
+	etspecfile = g_build_filename (EVOLUTION_ETSPECDIR,
+				       "e-contact-list-editor.etspec",
+				       NULL);
 	table = e_table_scrolled_new_from_spec_file (model,
 				      NULL,
-				      EVOLUTION_ETSPECDIR "/e-contact-list-editor.etspec",
+				      etspecfile,
 				      NULL);
+	g_free (etspecfile);
 
 	g_object_set_data(G_OBJECT(table), "model", model);