aboutsummaryrefslogtreecommitdiffstats
path: root/addressbook/printing
diff options
context:
space:
mode:
authorTor Lillqvist <tml@novell.com>2005-11-26 09:51:39 +0800
committerTor Lillqvist <tml@src.gnome.org>2005-11-26 09:51:39 +0800
commitae89d959aab24359c730375cff664ac3b44cc953 (patch)
tree0586e91beff095bc1106af81a2473f2649782d93 /addressbook/printing
parent562c2c4c630683d1ec5b9b5958525e6509a56eb2 (diff)
downloadgsoc2013-evolution-ae89d959aab24359c730375cff664ac3b44cc953.tar.gz
gsoc2013-evolution-ae89d959aab24359c730375cff664ac3b44cc953.tar.zst
gsoc2013-evolution-ae89d959aab24359c730375cff664ac3b44cc953.zip
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
Diffstat (limited to 'addressbook/printing')
-rw-r--r--addressbook/printing/e-contact-print-style-editor.c9
-rw-r--r--addressbook/printing/e-contact-print.c1
2 files changed, 9 insertions, 1 deletions
diff --git a/addressbook/printing/e-contact-print-style-editor.c b/addressbook/printing/e-contact-print-style-editor.c
index 436aaddff0..8c41f9491b 100644
--- a/addressbook/printing/e-contact-print-style-editor.c
+++ b/addressbook/printing/e-contact-print-style-editor.c
@@ -20,6 +20,7 @@
*/
#include "e-contact-print-style-editor.h"
+#include "e-util/e-util-private.h"
static void e_contact_print_style_editor_init (EContactPrintStyleEditor *card);
static void e_contact_print_style_editor_class_init (EContactPrintStyleEditorClass *klass);
@@ -99,9 +100,15 @@ static void
e_contact_print_style_editor_init (EContactPrintStyleEditor *e_contact_print_style_editor)
{
GladeXML *gui;
+ char *gladefile;
/* e_contact_print_style_editor->card = NULL;*/
- gui = glade_xml_new (EVOLUTION_GLADEDIR "/e-contact-print.glade", NULL, NULL);
+ gladefile = g_build_filename (EVOLUTION_GLADEDIR,
+ "e-contact-print.glade",
+ NULL);
+ gui = glade_xml_new (gladefile, NULL, NULL);
+ g_free (gladefile);
+
e_contact_print_style_editor->gui = gui;
gtk_widget_reparent(glade_xml_get_widget(gui, "vbox-contact-print-style-editor"),
GTK_WIDGET(e_contact_print_style_editor));
diff --git a/addressbook/printing/e-contact-print.c b/addressbook/printing/e-contact-print.c
index 4546d9b2a4..a662185838 100644
--- a/addressbook/printing/e-contact-print.c
+++ b/addressbook/printing/e-contact-print.c
@@ -43,6 +43,7 @@
#include <libebook/e-book.h>
#include <libebook/e-contact.h>
#include <e-util/e-util.h>
+#include <e-util/e-util-private.h>
#include <e-util/e-print.h>
#define SCALE 5