diff options
| author | Tor Lillqvist <tml@novell.com> | 2005-08-10 07:29:27 +0800 |
|---|---|---|
| committer | Tor Lillqvist <tml@src.gnome.org> | 2005-08-10 07:29:27 +0800 |
| commit | a40159746efa236f154c57ff57f0fe1cb4ec9e5e (patch) | |
| tree | c6d2d602194b54f1c734b1af7748709b630fed6a /filter/filter-datespec.c | |
| parent | a43c128c4bfe96ea35225cf1fb551c0cb8c5ac4a (diff) | |
| download | gsoc2013-evolution-a40159746efa236f154c57ff57f0fe1cb4ec9e5e.tar.gz gsoc2013-evolution-a40159746efa236f154c57ff57f0fe1cb4ec9e5e.tar.zst gsoc2013-evolution-a40159746efa236f154c57ff57f0fe1cb4ec9e5e.zip | |
Use privsolib instead of privlib. On Unix they are the same, on Win32
2005-08-10 Tor Lillqvist <tml@novell.com>
* Makefile.am: Use privsolib instead of privlib. On Unix they are
the same, on Win32 privsolibdir is the same as libdir. Use the
macro name EVOLUTION_GLADEDIR as in e-util/e-util-private.h
instead of FILTER_GLADEDIR, so that the Win32 run-time path lookup
mechanism works. Use NO_UNDEFINED. Link explicitly with the actual
libraries used.
* filter-datespec.c: No localtime_r() on Win32, but we can use
plain localtime() which is thread-safe in the Microsoft C library.
* filter-datespec.c
* rule-editor.c: Include e-util-private.h for Win32 path run-time
lookup. Use EVOLUTION_GLADEDIR instead of FILTER_GLADEDIR, and do
the filter.glade pathname construction at run-time so it works
even when EVOLUTION_GLADEDIR is a function call on Win32.
svn path=/trunk/; revision=30063
Diffstat (limited to 'filter/filter-datespec.c')
| -rw-r--r-- | filter/filter-datespec.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/filter/filter-datespec.c b/filter/filter-datespec.c index 1dbd357c04..0e7ecc43f7 100644 --- a/filter/filter-datespec.c +++ b/filter/filter-datespec.c @@ -36,6 +36,11 @@ #include "filter-datespec.h" #include "libedataserver/e-sexp.h" #include "e-util/e-error.h" +#include "e-util/e-util-private.h" + +#ifdef G_OS_WIN32 +#define localtime_r(tp,tmp) memcpy(tmp,localtime(tp),sizeof(struct tm)) +#endif #define d(x) @@ -398,8 +403,12 @@ button_clicked (GtkButton *button, FilterDatespec *fds) GtkWidget *toplevel; GtkDialog *dialog; GladeXML *gui; + char *filter_glade = g_build_filename (EVOLUTION_GLADEDIR, + "filter.glade", + NULL); - gui = glade_xml_new (FILTER_GLADEDIR "/filter.glade", "filter_datespec", NULL); + gui = glade_xml_new (filter_glade, "filter_datespec", NULL); + g_free (filter_glade); toplevel = glade_xml_get_widget (gui, "filter_datespec"); dialog = (GtkDialog *) gtk_dialog_new (); |