comparison src/win_gaim.c @ 11469:d83e1fe99d69

[gaim-migrate @ 13709] Patch from Steve L?posi so that the version information is displayed if the -v flag is specified and so the single instance stuff doesn't kick in when -v or -h is specified. committer: Tailor Script <[e-mail]>

11468:c3cb62d33f53

{
        char errbuf[512];
        char gaimdir[MAX_PATH];
        HMODULE hmod;

	/* If debug or help flag used, create console for output */
	if (strstr(lpszCmdLine, "-d") || strstr(lpszCmdLine, "-h")) {
		LPFNATTACHCONSOLE MyAttachConsole = NULL;
		if ((hmod = GetModuleHandle("kernel32.dll"))) {
			MyAttachConsole =
				(LPFNATTACHCONSOLE)
				GetProcAddress(hmod, "AttachConsole");

        if(!getenv("GAIM_NO_DLL_CHECK"))
                dll_prep();

	wgaim_set_locale();
	if(!getenv("GAIM_MULTI_INST") && !wgaim_set_running())
		return 0;

	wgaim_set_proxy();

        /* Now we are ready for Gaim .. */
        if((hmod=LoadLibrary("gaim.dll"))) {

11469:d83e1fe99d69

{
        char errbuf[512];
        char gaimdir[MAX_PATH];
        HMODULE hmod;

	/* If debug or help or version flag used, create console for output */
	if (strstr(lpszCmdLine, "-d") || strstr(lpszCmdLine, "-h") || strstr(lpszCmdLine, "-v")) {
		LPFNATTACHCONSOLE MyAttachConsole = NULL;
		if ((hmod = GetModuleHandle("kernel32.dll"))) {
			MyAttachConsole =
				(LPFNATTACHCONSOLE)
				GetProcAddress(hmod, "AttachConsole");

        if(!getenv("GAIM_NO_DLL_CHECK"))
                dll_prep();

	wgaim_set_locale();
	/* If help or version flag used, do not check Mutex */
	if(!strstr(lpszCmdLine, "-h") && !strstr(lpszCmdLine, "-v"))
		if(!getenv("GAIM_MULTI_INST") && !wgaim_set_running())
			return 0;

	wgaim_set_proxy();

        /* Now we are ready for Gaim .. */
        if((hmod=LoadLibrary("gaim.dll"))) {