Mercurial > pidgin.yaz
changeset 10263:1668fcab5968
[gaim-migrate @ 11407]
This makes win32 compile again, oops.
I also gives rid of a nss warning, and creates a leak instead. But leaking
one string in an init function is better than possibly crashing.
In general, I don't understand why it's putting /prefixtogaim/lib/gaim
in front of that, as that .so is never in that location.
committer: Tailor Script <tailor@pidgin.im>
| author | Tim Ringenbach <marv@pidgin.im> |
|---|---|
| date | Thu, 25 Nov 2004 22:03:58 +0000 |
| parents | 7f487c725a90 |
| children | 36b7335d3452 |
| files | plugins/ssl/ssl-nss.c src/main.c |
| diffstat | 2 files changed, 6 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/plugins/ssl/ssl-nss.c Thu Nov 25 20:48:16 2004 +0000 +++ b/plugins/ssl/ssl-nss.c Thu Nov 25 22:03:58 2004 +0000 @@ -63,7 +63,8 @@ /* TODO: Fix this so autoconf does the work trying to find this lib. */ SECMOD_AddNewModule("Builtins", #ifndef _WIN32 - BR_LIBDIR("/libnssckbi.so"), + g_strdup(BR_LIBDIR("/libnssckbi.so")), + /* this might leak, and looks wrong in general */ #else "nssckbi.dll", #endif
--- a/src/main.c Thu Nov 25 20:48:16 2004 +0000 +++ b/src/main.c Thu Nov 25 22:03:58 2004 +0000 @@ -585,6 +585,7 @@ } #endif /* HAVE_STARTUP_NOTIFICATION */ +#ifndef _WIN32 static char *gaim_find_binary_location(void *symbol, void *data) { static char *fullname = NULL; @@ -632,7 +633,7 @@ fullname = basebuf; return strdup(fullname); } - +#endif /* #ifndef _WIN32 */ /* FUCKING GET ME A TOWEL! */ #ifdef _WIN32 @@ -672,7 +673,9 @@ #ifdef DEBUG opt_debug = 1; #endif +#ifndef _WIN32 br_set_locate_fallback_func(gaim_find_binary_location, argv[0]); +#endif #ifdef ENABLE_NLS bindtextdomain(PACKAGE, LOCALEDIR); bind_textdomain_codeset(PACKAGE, "UTF-8");