diff options
| author | Fridrich Strba <fridrich.strba@bluewin.ch> | 2010-03-11 23:31:09 +0800 |
|---|---|---|
| committer | Fridrich Strba <fridrich.strba@bluewin.ch> | 2010-03-11 23:31:09 +0800 |
| commit | 043eabadba20150827310c31de58bbe78fda726f (patch) | |
| tree | 23ca93277aa750de38eccc22e0b7cdb0a4e543d7 | |
| parent | fc3cfd74bedf8263e497ca23200ba74d3de5961c (diff) | |
| download | gsoc2013-evolution-043eabadba20150827310c31de58bbe78fda726f.tar.gz gsoc2013-evolution-043eabadba20150827310c31de58bbe78fda726f.tar.zst gsoc2013-evolution-043eabadba20150827310c31de58bbe78fda726f.zip | |
Don't relocate inexisting EVOLUTION_CATEGORY_ICONS path
| -rw-r--r-- | e-util/Makefile.am | 2 | ||||
| -rw-r--r-- | e-util/e-util-private.h | 4 | ||||
| -rw-r--r-- | e-util/e-win32-reloc.c | 3 |
3 files changed, 0 insertions, 9 deletions
diff --git a/e-util/Makefile.am b/e-util/Makefile.am index 57c29a956d..419468480e 100644 --- a/e-util/Makefile.am +++ b/e-util/Makefile.am @@ -61,7 +61,6 @@ libeutil_la_CPPFLAGS = \ -I$(top_srcdir) \ -I$(top_builddir) \ -I$(top_srcdir)/widgets \ - -DEVOLUTION_CATEGORY_ICONS=\""$(imagesdir)/categories"\" \ -DEVOLUTION_DATADIR=\""$(datadir)"\" \ -DEVOLUTION_ECPSDIR=\""$(ecpsdir)"\" \ -DEVOLUTION_ETSPECDIR=\""$(etspecdir)"\" \ @@ -167,7 +166,6 @@ libeconduit_la_CPPFLAGS = \ -I$(top_srcdir) \ -I$(top_builddir) \ -I$(top_srcdir)/widgets \ - -DEVOLUTION_CATEGORY_ICONS=\""$(imagesdir)/categories"\" \ -DEVOLUTION_DATADIR=\""$(datadir)"\" \ -DEVOLUTION_ECPSDIR=\""$(ecpsdir)"\" \ -DEVOLUTION_ETSPECDIR=\""$(etspecdir)"\" \ diff --git a/e-util/e-util-private.h b/e-util/e-util-private.h index 464815baad..4503f4585e 100644 --- a/e-util/e-util-private.h +++ b/e-util/e-util-private.h @@ -35,7 +35,6 @@ #define fsync(fd) 0 -const gchar *_e_get_category_icons (void) G_GNUC_CONST; const gchar *_e_get_datadir (void) G_GNUC_CONST; const gchar *_e_get_ecpsdir (void) G_GNUC_CONST; const gchar *_e_get_etspecdir (void) G_GNUC_CONST; @@ -68,9 +67,6 @@ const gchar *_e_get_uidir (void) G_GNUC_CONST; #undef PREFIX #define PREFIX _e_get_prefix () -#undef EVOLUTION_CATEGORY_ICONS -#define EVOLUTION_CATEGORY_ICONS _e_get_category_icons () - #undef EVOLUTION_DATADIR #define EVOLUTION_DATADIR _e_get_datadir () diff --git a/e-util/e-win32-reloc.c b/e-util/e-win32-reloc.c index 3b1b601644..f99a5f582b 100644 --- a/e-util/e-win32-reloc.c +++ b/e-util/e-win32-reloc.c @@ -34,7 +34,6 @@ static const gchar *localedir = NULL; /* The others are in UTF-8 */ -static const gchar *category_icons; static const gchar *datadir; static const gchar *ecpsdir; static const gchar *etspecdir; @@ -115,7 +114,6 @@ setup (void) /* It makes sense to have some of the paths overridable with * environment variables. */ - category_icons = replace_prefix (full_prefix, EVOLUTION_CATEGORY_ICONS); datadir = replace_prefix (full_prefix, EVOLUTION_DATADIR); ecpsdir = replace_prefix (full_prefix, EVOLUTION_ECPSDIR); etspecdir = replace_prefix (full_prefix, EVOLUTION_ETSPECDIR); @@ -157,7 +155,6 @@ _e_get_##varbl (void) \ return varbl; \ } -GETTER(category_icons) GETTER(datadir) GETTER(ecpsdir) GETTER(etspecdir) |