diff options
author | Tor Lillqvist <tml@novell.com> | 2005-11-26 09:51:39 +0800 |
---|---|---|
committer | Tor Lillqvist <tml@src.gnome.org> | 2005-11-26 09:51:39 +0800 |
commit | ae89d959aab24359c730375cff664ac3b44cc953 (patch) | |
tree | 0586e91beff095bc1106af81a2473f2649782d93 /addressbook/gui/contact-editor | |
parent | 562c2c4c630683d1ec5b9b5958525e6509a56eb2 (diff) | |
download | gsoc2013-evolution-ae89d959aab24359c730375cff664ac3b44cc953.tar gsoc2013-evolution-ae89d959aab24359c730375cff664ac3b44cc953.tar.gz gsoc2013-evolution-ae89d959aab24359c730375cff664ac3b44cc953.tar.bz2 gsoc2013-evolution-ae89d959aab24359c730375cff664ac3b44cc953.tar.lz gsoc2013-evolution-ae89d959aab24359c730375cff664ac3b44cc953.tar.xz 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/gui/contact-editor')
4 files changed, 32 insertions, 4 deletions
diff --git a/addressbook/gui/contact-editor/e-contact-editor-address.c b/addressbook/gui/contact-editor/e-contact-editor-address.c index 1200511c30..79c578ef17 100644 --- a/addressbook/gui/contact-editor/e-contact-editor-address.c +++ b/addressbook/gui/contact-editor/e-contact-editor-address.c @@ -23,6 +23,7 @@ #include <e-contact-editor-address.h> #include <e-util/e-icon-factory.h> +#include <e-util/e-util-private.h> #include <glib.h> #include <libgnome/gnome-i18n.h> @@ -421,6 +422,7 @@ e_contact_editor_address_init (EContactEditorAddress *e_contact_editor_address) GladeXML *gui; GtkWidget *widget; GList *icon_list; + char *gladefile; gtk_dialog_add_buttons (GTK_DIALOG (e_contact_editor_address), GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, @@ -431,7 +433,12 @@ e_contact_editor_address_init (EContactEditorAddress *e_contact_editor_address) e_contact_editor_address->address = NULL; - gui = glade_xml_new (EVOLUTION_GLADEDIR "/fulladdr.glade", NULL, NULL); + gladefile = g_build_filename (EVOLUTION_GLADEDIR, + "fulladdr.glade", + NULL); + gui = glade_xml_new (gladefile, NULL, NULL); + g_free (gladefile); + e_contact_editor_address->gui = gui; setup_tab_order (gui); diff --git a/addressbook/gui/contact-editor/e-contact-editor-fullname.c b/addressbook/gui/contact-editor/e-contact-editor-fullname.c index 1847a463f1..249ffb38fc 100644 --- a/addressbook/gui/contact-editor/e-contact-editor-fullname.c +++ b/addressbook/gui/contact-editor/e-contact-editor-fullname.c @@ -22,6 +22,7 @@ #include <config.h> #include "e-contact-editor-fullname.h" #include <e-util/e-icon-factory.h> +#include <e-util/e-util-private.h> #include <libgnome/gnome-util.h> #include <libgnome/gnome-i18n.h> #include <gtk/gtkcombo.h> @@ -104,6 +105,7 @@ e_contact_editor_fullname_init (EContactEditorFullname *e_contact_editor_fullnam GladeXML *gui; GtkWidget *widget; GList *icon_list; + char *gladefile; gtk_widget_realize (GTK_WIDGET (e_contact_editor_fullname)); gtk_dialog_set_has_separator (GTK_DIALOG (e_contact_editor_fullname), @@ -119,7 +121,13 @@ e_contact_editor_fullname_init (EContactEditorFullname *e_contact_editor_fullnam gtk_window_set_resizable(GTK_WINDOW(e_contact_editor_fullname), TRUE); e_contact_editor_fullname->name = NULL; - gui = glade_xml_new (EVOLUTION_GLADEDIR "/fullname.glade", NULL, NULL); + + gladefile = g_build_filename (EVOLUTION_GLADEDIR, + "fullname.glade", + NULL); + gui = glade_xml_new (gladefile, NULL, NULL); + g_free (gladefile); + e_contact_editor_fullname->gui = gui; widget = glade_xml_get_widget(gui, "dialog-checkfullname"); diff --git a/addressbook/gui/contact-editor/e-contact-editor-im.c b/addressbook/gui/contact-editor/e-contact-editor-im.c index 2c1c89af9a..08925aeb78 100644 --- a/addressbook/gui/contact-editor/e-contact-editor-im.c +++ b/addressbook/gui/contact-editor/e-contact-editor-im.c @@ -34,6 +34,7 @@ #include <gtk/gtkstock.h> #include <string.h> #include <e-util/e-icon-factory.h> +#include <e-util/e-util-private.h> static void e_contact_editor_im_init (EContactEditorIm *card); static void e_contact_editor_im_class_init (EContactEditorImClass *klass); @@ -247,6 +248,7 @@ e_contact_editor_im_init (EContactEditorIm *e_contact_editor_im) GladeXML *gui; GtkWidget *widget; GList *icon_list; + char *gladefile; gtk_dialog_add_buttons (GTK_DIALOG (e_contact_editor_im), GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, @@ -262,7 +264,11 @@ e_contact_editor_im_init (EContactEditorIm *e_contact_editor_im) e_contact_editor_im->service = FIRST_IM_TYPE; e_contact_editor_im->location = g_strdup("HOME"); e_contact_editor_im->username = NULL; - gui = glade_xml_new (EVOLUTION_GLADEDIR "/im.glade", NULL, NULL); + + gladefile = g_build_filename (EVOLUTION_GLADEDIR, "im.glade", NULL); + gui = glade_xml_new (gladefile, NULL, NULL); + g_free (gladefile); + e_contact_editor_im->gui = gui; widget = glade_xml_get_widget(gui, "dialog-im"); 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 <libgnomevfs/gnome-vfs-ops.h> @@ -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); |