comparison libpurple/win32/win32dep.c @ 27967:e1cd44c7c7af

explicit merge of 'd957c051e839d63bfc0ef71320934890e7ae63c4' and '7fbd51e5a790f5cf3275a0bb8a8198acd078b4ec'
author Yoshiki Yazawa <yaz@honeyplanet.jp>
date Sat, 25 Jul 2009 04:54:36 +0000
parents b74fa3d29cda
children 224f9674a57e
comparison
equal deleted inserted replaced
27966:b4daae0798e3 27967:e1cd44c7c7af
417 } 417 }
418 418
419 void wpurple_init(void) { 419 void wpurple_init(void) {
420 WORD wVersionRequested; 420 WORD wVersionRequested;
421 WSADATA wsaData; 421 WSADATA wsaData;
422 const char *perlenv;
423 char *newenv;
424 422
425 if (!g_thread_supported()) 423 if (!g_thread_supported())
426 g_thread_init(NULL); 424 g_thread_init(NULL);
427 425
428 purple_debug_info("wpurple", "wpurple_init start\n"); 426 purple_debug_info("wpurple", "wpurple_init start\n");
442 if(LOBYTE(wsaData.wVersion) != 2 || HIBYTE(wsaData.wVersion) != 2) { 440 if(LOBYTE(wsaData.wVersion) != 2 || HIBYTE(wsaData.wVersion) != 2) {
443 purple_debug_error("wpurple", "Could not find a usable WinSock DLL. Oh well.\n"); 441 purple_debug_error("wpurple", "Could not find a usable WinSock DLL. Oh well.\n");
444 WSACleanup(); 442 WSACleanup();
445 } 443 }
446 444
447 /* Set Environmental Variables */
448 /* Tell perl where to find Purple's perl modules */
449 perlenv = g_getenv("PERL5LIB");
450 newenv = g_strdup_printf("%s%s%s" G_DIR_SEPARATOR_S "perlmod;",
451 perlenv ? perlenv : "",
452 perlenv ? ";" : "",
453 wpurple_install_dir());
454 if (!g_setenv("PERL5LIB", newenv, TRUE))
455 purple_debug_warning("wpurple", "putenv failed for PERL5LIB\n");
456 g_free(newenv);
457
458 purple_debug_info("wpurple", "wpurple_init end\n"); 445 purple_debug_info("wpurple", "wpurple_init end\n");
459 } 446 }
460 447
461 /* Windows Cleanup */ 448 /* Windows Cleanup */
462 449