Differences From Artifact [03e1f413a5]:

• File unix/gtkwin.c — part of check-in [11d422587d] at 2007-01-31 06:30:48 on branch trunk — Colin Watson has fixed the disgusting icons on GTK1. His patch appears to merely fix the background colour (arranging for it to have transparency rather than being on some kind of default grey background), but it turns out to also fix the strange blurry behaviour I see in the GNOME Taskbar, for no very obvious reason. (user: simon size: 107380)

To Artifact [2867e38790]:

• File unix/gtkwin.c — part of check-in [e32793db99] at 2007-02-10 11:02:41 on branch trunk — Avoid launching a session from the Default Settings, even if they do represent a launchable session, unless the user can be construed to have really meant it. This means: - starting up PuTTY when the Default Settings are launchable still brings up the config box, and you have to hit Open to actually launch that session - double-clicking on Default Settings from the config box will load them but not launch them. On the other hand: - explicitly loading the Default Settings on the command line using `-load' _does_ still launch them. (user: simon size: 107406)

3482
3483
3484
3485
3486
3487
3488

3489
3490
3491
3492
3493
3494
3495
3496

	    exit(1);		       /* pre-defaults pass to get -class */
	do_defaults(NULL, &inst->cfg);
	if (do_cmdline(argc, argv, 1, inst, &inst->cfg))
	    exit(1);		       /* post-defaults, do everything */

	cmdline_run_saved(&inst->cfg);


	if (!cfg_launchable(&inst->cfg) && !cfgbox(&inst->cfg))
	    exit(0);		       /* config box hit Cancel */
    }

    if (!compound_text_atom)
        compound_text_atom = gdk_atom_intern("COMPOUND_TEXT", FALSE);
    if (!utf8_string_atom)
        utf8_string_atom = gdk_atom_intern("UTF8_STRING", FALSE);

>
|

3482
3483
3484
3485
3486
3487
3488
3489
3490
3491
3492
3493
3494
3495
3496
3497

	    exit(1);		       /* pre-defaults pass to get -class */
	do_defaults(NULL, &inst->cfg);
	if (do_cmdline(argc, argv, 1, inst, &inst->cfg))
	    exit(1);		       /* post-defaults, do everything */

	cmdline_run_saved(&inst->cfg);

	if ((!loaded_session || !cfg_launchable(&inst->cfg)) &&
	    !cfgbox(&inst->cfg))
	    exit(0);		       /* config box hit Cancel */
    }

    if (!compound_text_atom)
        compound_text_atom = gdk_atom_intern("COMPOUND_TEXT", FALSE);
    if (!utf8_string_atom)
        utf8_string_atom = gdk_atom_intern("UTF8_STRING", FALSE);