From ae89d959aab24359c730375cff664ac3b44cc953 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Sat, 26 Nov 2005 01:51:39 +0000 Subject: gui/contact-editor/e-contact-editor.c 2005-11-26 Tor Lillqvist * 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 --- addressbook/gui/contact-editor/e-contact-editor.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'addressbook/gui/contact-editor/e-contact-editor.c') diff --git a/addressbook/gui/contact-editor/e-contact-editor.c b/addressbook/gui/contact-editor/e-contact-editor.c index 535285ba6c..b9757bbdfd 100644 --- a/addressbook/gui/contact-editor/e-contact-editor.c +++ b/addressbook/gui/contact-editor/e-contact-editor.c @@ -60,6 +60,7 @@ #include "misc/e-url-entry.h" #include "shell/evolution-shell-component-utils.h" #include "e-util/e-icon-factory.h" +#include "e-util/e-util-private.h" #include "eab-contact-merging.h" #include @@ -3149,6 +3150,7 @@ e_contact_editor_init (EContactEditor *e_contact_editor) GladeXML *gui; GtkWidget *widget, *label; char *icon_path; + char *gladefile; e_contact_editor->name = e_contact_name_new(); @@ -3161,7 +3163,12 @@ e_contact_editor_init (EContactEditor *e_contact_editor) e_contact_editor->load_source_id = 0; e_contact_editor->load_book = NULL; - gui = glade_xml_new (EVOLUTION_GLADEDIR "/contact-editor.glade", NULL, NULL); + gladefile = g_build_filename (EVOLUTION_GLADEDIR, + "contact-editor.glade", + NULL); + gui = glade_xml_new (gladefile, NULL, NULL); + g_free (gladefile); + e_contact_editor->gui = gui; setup_tab_order(gui); -- cgit v1.2.3