diff options
| author | Tor Lillqvist <tml@novell.com> | 2005-06-18 07:35:00 +0800 |
|---|---|---|
| committer | Tor Lillqvist <tml@src.gnome.org> | 2005-06-18 07:35:00 +0800 |
| commit | 889c16f34d71338cc8fa9c3f7a11d57b27b21994 (patch) | |
| tree | 078210897a6ae5257c85a68cfb5157aa88849416 /e-util/e-win32-reloc.c | |
| parent | 5b611b051cb2f3b8ebc44ace3de5e8e0edeab6b7 (diff) | |
| download | gsoc2013-evolution-889c16f34d71338cc8fa9c3f7a11d57b27b21994.tar gsoc2013-evolution-889c16f34d71338cc8fa9c3f7a11d57b27b21994.tar.gz gsoc2013-evolution-889c16f34d71338cc8fa9c3f7a11d57b27b21994.tar.bz2 gsoc2013-evolution-889c16f34d71338cc8fa9c3f7a11d57b27b21994.tar.lz gsoc2013-evolution-889c16f34d71338cc8fa9c3f7a11d57b27b21994.tar.xz gsoc2013-evolution-889c16f34d71338cc8fa9c3f7a11d57b27b21994.tar.zst gsoc2013-evolution-889c16f34d71338cc8fa9c3f7a11d57b27b21994.zip | |
Use bootstrap library for libemisdwidgets. Code here uses
2005-06-18 Tor Lillqvist <tml@novell.com>
* Makefile.am (WIN32_BOOTSTRAP_LIBS): Use bootstrap library for
libemisdwidgets. Code here uses e_utf8_to_locale_string() from
libemiscwidgets which hasn't been built yet if building from
scratch.
(GAL_IMAGESDIR): Remove, unused leftover.
(EVOLUTION_GLADEDIR): Add.
(libeutil_la_LDFLAGS, libeconduit_la_LDFLAGS): Use NO_UNDEFINED.
(libeutil_la_LIBADD, libeconduit_la_LIBADD): Link with necessary
libs.
* e-win32-reloc.c: Update now that it is here in evolution. Use _e
prefix instead of _gal. Add getters for more run-time paths.
* e-util-private.h: Corresponding changes.
svn path=/trunk/; revision=29526
Diffstat (limited to 'e-util/e-win32-reloc.c')
| -rw-r--r-- | e-util/e-win32-reloc.c | 25 |
1 files changed, 17 insertions, 8 deletions
diff --git a/e-util/e-win32-reloc.c b/e-util/e-win32-reloc.c index d737001ce1..2fd9496cfd 100644 --- a/e-util/e-win32-reloc.c +++ b/e-util/e-win32-reloc.c @@ -32,11 +32,15 @@ /* localedir uses system codepage as it is passed to the non-UTF8ified * gettext library */ -static char *localedir = NULL; +static const char *localedir = NULL; /* The others are in UTF-8 */ -static char *gladedir; -static char *imagesdir; +static const char *gladedir; +static const char *images; +static const char *iconsdir; +static const char *category_icons; +static const char *plugindir; +static const char *privdatadir; static HMODULE hmodule; G_LOCK_DEFINE_STATIC (mutex); @@ -92,7 +96,10 @@ setup (void) g_free (cp_prefix); gladedir = replace_prefix (full_prefix, EVOLUTION_GLADEDIR); - imagesdir = replace_prefix (full_prefix, GAL_IMAGESDIR); + images = replace_prefix (full_prefix, EVOLUTION_IMAGES); + category_icons = replace_prefix (full_prefix, EVOLUTION_CATEGORY_ICONS); + plugindir = replace_prefix (full_prefix, EVOLUTION_PLUGINDIR); + privdatadir = replace_prefix (full_prefix, EVOLUTION_PRIVDATADIR); g_free (full_prefix); G_UNLOCK (mutex); @@ -102,7 +109,7 @@ setup (void) #define GETTER(varbl) \ const char * \ -_gal_get_##varbl (void) \ +_e_get_##varbl (void) \ { \ setup (); \ return varbl; \ @@ -110,6 +117,8 @@ _gal_get_##varbl (void) \ GETTER(localedir) GETTER(gladedir) -GETTER(imagesdir) - - +GETTER(images) +GETTER(iconsdir) +GETTER(category_icons) +GETTER(plugindir) +GETTER(privdatadir) |