Version using $(BASE_VERSION). (etspecdir): Likewise. (iconsdir):

* gui/component/select-names/Makefile.am (gladedir): Version using
$(BASE_VERSION).
(etspecdir): Likewise.
(iconsdir): Likewise.

* gui/contact-list-editor/Makefile.am (iconsdir): Version using
$(BASE_VERSION).
(gladedir): Likewise.

* gui/merging/Makefile.am (gladedir): Version using $(BASE_VERSION).

* gui/search/Makefile.am (ruledir): Version using $(BASE_VERSION).

* gui/component/Makefile.am (INCLUDES): Update EVOLUTION_IMAGESDIR
to be versioned through $(BASE_VERSION).

* gui/widgets/e-addressbook-view.c (init_collection): Use
EVOLUTION_GALVIEWSDIR.

* gui/widgets/Makefile.am (INCLUDES): Define EVOLUTION_GALVIEWSDIR
and update EVOLUTION_IMAGESDIR.

svn path=/trunk/; revision=19551

2 files changed, 24 insertions, 26 deletions

diff --git a/addressbook/gui/contact-editor/Makefile.am b/addressbook/gui/contact-editor/Makefile.am
index 62583207a3..38cf7e9da7 100644
--- a/addressbook/gui/contact-editor/Makefile.am
+++ b/addressbook/gui/contact-editor/Makefile.am
@@ -1,21 +1,22 @@
-INCLUDES =					\
-	-I$(top_srcdir)				\
-	-I$(top_srcdir)/addressbook/		\
-	-I$(top_srcdir)/addressbook/backend	\
-	-I$(top_builddir)/addressbook/backend	\
-	-I$(top_srcdir)/addressbook/gui/merging	\
-	-I$(top_srcdir)/widgets/e-table		\
-	-I$(top_builddir)/shell			\
-	-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"	\
-	-DDATADIR=\""$(datadir)"\"		\
-	-DEVOLUTION_DATADIR=\""$(datadir)"\"	\
-	-DEVOLUTION_ICONSDIR=\""$(iconsdir)"\"	\
-	-DEVOLUTIONDIR=\""$(evolutiondir)"\"	\
-	-DG_LOG_DOMAIN=\"contact-editor\"	\
-	-DG_DISABLE_DEPRECATED			\
-	-DGTK_DISABLE_DEPRECATED		\
-	-DLIBGNOME_DISABLE_DEPRECATED		\
-	-DLIBGNOMEUI_DISABLE_DEPRECATED		\
+INCLUDES =						\
+	-I$(top_srcdir)					\
+	-I$(top_srcdir)/addressbook/			\
+	-I$(top_srcdir)/addressbook/backend		\
+	-I$(top_builddir)/addressbook/backend		\
+	-I$(top_srcdir)/addressbook/gui/merging		\
+	-I$(top_srcdir)/widgets/e-table			\
+	-I$(top_builddir)/shell				\
+	-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"		\
+	-DDATADIR=\""$(datadir)"\"			\
+	-DEVOLUTION_DATADIR=\""$(datadir)"\"		\
+	-DEVOLUTION_ICONSDIR=\""$(iconsdir)"\"		\
+	-DEVOLUTIONDIR=\""$(evolutiondir)"\"		\
+	-DEVOLUTION_UIDIR=\""$(evolution_uidir)\""	\
+	-DG_LOG_DOMAIN=\"contact-editor\"		\
+	-DG_DISABLE_DEPRECATED				\
+	-DGTK_DISABLE_DEPRECATED			\
+	-DLIBGNOME_DISABLE_DEPRECATED			\
+	-DLIBGNOMEUI_DISABLE_DEPRECATED			\
 	$(EVOLUTION_ADDRESSBOOK_CFLAGS)
 
 noinst_LIBRARIES =				\
@@ -48,13 +49,11 @@ e-contact-editor-marshal.c: e-contact-editor-marshal.h
 
 MARSHAL_GENERATED = e-contact-editor-marshal.c e-contact-editor-marshal.h
 
-evolutiondir = $(datadir)/evolution
-
+evolutiondir = $(datadir)/evolution-$(BASE_VERSION)
 evolution_DATA = arrow.png
 
-iconsdir = $(datadir)/evolution/images
-
-gladedir   = $(datadir)/evolution/glade
+iconsdir = $(datadir)/evolution-$(BASE_VERSION)/images
+gladedir = $(datadir)/evolution-$(BASE_VERSION)/glade
 
 glade_DATA = 				\
 	contact-editor.glade		\
diff --git a/addressbook/gui/contact-editor/e-contact-editor.c b/addressbook/gui/contact-editor/e-contact-editor.c
index 3cb855fcad..cca369ab1c 100644
--- a/addressbook/gui/contact-editor/e-contact-editor.c
+++ b/addressbook/gui/contact-editor/e-contact-editor.c
@@ -811,8 +811,7 @@ categories_clicked(GtkWidget *button, EContactEditor *editor)
 		GtkWidget *uh_oh = gtk_message_dialog_new (NULL,
 							   0, GTK_MESSAGE_ERROR,
 							   GTK_RESPONSE_OK,
-							   _("Category editor not available."),
-							   NULL);
+							   _("Category editor not available."));
 		g_free (categories);
 		gtk_widget_show (uh_oh);
 		return;
@@ -1179,7 +1178,7 @@ create_ui (EContactEditor *ce)
 	bonobo_ui_component_add_verb_list_with_data (ce->uic, verbs, ce);
 
 	bonobo_ui_util_set_ui (ce->uic, EVOLUTION_DATADIR,
-			       "evolution-contact-editor.xml",
+			       EVOLUTION_UIDIR "/evolution-contact-editor.xml",
 			       "evolution-contact-editor", NULL);
 
 	e_pixmaps_update (ce->uic, pixmaps);