diff options
Diffstat (limited to 'calendar/gui/dialogs')
| -rw-r--r-- | calendar/gui/dialogs/Makefile.am | 7 | ||||
| -rw-r--r-- | calendar/gui/dialogs/comp-editor.c | 9 |
2 files changed, 11 insertions, 5 deletions
diff --git a/calendar/gui/dialogs/Makefile.am b/calendar/gui/dialogs/Makefile.am index 31c785c16a..cf7772c6d0 100644 --- a/calendar/gui/dialogs/Makefile.am +++ b/calendar/gui/dialogs/Makefile.am @@ -29,6 +29,7 @@ INCLUDES = \ -DEVOLUTION_GLADEDIR=\""$(gladedir)"\" \ -DEVOLUTION_ICONSDIR=\""$(iconsdir)"\" \ -DEVOLUTION_ETSPECDIR=\""$(etspecdir)"\" \ + -DEVOLUTION_UIDIR=\""$(evolutionuidir)"\" \ -DGNOMELOCALEDIR=\""$(localedir)"\" \ $(EVOLUTION_CALENDAR_CFLAGS) @@ -77,9 +78,9 @@ libcal_dialogs_a_SOURCES = \ task-page.c \ task-page.h -iconsdir = $(datadir)/evolution/images +iconsdir = $(datadir)/evolution-$(BASE_VERSION)/images -gladedir = $(datadir)/evolution/glade +gladedir = $(datadir)/evolution-$(BASE_VERSION)/glade glade_DATA = \ alarm-options.glade \ alarm-page.glade \ @@ -92,7 +93,7 @@ glade_DATA = \ task-details-page.glade \ task-page.glade -etspecdir = $(datadir)/evolution/etspec/ +etspecdir = $(datadir)/evolution-$(BASE_VERSION)/etspec/ etspec_DATA = meeting-page.etspec CLEANFILES = $(BUILT_SOURCES) diff --git a/calendar/gui/dialogs/comp-editor.c b/calendar/gui/dialogs/comp-editor.c index 46a08da33d..24fdf3396f 100644 --- a/calendar/gui/dialogs/comp-editor.c +++ b/calendar/gui/dialogs/comp-editor.c @@ -197,7 +197,7 @@ setup_widgets (CompEditor *editor) bonobo_ui_component_add_verb_list_with_data (priv->uic, verbs, editor); bonobo_ui_util_set_ui (priv->uic, EVOLUTION_DATADIR, - "evolution-comp-editor.xml", + EVOLUTION_UIDIR "/evolution-comp-editor.xml", "evolution-calendar", NULL); e_pixmaps_update (priv->uic, pixmaps); @@ -1094,15 +1094,20 @@ comp_editor_merge_ui (CompEditor *editor, EPixmap *component_pixmaps) { CompEditorPrivate *priv; + char *path; g_return_if_fail (editor != NULL); g_return_if_fail (IS_COMP_EDITOR (editor)); priv = editor->priv; - bonobo_ui_util_set_ui (priv->uic, EVOLUTION_DATADIR, filename, "evolution-calendar", NULL); + path = g_strconcat (EVOLUTION_UIDIR "/", filename); + + bonobo_ui_util_set_ui (priv->uic, EVOLUTION_DATADIR, path, "evolution-calendar", NULL); bonobo_ui_component_add_verb_list_with_data (priv->uic, verbs, editor); + g_free (path); + if (component_pixmaps != NULL) e_pixmaps_update (priv->uic, component_pixmaps); } |