callisto-debian/evolution
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Everywhere add a -DEVOLUTION_DATADIR=${datadir} in the Makefile.am

Browse Source 
And use this in grabbing the ui from the xml file.

Requires HEAD bonobo.

svn path=/trunk/; revision=5474
This commit is contained in:
Michael Meeks
2000-09-16 16:37:07 +00:00
parent fa1d9f97df
commit 4f04a07954
11 changed files with 37 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
addressbook/ChangeLog
View File

@ -1,3 +1,12 @@
2000-09-16 Michael Meeks <michael@helixcode.com>
* gui/component/select-names/e-select-names.c: fix broken include.
* gui/component/Makefile.am (INCLUDES): define datadir.
(evolution_addressbook_SOURCES): remove e-addressbook-model.[ch]
* gui/component/addressbook.c (control_activate): use datadir.
2000-09-16 Ettore Perazzoli <ettore@helixcode.com>
* gui/widgets/Makefile.am (gladedir): Define.

1
addressbook/gui/component/Makefile.am
View File

@ -21,6 +21,7 @@ INCLUDES = \
-I$(top_builddir)/addressbook/backend \
$(BONOBO_HTML_GNOME_CFLAGS) \
-DEVOLUTION_VERSION=\""$(VERSION)"\" \
-DEVOLUTION_DATADIR=\""$(datadir)"\" \
-DEVOLUTION_GLADEDIR=\""$(gladedir)"\" \
-DEVOLUTION_ICONSDIR=\""$(iconsdir)"\" \
-DEVOLUTION_LOCALEDIR=\""$(datadir)/locale"\" \

5
addressbook/gui/component/addressbook.c
View File

@ -28,7 +28,7 @@
#include <e-scroll-frame.h>
#include <e-addressbook-model.h>
#include <addressbook/gui/widgets/e-addressbook-model.h>
#include <select-names/e-select-names.h>
#include <select-names/e-select-names-manager.h>
@ -524,7 +524,8 @@ control_activate (BonoboControl *control, BonoboUIHandler *uih,
bonobo_ui_container_freeze (container, NULL);
fname = bonobo_ui_util_get_ui_fname ("evolution-addressbook.xml");
fname = bonobo_ui_util_get_ui_fname (
EVOLUTION_DATADIR, "evolution-addressbook.xml");
g_warning ("Attempting ui load from '%s'", fname);
ui = bonobo_ui_util_new_ui (component, fname, "evolution-addressbook");

6
calendar/ChangeLog
View File

@ -1,3 +1,9 @@
2000-09-16 Michael Meeks <michael@helixcode.com>
* gui/Makefile.am (INCLUDES): add datadir
* gui/calendar-commands.c (calendar_control_activate): use it.
2000-09-14 JP Rosevear <jpr@helixcode.com>
* conduits/todo/.cvsignore: Shush

1
calendar/gui/Makefile.am
View File

@ -18,6 +18,7 @@ INCLUDES = \
-I$(top_srcdir)/widgets \
-I$(includedir) \
$(BONOBO_VFS_GNOME_CFLAGS) \
-DEVOLUTION_DATADIR=\""$(datadir)"\" \
-DEVOLUTION_GLADEDIR=\""$(gladedir)"\" \
-DGNOMELOCALEDIR=\""$(datadir)/locale"\"

3
calendar/gui/calendar-commands.c
View File

@ -593,7 +593,8 @@ calendar_control_activate (BonoboControl *control,
container = bonobo_ui_compat_get_container (uih);
g_return_if_fail (container != CORBA_OBJECT_NIL);
fname = bonobo_ui_util_get_ui_fname ("evolution-calendar.xml");
fname = bonobo_ui_util_get_ui_fname (
EVOLUTION_DATADIR, "evolution-calendar.xml");
g_warning ("Attempting ui load from '%s'", fname);
ui = bonobo_ui_util_new_ui (component, fname, "evolution-calendar");

6
mail/ChangeLog
View File

@ -1,3 +1,9 @@
2000-09-16 Michael Meeks <michael@helixcode.com>
* Makefile.am (INCLUDES): add datadir
* folder-browser-factory.c (control_activate): use it.
2000-09-15 Dan Winship <danw@helixcode.com>
* mail-callbacks.c (transfer_msg): Revert **Temp fix** from below

1
mail/Makefile.am
View File

@ -16,6 +16,7 @@ INCLUDES = \
$(UNICODE_CFLAGS) \
$(GTKHTML_CFLAGS) \
-DEVOLUTION_VERSION=\""$(VERSION)"\" \
-DEVOLUTION_DATADIR=\""$(datadir)"\" \
-DEVOLUTION_GLADEDIR=\""$(gladedir)"\" \
-DEVOLUTION_ICONSDIR=\""$(iconsdir)"\" \
-DEVOLUTION_LOCALEDIR=\""$(datadir)/locale"\" \

3
mail/folder-browser-factory.c
View File

@ -187,7 +187,8 @@ control_activate (BonoboControl *control, BonoboUIHandler *uih,
char *fname;
xmlNode *ui;
fname = bonobo_ui_util_get_ui_fname ("evolution-mail.xml");
fname = bonobo_ui_util_get_ui_fname (
EVOLUTION_DATADIR, "evolution-mail.xml");
g_warning ("Attempting ui load from '%s'", fname);
ui = bonobo_ui_util_new_ui (component, fname, "evolution-mail");

4
shell/ChangeLog
View File

@ -1,3 +1,7 @@
2000-09-16 Michael Meeks <michael@helixcode.com>
* e-shell-view-menu.c (e_shell_view_menu_setup): use datadir.
2000-09-16 Ettore Perazzoli <ettore@helixcode.com>
* e-shell-view.h: #include "bonobo-win.h", not "bonobo-app.h".

3
shell/e-shell-view-menu.c
View File

@ -457,7 +457,8 @@ e_shell_view_menu_setup (EShellView *shell_view)
bonobo_ui_container_freeze (container, NULL);
fname = bonobo_ui_util_get_ui_fname ("evolution.xml");
fname = bonobo_ui_util_get_ui_fname (
EVOLUTION_DATADIR, "evolution.xml");
g_warning ("Attempting ui load from '%s'", fname);
ui = bonobo_ui_util_new_ui (component, fname, "evolution");