diff options
| author | Yves Combe <ycombe@src.gnome.org> | 2006-11-08 21:23:26 (GMT) |
|---|---|---|
| committer | Yves Combe <ycombe@src.gnome.org> | 2006-11-08 21:23:26 (GMT) |
| commit | 1a9d8dac7c514141430f75e50918bc0e7774701c (patch) | |
| tree | 5c6e559fcf53e170393c55dfe98a34adad1ae84c | |
| parent | ffb864c479eca0edd3c5c0e98c0f0e893cad2d96 (diff) | |
fix bugs on linux compilation.
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | src/gcompris/menu.c | 2 | ||||
| -rw-r--r-- | src/gcompris/properties.c | 7 |
3 files changed, 13 insertions, 3 deletions
@@ -1,5 +1,12 @@ 2006-11-08 Yves Combe <yves@ycombe.net> + fix bugs on linux compilation. use G_STDIO_NO_WRAP_ON_UNIX to make unlink work with glib < 2.12 + + * src/gcompris/menu.c: (gc_menu_load): + * src/gcompris/properties.c: (gc_prop_config_file_get): + +2006-11-08 Yves Combe <yves@ycombe.net> + 2.6/Win98 fix: - tuxpaint launcher: fix bug related to pygtk/gtk 2.6 (for win98) - suppress g_error if no boards in gc_board_pause. diff --git a/src/gcompris/menu.c b/src/gcompris/menu.c index 33aede4..9918c5d 100644 --- a/src/gcompris/menu.c +++ b/src/gcompris/menu.c @@ -642,7 +642,7 @@ void gc_menu_load() GTimeVal now; g_get_current_time (&now); - g_date_set_time_val (today, &now);- + g_date_set_time_val (today, &now); #else g_date_set_time (today, time (NULL)); #endif diff --git a/src/gcompris/properties.c b/src/gcompris/properties.c index 002d1de..2d20020 100644 --- a/src/gcompris/properties.c +++ b/src/gcompris/properties.c @@ -19,6 +19,7 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ +#define G_STDIO_NO_WRAP_ON_UNIX #include <glib/gstdio.h> #include <fcntl.h> #include <string.h> @@ -99,11 +100,13 @@ gc_prop_config_file_get() return(config_file); dir = gc_prop_user_root_directory_get(); /* Was never called, must calculate it */ +#ifdef WIN32 if (! G_WIN32_IS_NT_BASED() ) { config_file = g_strconcat(dir, "/gcompris.cfg", NULL); - } else { + } else +#endif config_file = g_strconcat(dir, "/gcompris.conf", NULL); - } + g_free(dir); return(config_file); } |