Commit 2c8aec38 authored by Bruno Coudoin's avatar Bruno Coudoin

- completed the wordlist API which look like this now:

	    GcomprisWordlist *gc_wordlist_get_from_file(const gchar *fileformat, ...);
	    void              gc_wordlist_free(GcomprisWordlist *wordlist);
	    gchar		 *gc_wordlist_random_word_get(GcomprisWordlist *wordlist, guint level);

	- changed wordsgame.c to use the gc_wordlist API.
	- renamed gcompris_get_properties() in gc_prop_get()

	* Still need to cleanup boards/wordsgame/wordslevel*.* that are replaced
	  by default-*.xml
parent ae173b8d
2006-08-22 Bruno coudoin <bruno.coudoin@free.fr>
- completed the wordlist API which look like this now:
GcomprisWordlist *gc_wordlist_get_from_file(const gchar *fileformat, ...);
void gc_wordlist_free(GcomprisWordlist *wordlist);
gchar *gc_wordlist_random_word_get(GcomprisWordlist *wordlist, guint level);
- changed wordsgame.c to use the gc_wordlist API.
- renamed gcompris_get_properties() in gc_prop_get()
- fixed again the plugin dir path in binreloc mode.
* Still need to cleanup boards/wordsgame/wordslevel*.* that are replaced
by default-*.xml
* src/boards/advanced_colors.c: (init_xml):
* src/boards/algebra.c: (game_won):
* src/boards/click_on_letter.c: (sounds_are_fine):
* src/boards/clickgame.c: (load_random_pixmap):
* src/boards/clockgame.c: (get_random_hour):
* src/boards/colors.c: (start_board), (repeat):
* src/boards/gletters.c: (gletter_config_stop):
* src/boards/gtans.c: (tansetdefconfig):
* src/boards/imageid.c: (init_xml):
* src/boards/memory.c: (start_board), (start_callback):
* src/boards/menu2.c: (menu_start), (create_panel),
(menu_create_item), (item_event), (create_top), (menu_config_stop):
* src/boards/missingletter.c: (init_xml):
* src/boards/paratrooper.c: (item_event):
* src/boards/planegame.c: (setup_item):
* src/boards/py-gcompris-wordlist.c:
(pyGcomprisWordlistType_dealloc), (pyGcomprisWordlistType_getattr):
* src/boards/py-mod-gcompris.c: (py_gc_prop_get),
(py_gcompris_wordlist_get_from_file),
(python_gcompris_module_init):
* src/boards/python.c: (pythonboard_init), (pythonboard_start),
(pythonboard_config_start):
* src/boards/read_colors.c: (init_xml):
* src/boards/reading.c: (get_wordfile), (reading_config_stop):
* src/boards/reversecount.c: (reversecount_create_item):
* src/boards/shapegame.c: (config_stop):
* src/boards/smallnumbers.c: (smallnumber_config_stop):
* src/boards/wordsgame.c: (pause_board), (start_board),
(key_press), (wordsgame_next_level), (wordsgame_move_item),
(wordsgame_move_items), (wordsgame_destroy_items),
(wordsgame_destroy_all_items), (wordsgame_create_item),
(wordsgame_add_new_item), (player_win), (player_loose):
* src/gcompris/about.c: (item_event_ok):
* src/gcompris/bar.c: (gc_bar_start), (confirm_quit):
* src/gcompris/board.c: (board_check_file), (board_run_next):
* src/gcompris/board_config.c: (gcompris_configuration_window),
(gc_locale_gets_list), (gcompris_textview):
* src/gcompris/config.c: (gcompris_config_start), (item_event_ok):
* src/gcompris/file_selector.c: (gc_mime_type_load):
* src/gcompris/gameutil.c: (gc_file_find_absolute):
* src/gcompris/gc_net.c: (gc_net_init), (gc_net_get_url_from_file):
* src/gcompris/gc_net.h:
* src/gcompris/gcompris.c: (gc_prop_get), (gcompris_init):
* src/gcompris/gcompris_alphabeta.c: (gcompris_alphabeta):
* src/gcompris/gcompris_db.c: (gcompris_db_init),
(gc_menu_load_db), (gcompris_get_board_from_id),
(gcompris_is_activity_in_profile):
* src/gcompris/gcompris_files.c: (gcompris_get_user_dirname),
(gcompris_get_board_dirname), (gcompris_get_current_board_dirname):
* src/gcompris/gcompris_im.c: (gcompris_im_init),
(gcompris_im_reset), (window_focus_callback):
* src/gcompris/help.c: (item_event_help):
* src/gcompris/images_selector.c: (parseImage),
(read_dataset_directory):
* src/gcompris/menu.c: (_add_xml_to_data), (_read_xml_file),
(gcompris_board_has_activity), (gc_menu_getlist),
(gc_menu_load_dir), (gc_menu_load):
* src/gcompris/profile.c: (gcompris_get_current_profile),
(gcompris_set_current_user), (gcompris_get_current_user):
* src/gcompris/properties.c: (my_setenv):
* src/gcompris/properties.h:
* src/gcompris/score.c: (display_number):
* src/gcompris/skin.c: (gcompris_image_to_skin):
* src/gcompris/soundutil.c: (initSound), (gcompris_close_sound),
(scheduler_bgnd), (gcompris_play_ogg_list),
(gcompris_sound_get_type):
* src/gcompris/timer.c: (gcompris_timer_display),
(timer_increment):
* src/gcompris/wordlist.c: (gc_wordlist_get_from_file),
(gc_wordlist_random_word_get), (gc_wordlist_free):
* src/gcompris/wordlist.h:
2006-08-20 Bruno coudoin <bruno.coudoin@free.fr>
- Major review of the API. now all the API follows the naming convention:
......
......@@ -227,7 +227,7 @@ PACKAGE_HELP_DIR="${myprefix}/${DATADIRNAME}/${PACKAGE}/help"
AC_SUBST(PACKAGE_HELP_DIR)
dnl Plugin Directory
my_libdir=`eval echo "${libdir}/gcompris"`
my_libdir=`eval echo "${libdir}"`
AC_DEFINE_UNQUOTED(PACKAGE_CLIB_DIR, "${my_libdir}", [Gcompris plugins directory])
plugindir=$libdir/gcompris
AC_SUBST(plugindir)
......
......@@ -445,7 +445,7 @@ static void highlight_selected(int c) {
* ==================================== */
static void init_xml()
{
GcomprisProperties *properties = gcompris_get_properties();
GcomprisProperties *properties = gc_prop_get();
char *filename;
filename = g_strdup_printf("%s/%s/board%d.xml",
properties->package_data_dir,
......
/* gcompris - algebra.c
*
* Time-stamp: <2006/08/12 03:00:37 bruno>
* Time-stamp: <2006/08/21 23:29:57 bruno>
*
* Copyright (C) 2000 Bruno Coudoin
*
......@@ -826,14 +826,3 @@ static void game_won()
}
algebra_next_level();
}
/* Local Variables: */
/* mode:c */
/* eval:(load-library "time-stamp") */
/* eval:(make-local-variable 'write-file-hooks) */
/* eval:(add-hook 'write-file-hooks 'time-stamp) */
/* eval:(setq time-stamp-format '(time-stamp-yyyy/mm/dd time-stamp-hh:mm:ss user-login-name)) */
/* End: */
......@@ -255,7 +255,7 @@ static gboolean sounds_are_fine()
{
char *letter_str;
char *str2;
GcomprisProperties *properties = gcompris_get_properties();
GcomprisProperties *properties = gc_prop_get();
if(!properties->fx)
{
......
/* gcompris - clickgame.c
*
* Time-stamp: <2006/08/20 08:10:07 bruno>
* Time-stamp: <2006/08/21 23:30:07 bruno>
*
* Copyright (C) 2000 Bruno Coudoin
*
......@@ -739,13 +739,3 @@ static void load_random_pixmap()
}
}
/* Local Variables: */
/* mode:c */
/* eval:(load-library "time-stamp") */
/* eval:(make-local-variable 'write-file-hooks) */
/* eval:(add-hook 'write-file-hooks 'time-stamp) */
/* eval:(setq time-stamp-format '(time-stamp-yyyy/mm/dd time-stamp-hh:mm:ss user-login-name)) */
/* End: */
/* gcompris - clockgame.c
*
* Time-stamp: <2006/08/12 03:07:11 bruno>
* Time-stamp: <2006/08/21 23:33:07 bruno>
*
* Copyright (C) 2000 Bruno Coudoin
*
......@@ -747,14 +747,3 @@ static void get_random_hour(GcomprisTime *time)
}
}
/* Local Variables: */
/* mode:c */
/* eval:(load-library "time-stamp") */
/* eval:(make-local-variable 'write-file-hooks) */
/* eval:(add-hook 'write-file-hooks 'time-stamp) */
/* eval:(setq time-stamp-format '(time-stamp-yyyy/mm/dd time-stamp-hh:mm:ss user-login-name)) */
/* End: */
......@@ -211,7 +211,7 @@ static void pause_board (gboolean pause)
*
* =====================================================================*/
static void start_board (GcomprisBoard *agcomprisBoard) {
GcomprisProperties *properties = gcompris_get_properties();
GcomprisProperties *properties = gc_prop_get();
GList * list = NULL;
int * item;
int i;
......@@ -306,7 +306,7 @@ static void repeat (){
if(gcomprisBoard!=NULL)
{
char *str = NULL;
GcomprisProperties *properties = gcompris_get_properties();
GcomprisProperties *properties = gc_prop_get();
str = g_strdup_printf("sounds/$LOCALE/colors/%s.ogg",
colors[GPOINTER_TO_INT(g_list_nth_data(listColors, 0))*2]);
......
/* gcompris - gletters.c
*
* Time-stamp: <2006/08/12 03:12:58 bruno>
* Time-stamp: <2006/08/21 23:33:17 bruno>
*
* Copyright (C) 2000 Bruno Coudoin
*
......@@ -910,14 +910,3 @@ static void
gletter_config_stop()
{
}
/* Local Variables: */
/* mode:c */
/* eval:(load-library "time-stamp") */
/* eval:(make-local-variable 'write-file-hooks) */
/* eval:(add-hook 'write-file-hooks 'time-stamp) */
/* eval:(setq time-stamp-format '(time-stamp-yyyy/mm/dd time-stamp-hh:mm:ss user-login-name)) */
/* End: */
......@@ -1270,7 +1270,7 @@ void tansetdefconfig (void){
colortab[GCPETITEHLP].blue = (colortab[GCPETITEFG].blue+colortab[GCPETITEBG].blue)/2;
/* Gcompris */
GcomprisProperties *properties = gcompris_get_properties();
GcomprisProperties *properties = gc_prop_get();
gchar *deffigfile = g_strconcat(properties->package_data_dir,"/gtans/figures/default.figures", NULL);
tanallocname(&figfilename, deffigfile);
......
......@@ -540,7 +540,7 @@ static void highlight_selected(GnomeCanvasItem * item) {
* ==================================== */
static void init_xml()
{
GcomprisProperties *properties = gcompris_get_properties();
GcomprisProperties *properties = gc_prop_get();
char *filename;
filename = g_strdup_printf("%s/%s/board1.xml", properties->package_data_dir, gcomprisBoard->boarddir);
g_debug("filename = %s %s %s\n", filename, properties->package_data_dir, gcomprisBoard->boarddir);
......
/* gcompris - memory.c
*
* Time-stamp: <2006/08/12 03:08:59 bruno>
* Time-stamp: <2006/08/21 23:33:28 bruno>
*
* Copyright (C) 2000 Bruno Coudoin
*
......@@ -813,7 +813,7 @@ static void start_board (GcomprisBoard *agcomprisBoard)
if (currentUiMode == UIMODE_SOUND)
{
GcomprisProperties *properties = gcompris_get_properties();
GcomprisProperties *properties = gc_prop_get();
gcompris_pause_sound();
gcompris_set_background(gnome_canvas_root(gcomprisBoard->canvas), "images/gcompris_band.png");
......@@ -1834,12 +1834,3 @@ static void start_callback(gchar *file){
playing_sound = FALSE;
}
/* Local Variables: */
/* mode:c */
/* eval:(load-library "time-stamp") */
/* eval:(make-local-variable 'write-file-hooks) */
/* eval:(add-hook 'write-file-hooks 'time-stamp) */
/* eval:(setq time-stamp-format '(time-stamp-yyyy/mm/dd time-stamp-hh:mm:ss user-login-name)) */
/* End: */
/* gcompris - menu2.c
*
* Time-stamp: <2006/08/15 02:27:54 bruno>
* Time-stamp: <2006/08/21 23:34:21 bruno>
*
* Copyright (C) 2000 Bruno Coudoin
*
......@@ -177,7 +177,7 @@ static void menu_pause (gboolean pause)
static void menu_start (GcomprisBoard *agcomprisBoard)
{
GcomprisProperties *properties = gcompris_get_properties();
GcomprisProperties *properties = gc_prop_get();
current_x = 0.0;
current_y = 0.0;
......@@ -276,7 +276,7 @@ static void create_panel(GnomeCanvasGroup *parent)
gdouble x, y;
gint int_y;
GcomprisProperties *properties = gcompris_get_properties();
GcomprisProperties *properties = gc_prop_get();
/* In normal mode, we show all the sections in panel */
/* in direct submenu access, we show the icon of the submenu */
......@@ -525,7 +525,7 @@ static void menu_create_item(GnomeCanvasGroup *parent, MenuItems *menuitems, Gco
soundfile = gc_file_find_absolute(board->mandatory_sound_file);
g_warning("Checking mandatory_sound_file %s\n", soundfile);
if (!soundfile || !gcompris_get_properties()->fx)
if (!soundfile || !gc_prop_get()->fx)
{
pixmap = gcompris_load_skin_pixmap("voice_bad.png");
}
......@@ -655,7 +655,7 @@ item_event(GnomeCanvasItem *item, GdkEvent *event, MenuItems *menuitems)
if (strcmp(board->type,"menu")==0){
gchar *path = g_strdup_printf("%s/%s",board->section, board->name);
GcomprisProperties *properties = gcompris_get_properties();
GcomprisProperties *properties = gc_prop_get();
display_section(path);
......@@ -871,7 +871,7 @@ static void create_top(GnomeCanvasGroup *parent, gchar *path)
GnomeCanvasItem *item;
GcomprisProperties *properties = gcompris_get_properties();
GcomprisProperties *properties = gc_prop_get();
if (!path)
return;
......@@ -1039,13 +1039,3 @@ static void
menu_config_stop()
{
}
/* Local Variables: */
/* mode:c */
/* eval:(load-library "time-stamp") */
/* eval:(make-local-variable 'write-file-hooks) */
/* eval:(add-hook 'write-file-hooks 'time-stamp) */
/* eval:(setq time-stamp-format '(time-stamp-yyyy/mm/dd time-stamp-hh:mm:ss user-login-name)) */
/* End: */
......@@ -567,7 +567,7 @@ static void dump_xml() {
/* ==================================== */
static void init_xml()
{
GcomprisProperties *properties = gcompris_get_properties();
GcomprisProperties *properties = gc_prop_get();
char *filename;
filename = g_strdup_printf("%s/%s/board1.xml", properties->package_data_dir, gcomprisBoard->boarddir);
assert(g_file_test(filename, G_FILE_TEST_EXISTS));
......
/* gcompris - paratrooper.c
*
* Time-stamp: <2006/08/12 03:13:17 bruno>
* Time-stamp: <2006/08/21 23:34:30 bruno>
*
* Copyright (C) 2000 Bruno Coudoin
*
......@@ -729,14 +729,3 @@ item_event(GnomeCanvasItem *item, GdkEvent *event, void *data)
return FALSE;
}
/* Local Variables: */
/* mode:c */
/* eval:(load-library "time-stamp") */
/* eval:(make-local-variable 'write-file-hooks) */
/* eval:(add-hook 'write-file-hooks 'time-stamp) */
/* eval:(setq time-stamp-format '(time-stamp-yyyy/mm/dd time-stamp-hh:mm:ss user-login-name)) */
/* End: */
/* gcompris - planegame.c
*
* Time-stamp: <2006/08/12 03:09:14 bruno>
* Time-stamp: <2006/08/21 23:34:38 bruno>
*
* Copyright (C) 2000 Bruno Coudoin
*
......@@ -624,13 +624,3 @@ setup_item(GnomeCanvasItem *item)
(GtkSignalFunc) item_event,
NULL);
}
/* Local Variables: */
/* mode:c */
/* eval:(load-library "time-stamp") */
/* eval:(make-local-variable 'write-file-hooks) */
/* eval:(add-hook 'write-file-hooks 'time-stamp) */
/* eval:(setq time-stamp-format '(time-stamp-yyyy/mm/dd time-stamp-hh:mm:ss user-login-name)) */
/* End: */
......@@ -28,7 +28,7 @@ gcompris_new_pyGcomprisWordlistObject(GcomprisWordlist* wordlist)
static void
pyGcomprisWordlistType_dealloc(pyGcomprisWordlistObject *self)
{
gcompris_wordlist_free((GcomprisWordlist *)self->cdata);
gc_wordlist_free((GcomprisWordlist *)self->cdata);
self->cdata = NULL;
PyObject_DEL(self);
}
......@@ -55,8 +55,8 @@ pyGcomprisWordlistType_getattr(pyGcomprisWordlistObject *self, char *name)
PyObject *pydict;
PyObject *pylist;
gint level;
GList *words;
GList *list, *list_words;
GSList *words;
GSList *list, *list_words;
pydict = PyDict_New();
......
/* gcompris - py-mod-gcompris.c
*
* Time-stamp: <2006/08/21 23:36:37 bruno>
*
* Copyright (C) 2003 Olivier Samyn <osamyn@ulb.ac.be>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include <Python.h>
#include <pygobject.h>
#include "gcompris/gcompris.h"
......@@ -566,17 +587,17 @@ py_gc_db_get_filename(PyObject* self, PyObject* args)
}
/* GcomprisProperties *gcompris_get_properties(void); */
/* GcomprisProperties *gc_prop_get(void); */
static PyObject*
py_gcompris_get_properties(PyObject* self, PyObject* args)
py_gc_prop_get(PyObject* self, PyObject* args)
{
GcomprisProperties* result;
/* Parse arguments */
if(!PyArg_ParseTuple(args, ":gcompris_get_properties"))
if(!PyArg_ParseTuple(args, ":gc_prop_get"))
return NULL;
/* Call the corresponding C function */
result = gcompris_get_properties();
result = gc_prop_get();
/* Create and return the result */
return gcompris_new_pyGcomprisPropertiesObject(result);
......@@ -1493,7 +1514,7 @@ py_gcompris_get_current_board_dirname (PyObject* self, PyObject* args)
}
static PyObject*
py_gcompris_get_wordlist_from_file (PyObject* self, PyObject* args)
py_gcompris_wordlist_get_from_file (PyObject* self, PyObject* args)
{
GcomprisWordlist *result;
gchar *filename;
......@@ -1502,7 +1523,7 @@ py_gcompris_get_wordlist_from_file (PyObject* self, PyObject* args)
return NULL;
/* Call the corresponding C function */
result = gcompris_get_wordlist_from_file (filename);
result = gc_wordlist_get_from_file (filename);
if (result)
return gcompris_new_pyGcomprisWordlistObject(result);
else {
......@@ -1557,7 +1578,7 @@ static PyMethodDef PythonGcomprisModule[] = {
{ "file_selector_stop", py_gc_selector_file_stop,
METH_VARARGS, "gc_selector_file_stop" },
{ "get_database", py_gc_db_get_filename, METH_VARARGS, "gc_db_get_filename" },
{ "get_properties", py_gcompris_get_properties, METH_VARARGS, "gcompris_get_properties" },
{ "get_properties", py_gc_prop_get, METH_VARARGS, "gc_prop_get" },
{ "get_board_from_section", py_gcompris_get_board_from_section, METH_VARARGS, "gcompris_get_board_from_section" },
{ "spawn_async", (PyCFunction)py_gcompris_spawn_async, METH_VARARGS|METH_KEYWORDS, "gcompris_spawn_sync" },
{ "child_watch_add", (PyCFunction)py_gcompris_child_watch_add, METH_VARARGS|METH_KEYWORDS, "gcompris_child_watch_add" },
......@@ -1584,7 +1605,7 @@ static PyMethodDef PythonGcomprisModule[] = {
{ "get_current_user_dirname", py_gcompris_get_current_user_dirname, METH_VARARGS, "gcompris_get_current_user_dirname" },
{ "get_board_dirname", py_gcompris_get_board_dirname, METH_VARARGS, "gcompris_get_board_dirname" },
{ "get_current_board_dirname", py_gcompris_get_current_board_dirname, METH_VARARGS, "gcompris_get_current_board_dirname" },
{ "get_wordlist", py_gcompris_get_wordlist_from_file, METH_VARARGS, "gcompris_get_wordlist_from_file" },
{ "get_wordlist", py_gcompris_wordlist_get_from_file, METH_VARARGS, "gcompris_wordlist_get_from_file" },
{ "im_reset", py_gcompris_im_reset, METH_VARARGS, "gcompris_im_reset" },
{ NULL, NULL, 0, NULL}
};
......@@ -1650,7 +1671,7 @@ void python_gcompris_module_init(void)
PyModule_AddIntConstant(gcomprisModule, "CURSOR_DEFAULT", GCOMPRIS_DEFAULT_CURSOR);
/* Some non gcompris.h constants. */
GcomprisProperties *properties = gcompris_get_properties();
GcomprisProperties *properties = gc_prop_get();
PyModule_AddStringConstant(gcomprisModule, "DATA_DIR", properties->package_data_dir);
PyModule_AddStringConstant(gcomprisModule, "PYTHON_PLUGIN_DIR", properties->package_python_plugin_dir);
......
......@@ -125,7 +125,7 @@ pythonboard_init (GcomprisBoard *agcomprisBoard){
PyObject* module_dict;
PyObject* py_boardclass;
GcomprisProperties *properties = gcompris_get_properties();
GcomprisProperties *properties = gc_prop_get();
if (pythonboard_is_ready)
return ;
......@@ -277,7 +277,7 @@ pythonboard_start (GcomprisBoard *agcomprisBoard){
char* board_file_name;
gchar *userplugindir;
GcomprisProperties *properties = gcompris_get_properties();
GcomprisProperties *properties = gc_prop_get();
if(agcomprisBoard!=NULL){
/* Initialize the python interpreter */
......@@ -558,7 +558,7 @@ pythonboard_config_start (GcomprisBoard *agcomprisBoard,
GcomprisProfile *aProfile
)
{
GcomprisProperties *properties = gcompris_get_properties();
GcomprisProperties *properties = gc_prop_get();
PyObject* py_function_result;
PyObject* module_dict;
PyObject* py_boardclass;
......
......@@ -407,7 +407,7 @@ static void highlight_selected(int c) {
* ==================================== */
static void init_xml()
{
GcomprisProperties *properties = gcompris_get_properties();
GcomprisProperties *properties = gc_prop_get();
char *filename;
filename = g_strdup_printf("%s/%s/board1.xml", properties->package_data_dir, gcomprisBoard->boarddir);
g_warning("filename = %s %s %s\n", filename, properties->package_data_dir, gcomprisBoard->boarddir);
......
/* gcompris - reading.c
*
* Time-stamp: <2006/08/13 18:03:47 bruno>
* Time-stamp: <2006/08/21 23:34:48 bruno>
*
* Copyright (C) 2000 Bruno Coudoin
*
......@@ -728,7 +728,7 @@ item_event_valid(GnomeCanvasItem *item, GdkEvent *event, gpointer data)
static FILE *get_wordfile(const char *locale)
{
GcomprisProperties *properties = gcompris_get_properties();
GcomprisProperties *properties = gc_prop_get();
gchar *filename;
FILE *wordsfd = NULL;
......@@ -740,7 +740,7 @@ static FILE *get_wordfile(const char *locale)
if(wordsfd==NULL)
{
GcomprisProperties *properties = gcompris_get_properties();
GcomprisProperties *properties = gc_prop_get();
g_free(filename);
/* Second Try to find a file matching the 'max' and the locale */
filename = g_strdup_printf("%s%s%.2s",
......@@ -902,13 +902,3 @@ static void
reading_config_stop()
{
}
/* Local Variables: */
/* mode:c */
/* eval:(load-library "time-stamp") */
/* eval:(make-local-variable 'write-file-hooks) */
/* eval:(add-hook 'write-file-hooks 'time-stamp) */
/* eval:(setq time-stamp-format '(time-stamp-yyyy/mm/dd time-stamp-hh:mm:ss user-login-name)) */
/* End: */
......@@ -426,7 +426,7 @@ static GnomeCanvasItem *reversecount_create_item(GnomeCanvasGroup *parent)
double block_width, block_height;
double dice_area_x;
double xratio, yratio;
GcomprisProperties *properties = gcompris_get_properties();
GcomprisProperties *properties = gc_prop_get();
boardRootItem = GNOME_CANVAS_GROUP(
gnome_canvas_item_new (gnome_canvas_root(gcomprisBoard->canvas),
......
/* gcompris - shapegame.c
*
* Time-stamp: <2006/08/17 00:14:52 bruno>
* Time-stamp: <2006/08/21 23:35:01 bruno>
*
* Copyright (C) 2000 Bruno Coudoin
*
......@@ -2147,14 +2147,3 @@ static void
config_stop()
{
}
/* Local Variables: */
/* mode:c */
/* eval:(load-library "time-stamp") */
/* eval:(make-local-variable 'write-file-hooks) */
/* eval:(add-hook 'write-file-hooks 'time-stamp) */
/* eval:(setq time-stamp-format '(time-stamp-yyyy/mm/dd time-stamp-hh:mm:ss user-login-name)) */
/* End: */
/* gcompris - smallnumbers.c
*
* Time-stamp: <2006/08/15 11:09:04 bruno>
* Time-stamp: <2006/08/21 23:36:29 bruno>
*
* Copyright (C) 2000 Bruno Coudoin
*
......@@ -626,14 +626,3 @@ static void
smallnumber_config_stop()
{
}
/* Local Variables: */
/* mode:c */
/* eval:(load-library "time-stamp") */
/* eval:(make-local-variable 'write-file-hooks) */
/* eval:(add-hook 'write-file-hooks 'time-stamp) */
/* eval:(setq time-stamp-format '(time-stamp-yyyy/mm/dd time-stamp-hh:mm:ss user-login-name)) */
/* End: */
This diff is collapsed.
/* gcompris - about.c
*
* Time-stamp: <2006/08/20 23:43:01 bruno>
* Time-stamp: <2006/08/21 23:27:24 bruno>
*
* Copyright (C) 2000 Bruno Coudoin
*
......@@ -464,14 +464,3 @@ item_event_ok(GnomeCanvasItem *item, GdkEvent *event, gpointer data)
return FALSE;
}
/* Local Variables: */
/* mode:c */
/* eval:(load-library "time-stamp") */
/* eval:(make-local-variable 'write-file-hooks) */
/* eval:(add-hook 'write-file-hooks 'time-stamp) */
/* eval:(setq time-stamp-format '(time-stamp-yyyy/mm/dd time-stamp-hh:mm:ss user-login-name)) */
/* End: */
/* gcompris - bar.c
*
* Time-stamp: <2006/08/20 23:37:24 bruno>
* Time-stamp: <2006/08/21 23:27:39 bruno>
*
* Copyright (C) 2000-2003 Bruno Coudoin
*
......@@ -69,7 +69,7 @@ static void confirm_quit(gboolean answer);
*/
void gc_bar_start (GnomeCanvas *theCanvas)
{
GcomprisProperties *properties = gcompris_get_properties();
GcomprisProperties *properties = gc_prop_get();
GdkPixbuf *pixmap = NULL;
GnomeCanvasItem *rootitem;
gint16 width, height;
......@@ -585,12 +585,3 @@ confirm_quit(gboolean answer)
if (answer)
gc_exit();
}
/* Local Variables: */
/* mode:c */
/* eval:(load-library "time-stamp") */
/* eval:(make-local-variable 'write-file-hooks) */
/* eval:(add-hook 'write-file-hooks 'time-stamp) */
/* eval:(setq time-stamp-format '(time-stamp-yyyy/mm/dd time-stamp-hh:mm:ss user-login-name)) */
/* End: */
......@@ -196,7 +196,7 @@ void set_current_gcompris_board(GcomprisBoard * gcomprisBoard)
#ifdef WIN32
gboolean board_check_file(GcomprisBoard *gcomprisBoard)
{
GcomprisProperties *properties = gcompris_get_properties();
GcomprisProperties *properties = gc_prop_get();
BoardPlugin *bp;
guint i=0;
......@@ -255,7 +255,7 @@ gboolean board_check_file(GcomprisBoard *gcomprisBoard)
GModule *gmodule = NULL;
gchar *gmodule_file = NULL;
BoardPlugin *(*plugin_get_bplugin_info) (void) = NULL;
GcomprisProperties *properties = gcompris_get_properties();
GcomprisProperties *properties = gc_prop_get();
gchar *sep;
gchar *type;
......@@ -416,12 +416,3 @@ void board_run_next(GcomprisBoard *board)
NULL);
}
/* Local Variables: */
/* mode:c */
/* eval:(load-library "time-stamp") */
/* eval:(make-local-variable 'write-file-hooks) */
/* eval:(add-hook 'write-file-hooks 'time-stamp) */
/* eval:(setq time-stamp-format '(time-stamp-yyyy/mm/dd time-stamp-hh:mm:ss user-login-name)) */
/* End: */
/* gcompris - board_config.c
*
* Time-stamp: <2006/08/13 17:15:59 bruno>
* Time-stamp: <2006/08/21 23:27:57 bruno>
*
* Copyright (C) 2001 Pascal Georges
*
......@@ -173,8 +173,8 @@ GtkVBox *gcompris_configuration_window(gchar *label, GcomprisConfCallback callba
/* parameters */
#ifdef XF86_VIDMODE
if (gcompris_get_properties()->fullscreen &&
!gcompris_get_properties()->noxf86vm)
if (gc_prop_get()->fullscreen &&
!gc_prop_get()->noxf86vm)
{
memset(&gcompris_last_configure_event, 0, sizeof(GdkEventConfigure));
gtk_widget_add_events(GTK_WIDGET(conf_window), GDK_STRUCTURE_MASK);
......@@ -188,7 +188,7 @@ GtkVBox *gcompris_configuration_window(gchar *label, GcomprisConfCallback callba
gtk_widget_show(GTK_WIDGET(conf_window));
GcomprisProperties *properties = gcompris_get_properties();
GcomprisProperties *properties = gc_prop_get();
if (properties->fullscreen && !properties->noxf86vm)
if (gdk_pointer_grab(gcompris_get_window()->window, TRUE, 0,
GDK_WINDOW(gcompris_get_window()), NULL, GDK_CURRENT_TIME) !=
......@@ -579,7 +579,7 @@ gc_locale_gets_list(){