aboutsummaryrefslogtreecommitdiffstats
path: root/e-util
diff options
context:
space:
mode:
authorFridrich Strba <fridrich.strba@bluewin.ch>2010-03-11 22:57:20 +0800
committerFridrich Strba <fridrich.strba@bluewin.ch>2010-03-11 22:57:20 +0800
commitc69e242109fcf285486d11937a60f7904f078df8 (patch)
tree907bb0d9632793005481f9d9cf72eb8a809e97ae /e-util
parent38f11c946e07c2453d02ee5bff131566618cb3ca (diff)
downloadgsoc2013-evolution-c69e242109fcf285486d11937a60f7904f078df8.tar
gsoc2013-evolution-c69e242109fcf285486d11937a60f7904f078df8.tar.gz
gsoc2013-evolution-c69e242109fcf285486d11937a60f7904f078df8.tar.bz2
gsoc2013-evolution-c69e242109fcf285486d11937a60f7904f078df8.tar.lz
gsoc2013-evolution-c69e242109fcf285486d11937a60f7904f078df8.tar.xz
gsoc2013-evolution-c69e242109fcf285486d11937a60f7904f078df8.tar.zst
gsoc2013-evolution-c69e242109fcf285486d11937a60f7904f078df8.zip
More relocation cleanup EVOLUTION_ICONSDIR -> EVOLUTION_ICONDIR
Diffstat (limited to 'e-util')
-rw-r--r--e-util/Makefile.am4
-rw-r--r--e-util/e-util-private.h6
-rw-r--r--e-util/e-win32-reloc.c12
3 files changed, 11 insertions, 11 deletions
diff --git a/e-util/Makefile.am b/e-util/Makefile.am
index 90da30ee46..57c29a956d 100644
--- a/e-util/Makefile.am
+++ b/e-util/Makefile.am
@@ -67,7 +67,7 @@ libeutil_la_CPPFLAGS = \
-DEVOLUTION_ETSPECDIR=\""$(etspecdir)"\" \
-DEVOLUTION_GALVIEWSDIR=\""$(viewsdir)"\" \
-DEVOLUTION_HELPDIR=\""$(evolutionhelpdir)"\" \
- -DEVOLUTION_ICONSDIR=\""$(imagesdir)"\" \
+ -DEVOLUTION_ICONDIR=\""$(icondir)"\" \
-DEVOLUTION_IMAGESDIR=\""$(imagesdir)"\" \
-DEVOLUTION_LIBDIR=\""$(datadir)"\" \
-DEVOLUTION_LIBEXECDIR=\""$(privlibexecdir)"\" \
@@ -173,7 +173,7 @@ libeconduit_la_CPPFLAGS = \
-DEVOLUTION_ETSPECDIR=\""$(etspecdir)"\" \
-DEVOLUTION_GALVIEWSDIR=\""$(viewsdir)"\" \
-DEVOLUTION_HELPDIR=\""$(evolutionhelpdir)"\" \
- -DEVOLUTION_ICONSDIR=\""$(imagesdir)"\" \
+ -DEVOLUTION_ICONDIR=\""$(icondir)"\" \
-DEVOLUTION_IMAGESDIR=\""$(imagesdir)"\" \
-DEVOLUTION_LIBDIR=\""$(datadir)"\" \
-DEVOLUTION_LIBEXECDIR=\""$(privlibexecdir)"\" \
diff --git a/e-util/e-util-private.h b/e-util/e-util-private.h
index 46d49428d1..645f855210 100644
--- a/e-util/e-util-private.h
+++ b/e-util/e-util-private.h
@@ -42,7 +42,7 @@ const gchar *_e_get_etspecdir (void) G_GNUC_CONST;
const gchar *_e_get_galviewsdir (void) G_GNUC_CONST;
const gchar *_e_get_gladedir (void) G_GNUC_CONST;
const gchar *_e_get_helpdir (void) G_GNUC_CONST;
-const gchar *_e_get_iconsdir (void) G_GNUC_CONST;
+const gchar *_e_get_icondir (void) G_GNUC_CONST;
const gchar *_e_get_imagesdir (void) G_GNUC_CONST;
const gchar *_e_get_libdir (void) G_GNUC_CONST;
const gchar *_e_get_libexecdir (void) G_GNUC_CONST;
@@ -93,8 +93,8 @@ const gchar *_e_get_uidir (void) G_GNUC_CONST;
#undef EVOLUTION_HELPDIR
#define EVOLUTION_HELPDIR _e_get_helpdir ()
-#undef EVOLUTION_ICONSDIR
-#define EVOLUTION_ICONSDIR _e_get_iconsdir ()
+#undef EVOLUTION_ICONDIR
+#define EVOLUTION_ICONDIR _e_get_icondir ()
#undef EVOLUTION_IMAGESDIR
#define EVOLUTION_IMAGESDIR _e_get_imagesdir ()
diff --git a/e-util/e-win32-reloc.c b/e-util/e-win32-reloc.c
index d01c4c820e..ad9e126153 100644
--- a/e-util/e-win32-reloc.c
+++ b/e-util/e-win32-reloc.c
@@ -41,7 +41,7 @@ static const gchar *etspecdir;
static const gchar *galviewsdir;
static const gchar *gladedir;
static const gchar *helpdir;
-static const gchar *iconsdir;
+static const gchar *icondir;
static const gchar *imagesdir;
static const gchar *libdir;
static const gchar *libexecdir;
@@ -123,11 +123,11 @@ setup (void)
galviewsdir = replace_prefix (full_prefix, EVOLUTION_GALVIEWSDIR);
gladedir = replace_prefix (full_prefix, EVOLUTION_UIDIR);
helpdir = replace_prefix (full_prefix, EVOLUTION_HELPDIR);
- if (g_getenv ("EVOLUTION_ICONSDIR") &&
- g_file_test (g_getenv ("EVOLUTION_ICONSDIR"), G_FILE_TEST_IS_DIR))
- iconsdir = g_getenv ("EVOLUTION_ICONSDIR");
+ if (g_getenv ("EVOLUTION_ICONDIR") &&
+ g_file_test (g_getenv ("EVOLUTION_ICONDIR"), G_FILE_TEST_IS_DIR))
+ icondir = g_getenv ("EVOLUTION_ICONDIR");
else
- iconsdir = replace_prefix (full_prefix, EVOLUTION_ICONSDIR);
+ icondir = replace_prefix (full_prefix, EVOLUTION_ICONDIR);
if (g_getenv ("EVOLUTION_IMAGESDIR") &&
g_file_test (g_getenv ("EVOLUTION_IMAGESDIR"), G_FILE_TEST_IS_DIR))
imagesdir = g_getenv ("EVOLUTION_IMAGESDIR");
@@ -166,7 +166,7 @@ GETTER(etspecdir)
GETTER(galviewsdir)
GETTER(gladedir)
GETTER(helpdir)
-GETTER(iconsdir)
+GETTER(icondir)
GETTER(imagesdir)
GETTER(libdir)
GETTER(libexecdir)