diff options
| -rw-r--r-- | calendar/gui/dialogs/Makefile.am | 3 | ||||
| -rw-r--r-- | e-util/Makefile.am | 4 | ||||
| -rw-r--r-- | e-util/e-util-private.h | 6 | ||||
| -rw-r--r-- | e-util/e-win32-reloc.c | 12 | ||||
| -rw-r--r-- | mail/Makefile.am | 2 | ||||
| -rw-r--r-- | shell/e-shell.c | 1 |
6 files changed, 15 insertions, 13 deletions
diff --git a/calendar/gui/dialogs/Makefile.am b/calendar/gui/dialogs/Makefile.am index 7b0be1b6bd..6e9cb26c05 100644 --- a/calendar/gui/dialogs/Makefile.am +++ b/calendar/gui/dialogs/Makefile.am @@ -11,7 +11,8 @@ libcal_dialogs_la_CPPFLAGS = \ -I$(top_srcdir)/shell \ -I$(top_srcdir)/widgets/misc \ -DEVOLUTION_UIDIR=\""$(uidir)"\" \ - -DEVOLUTION_ICONSDIR=\""$(imagesdir)"\" \ + -DEVOLUTION_ICONDIR=\""$(icondir)"\" \ + -DEVOLUTION_IMAGESDIR=\""$(imagesdir)"\" \ -DPREFIX=\""$(prefix)"\" \ $(GNOME_PLATFORM_CFLAGS) \ $(EVOLUTION_CALENDAR_CFLAGS) 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) diff --git a/mail/Makefile.am b/mail/Makefile.am index a6274c064f..c802528953 100644 --- a/mail/Makefile.am +++ b/mail/Makefile.am @@ -24,7 +24,7 @@ libevolution_mail_la_CPPFLAGS = \ -DEVOLUTION_DATADIR=\""$(datadir)"\" \ -DEVOLUTION_PRIVDATADIR=\""$(privdatadir)"\" \ -DEVOLUTION_ETSPECDIR=\""$(etspecdir)"\" \ - -DEVOLUTION_ICONSDIR=\""$(iconsdir)"\" \ + -DEVOLUTION_ICONDIR=\""$(icondir)"\" \ -DEVOLUTION_IMAGESDIR=\""$(imagesdir)"\" \ -DEVOLUTION_GALVIEWSDIR=\""$(viewsdir)"\" \ -DEVOLUTION_BUTTONSDIR=\""$(buttonsdir)"\" \ diff --git a/shell/e-shell.c b/shell/e-shell.c index d295b99019..fe046a4fc7 100644 --- a/shell/e-shell.c +++ b/shell/e-shell.c @@ -24,6 +24,7 @@ #include <glib/gi18n.h> #include <libedataserverui/e-passwords.h> +#include "e-util/e-util-private.h" #include "e-util/e-util.h" #include "e-util/e-module.h" #include "smclient/eggsmclient.h" |