gcompris r3461 - in trunk: . src/gcompris

[bcoudoin svn gnome org]

Author: bcoudoin
Date: Fri Jul  4 21:32:35 2008
New Revision: 3461
URL: http://svn.gnome.org/viewvc/gcompris?rev=3461&view=rev

Log:
	* src/gcompris/gcompris.c: (load_properties): There is a major issue on platform
	that does not use binreloc. In that case Compris exec_prefix gets set to "";
	instead of NULL in gcompris.c, causes the latest gcompris to not start at all under Fedora
	and Mandriva (and probably others).
	replaced:  exec_prefix = gbr_find_exe_dir("");
        by:        exec_prefix = gbr_find_exe_dir(NULL);


Modified:
   trunk/ChangeLog
   trunk/src/gcompris/gcompris.c

Modified: trunk/src/gcompris/gcompris.c
==============================================================================
--- trunk/src/gcompris/gcompris.c	(original)
+++ trunk/src/gcompris/gcompris.c	Fri Jul  4 21:32:35 2008
@@ -1127,9 +1127,9 @@
 #ifdef NSBUNDLE
   exec_prefix = gcompris_nsbundle_resource ();
 #else
-  exec_prefix = gbr_find_exe_dir("");
+  exec_prefix = gbr_find_exe_dir(NULL);
 #endif
-  g_warning("exec_prefix %s\n", exec_prefix);
+  g_warning("exec_prefix %s\n", (exec_prefix==NULL ? "NONE" : exec_prefix);
 
   prefix_dir = gbr_find_prefix(NULL);