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/merging | |
| 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/merging')
| -rw-r--r-- | addressbook/gui/merging/eab-contact-merging.c | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/addressbook/gui/merging/eab-contact-merging.c b/addressbook/gui/merging/eab-contact-merging.c index 37f147eaa4..ecb70b84d9 100644 --- a/addressbook/gui/merging/eab-contact-merging.c +++ b/addressbook/gui/merging/eab-contact-merging.c @@ -18,6 +18,7 @@ #include <gtk/gtkdialog.h> #include <gtk/gtkcontainer.h> #include "addressbook/gui/widgets/eab-contact-display.h" +#include "e-util/e-util-private.h" typedef enum { E_CONTACT_MERGING_ADD, @@ -153,6 +154,7 @@ static void match_query_callback (EContact *contact, EContact *match, EABContactMatchType type, gpointer closure) { EContactMergingLookup *lookup = closure; + char *gladefile; if ((gint) type <= (gint) EAB_CONTACT_MATCH_VAGUE) { doit (lookup); @@ -161,11 +163,19 @@ match_query_callback (EContact *contact, EContact *match, EABContactMatchType ty GtkWidget *widget; - if (lookup->op == E_CONTACT_MERGING_ADD) - ui = glade_xml_new (EVOLUTION_GLADEDIR "/eab-contact-duplicate-detected.glade", NULL, NULL); - else if (lookup->op == E_CONTACT_MERGING_COMMIT) - ui = glade_xml_new (EVOLUTION_GLADEDIR "/eab-contact-commit-duplicate-detected.glade", NULL, NULL); - else { + if (lookup->op == E_CONTACT_MERGING_ADD) { + gladefile = g_build_filename (EVOLUTION_GLADEDIR, + "eab-contact-duplicate-detected.glade", + NULL); + ui = glade_xml_new (gladefile, NULL, NULL); + g_free (gladefile); + } else if (lookup->op == E_CONTACT_MERGING_COMMIT) { + gladefile = g_build_filename (EVOLUTION_GLADEDIR, + "eab-contact-commit-duplicate-detected.glade", + NULL); + ui = glade_xml_new (gladefile, NULL, NULL); + g_free (gladefile); + } else { doit (lookup); return; } |