[evolution-data-server] Clean some relocations (E_DATA_SERVER_UI_GLADEDIR -> E_DATA_SERVER_UI_UIDIR)

[Fridrich Strba <strba src gnome org>]

commit 8565580d35e6c60f7dade09960a52d036235a67d
Author: Fridrich Strba <fridrich strba bluewin ch>
Date:   Thu Mar 11 13:16:40 2010 +0100

    Clean some relocations (E_DATA_SERVER_UI_GLADEDIR -> E_DATA_SERVER_UI_UIDIR)

 libedataserver/Makefile.am              |    2 +-
 libedataserver/e-data-server-util.c     |    6 +++---
 libedataserver/libedataserver-private.h |    6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)
---
diff --git a/libedataserver/Makefile.am b/libedataserver/Makefile.am
index 08e93b1..29cd1a1 100644
--- a/libedataserver/Makefile.am
+++ b/libedataserver/Makefile.am
@@ -9,7 +9,7 @@ libedataserver_1_2_la_CPPFLAGS = \
 	-DEVOLUTION_LOCALEDIR=\""$(localedir)"\"			\
 	-DE_DATA_SERVER_EXTENSIONDIR=\"$(extensiondir)\"		\
 	-DE_DATA_SERVER_IMAGESDIR=\"$(imagesdir)\"			\
-	-DE_DATA_SERVER_UI_GLADEDIR=\""$(gladedir)"\"			\
+	-DE_DATA_SERVER_UI_UIDIR=\""$(uidir)"\"			\
 	$(E_DATA_SERVER_CFLAGS)						\
 	$(SOUP_CFLAGS)
 
diff --git a/libedataserver/e-data-server-util.c b/libedataserver/e-data-server-util.c
index 651b5a3..5fd8eb2 100644
--- a/libedataserver/e-data-server-util.c
+++ b/libedataserver/e-data-server-util.c
@@ -522,7 +522,7 @@ static const gchar *cp_prefix;
 static const gchar *localedir;
 static const gchar *extensiondir;
 static const gchar *imagesdir;
-static const gchar *ui_gladedir;
+static const gchar *ui_uidir;
 
 static HMODULE hmodule;
 G_LOCK_DEFINE_STATIC (mutex);
@@ -602,7 +602,7 @@ setup (void)
 	localedir = replace_prefix (cp_prefix, EVOLUTION_LOCALEDIR);
 	extensiondir = replace_prefix (prefix, E_DATA_SERVER_EXTENSIONDIR);
 	imagesdir = replace_prefix (prefix, E_DATA_SERVER_IMAGESDIR);
-	ui_gladedir = replace_prefix (prefix, E_DATA_SERVER_UI_GLADEDIR);
+	ui_uidir = replace_prefix (prefix, E_DATA_SERVER_UI_UIDIR);
 
 	G_UNLOCK (mutex);
 }
@@ -627,7 +627,7 @@ e_util_get_##varbl (void)			\
 
 PRIVATE_GETTER(extensiondir)
 PRIVATE_GETTER(imagesdir)
-PRIVATE_GETTER(ui_gladedir)
+PRIVATE_GETTER(ui_uidir)
 
 PUBLIC_GETTER(prefix)
 PUBLIC_GETTER(cp_prefix)
diff --git a/libedataserver/libedataserver-private.h b/libedataserver/libedataserver-private.h
index 03c65a1..ebbf848 100644
--- a/libedataserver/libedataserver-private.h
+++ b/libedataserver/libedataserver-private.h
@@ -28,7 +28,7 @@
 
 const gchar *_libedataserver_get_extensiondir (void) G_GNUC_CONST;
 const gchar *_libedataserver_get_imagesdir (void) G_GNUC_CONST;
-const gchar *_libedataserver_get_ui_gladedir (void) G_GNUC_CONST;
+const gchar *_libedataserver_get_ui_uidir (void) G_GNUC_CONST;
 
 #undef E_DATA_SERVER_EXTENSIONDIR
 #define E_DATA_SERVER_EXTENSIONDIR _libedataserver_get_extensiondir ()
@@ -36,8 +36,8 @@ const gchar *_libedataserver_get_ui_gladedir (void) G_GNUC_CONST;
 #undef E_DATA_SERVER_IMAGESDIR
 #define E_DATA_SERVER_IMAGESDIR _libedataserver_get_imagesdir ()
 
-#undef E_DATA_SERVER_UI_GLADEDIR
-#define E_DATA_SERVER_UI_GLADEDIR _libedataserver_get_ui_gladedir ()
+#undef E_DATA_SERVER_UI_UIDIR
+#define E_DATA_SERVER_UI_UIDIR _libedataserver_get_ui_uidir ()
 
 #endif	/* G_OS_WIN32 */