On Aug 31, 2010, at 12:49 AM, Geert Janssens wrote: > On Tuesday 31 August 2010, John Ralls wrote: >> Author: jralls >> Date: 2010-08-30 18:42:15 -0400 (Mon, 30 Aug 2010) >> New Revision: 19515 >> Trac: http://svn.gnucash.org/trac/changeset/19515 >> >> Modified: >> gnucash/trunk/src/core-utils/binreloc.c >> Log: >> Update binreloc to use the free functions for bundle id and resource path >> >> Modified: gnucash/trunk/src/core-utils/binreloc.c >> =================================================================== >> --- gnucash/trunk/src/core-utils/binreloc.c 2010-08-30 18:38:26 UTC (rev >> 19514) +++ gnucash/trunk/src/core-utils/binreloc.c 2010-08-30 22:42:15 UTC >> (rev 19515) @@ -34,7 +34,7 @@ >> /** @internal >> * Find the canonical filename of the executable. Returns the filename >> * (which must be freed) or NULL on error. If the parameter 'error' is >> - * not NULL, the error code will be stored there, if an error occurred. >> + * not NULL, the error code will be stored there, if an error occured. >> */ >> static char * >> _br_find_exe (Gnc_GbrInitError *error) >> @@ -49,7 +49,7 @@ >> relocation code for windows. Unfortunately this is not >> the case and we have to add this manually. This is only >> one possibility; other ways of looking up the full path >> - of gnucash.exe probably exist.*/ >> + of gnucash-bin.exe probably exist.*/ >> gchar *prefix; >> gchar *result; >> >> @@ -58,7 +58,7 @@ >> the current process */ >> prefix = g_win32_get_package_installation_directory_of_module (NULL); >> result = g_build_filename (prefix, >> - "bin", "gnucash.exe", >> + "bin", "gnucash-bin.exe", >> (char*)NULL); >> g_free (prefix); >> return result; > > John, > > The changes above revert r19477 and in the process break binreloc on Windows. > > Perhaps you forgot to sync with trunk before committing your patch ?
Sorry. Fixed in r19517. No, that's not quite what I did wrong, but it had the same effect. I got lazy and copied a file instead of making a patch. Regards, John Ralls _______________________________________________ gnucash-devel mailing list [email protected] https://lists.gnucash.org/mailman/listinfo/gnucash-devel
