Ignore if TERM == dumb on ede-launch.

Check smallest allowed sizes for font and maxwidth in ede-desktop icons.
This commit is contained in:
Sanel Zukan 2009-11-27 22:26:25 +00:00
parent 31f5559acd
commit 1031cdb68e
2 changed files with 9 additions and 1 deletions

View File

@ -323,6 +323,14 @@ void Desktop::read_config(void) {
conf.get("Icons", "one_click_exec", gisett->one_click_exec, false); conf.get("Icons", "one_click_exec", gisett->one_click_exec, false);
conf.get("Icons", "auto_arrange", gisett->auto_arrange, true); conf.get("Icons", "auto_arrange", gisett->auto_arrange, true);
/* minimal allowed font size */
if(gisett->label_fontsize < 8)
gisett->label_fontsize = 12;
/* minimal allowed maxwidth size */
if(gisett->label_maxwidth < 30)
gisett->label_maxwidth = 75;
/* prevent wild values */ /* prevent wild values */
if(wmode != WALLPAPER_CENTER && wmode != WALLPAPER_TILE && wmode != WALLPAPER_STRETCH) if(wmode != WALLPAPER_CENTER && wmode != WALLPAPER_TILE && wmode != WALLPAPER_STRETCH)
wmode = WALLPAPER_CENTER; wmode = WALLPAPER_CENTER;

View File

@ -274,7 +274,7 @@ static void ok_cb(Fl_Widget*, void* w) {
const char* term = getenv("TERM"); const char* term = getenv("TERM");
/* also check if TERM get inherited from login console */ /* also check if TERM get inherited from login console */
if(!term || strcmp(term, "linux") == 0) if(!term || (strcmp(term, "linux") == 0) || (strcmp(term, "dumb") == 0))
term = "xterm"; term = "xterm";
snprintf(buf, sizeof(buf), "%s -e %s", term, cmd); snprintf(buf, sizeof(buf), "%s -e %s", term, cmd);