aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTor Lillqvist <tml@novell.com>2005-11-26 09:32:18 +0800
committerTor Lillqvist <tml@src.gnome.org>2005-11-26 09:32:18 +0800
commit562c2c4c630683d1ec5b9b5958525e6509a56eb2 (patch)
treec8d8bf4d012d6294a229994d91d137f4588e2347
parentc815b41a7c9c0aaba193ef0b5d422cc15672909c (diff)
downloadgsoc2013-evolution-562c2c4c630683d1ec5b9b5958525e6509a56eb2.tar
gsoc2013-evolution-562c2c4c630683d1ec5b9b5958525e6509a56eb2.tar.gz
gsoc2013-evolution-562c2c4c630683d1ec5b9b5958525e6509a56eb2.tar.bz2
gsoc2013-evolution-562c2c4c630683d1ec5b9b5958525e6509a56eb2.tar.lz
gsoc2013-evolution-562c2c4c630683d1ec5b9b5958525e6509a56eb2.tar.xz
gsoc2013-evolution-562c2c4c630683d1ec5b9b5958525e6509a56eb2.tar.zst
gsoc2013-evolution-562c2c4c630683d1ec5b9b5958525e6509a56eb2.zip
Include e-util-private,h to get redefinition of EVOLUTION_UIDIR (as a call
2005-11-25 Tor Lillqvist <tml@novell.com> * gui/component/addressbook-view.c (control_activate): Include e-util-private,h to get redefinition of EVOLUTION_UIDIR (as a call to a function) on Windows. Construct the path of the xml file at run-time to enable install-anywhere on Windows. svn path=/trunk/; revision=30677
-rw-r--r--addressbook/ChangeLog5
-rw-r--r--addressbook/gui/component/addressbook-view.c8
2 files changed, 12 insertions, 1 deletions
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index 71718d9da6..8f35be4765 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -15,6 +15,11 @@
addressbook_config_edit_source): Construct the path of the glade
file at run-time to enable install-anywhere on Windows.
+ * gui/component/addressbook-view.c (control_activate): Include
+ e-util-private,h to get redefinition of EVOLUTION_UIDIR (as a call
+ to a function) on Windows. Construct the path of the xml file at
+ run-time to enable install-anywhere on Windows.
+
* importers/evolution-ldif-importer.c (ldif_import)
* gui/widgets/eab-gui-util.c (eab_load_error_dialog): Use
g_filename_from_uri() instead of just stripping off the "file://"
diff --git a/addressbook/gui/component/addressbook-view.c b/addressbook/gui/component/addressbook-view.c
index 564c659d05..7a88888039 100644
--- a/addressbook/gui/component/addressbook-view.c
+++ b/addressbook/gui/component/addressbook-view.c
@@ -48,6 +48,7 @@
#include "e-util/e-icon-factory.h"
+#include "e-util/e-util-private.h"
#include "shell/e-user-creatable-items-handler.h"
#include "evolution-shell-component-utils.h"
@@ -438,6 +439,7 @@ control_activate (BonoboControl *control,
AddressbookViewPrivate *priv = view->priv;
Bonobo_UIContainer remote_ui_container;
EABView *v = get_current_view (view);
+ char *xmlfile;
remote_ui_container = bonobo_control_get_remote_ui_container (control, NULL);
bonobo_ui_component_set_container (uic, remote_ui_container, NULL);
@@ -448,9 +450,13 @@ control_activate (BonoboControl *control,
bonobo_ui_component_freeze (uic, NULL);
+ xmlfile = g_build_filename (EVOLUTION_UIDIR,
+ "evolution-addressbook.xml",
+ NULL);
bonobo_ui_util_set_ui (uic, PREFIX,
- EVOLUTION_UIDIR "/evolution-addressbook.xml",
+ xmlfile,
"evolution-addressbook", NULL);
+ g_free (xmlfile);
if (v)
eab_view_setup_menus (v, uic);