Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 2391 | Differences between
and this patch

Collapse All | Expand All

(-)olvwm-4.0/pixmap.c (-3 / +3 lines)
Lines 446-459 Link Here
446
        int     i = 0;;
446
        int     i = 0;;
447
447
448
        if ((owHome = getenv("OPENWINHOME")) == NULL)
448
        if ((owHome = getenv("OPENWINHOME")) == NULL)
449
                owHome = "/usr/openwin";
449
                owHome = "/usr/share/olvwm";
450
450
451
        bitmapSearchPath = (char **)MemAlloc(4 * sizeof(char *));
451
        bitmapSearchPath = (char **)MemAlloc(4 * sizeof(char *));
452
452
453
        (void)sprintf(bmPath, "%s/etc/workspace/patterns",owHome);
453
        (void)sprintf(bmPath, "%s/patterns",owHome);
454
        bitmapSearchPath[i++] = MemNewString(bmPath);
454
        bitmapSearchPath[i++] = MemNewString(bmPath);
455
455
456
        (void)sprintf(bmPath, "%s/include/X11/bitmaps",owHome);
456
        (void)sprintf(bmPath, "%s/bitmaps",owHome);
457
        bitmapSearchPath[i++] = MemNewString(bmPath);
457
        bitmapSearchPath[i++] = MemNewString(bmPath);
458
458
459
        bitmapSearchPath[i++] = MemNewString("/usr/X11/include/X11/bitmaps");
459
        bitmapSearchPath[i++] = MemNewString("/usr/X11/include/X11/bitmaps");
(-)olvwm-4.0/screen.c (-3 / +3 lines)
Lines 523-536 Link Here
523
	int     i = 0;;
523
	int     i = 0;;
524
524
525
	if ((owHome = getenv("OPENWINHOME")) == NULL)
525
	if ((owHome = getenv("OPENWINHOME")) == NULL)
526
		owHome = "/usr/openwin";
526
		owHome = "/usr/share/olvwm";
527
527
528
	bitmapSearchPath = (char **)MemAlloc(4 * sizeof(char *));
528
	bitmapSearchPath = (char **)MemAlloc(4 * sizeof(char *));
529
529
530
	(void)sprintf(bmPath, "%s/etc/workspace/patterns",owHome);
530
	(void)sprintf(bmPath, "%s/patterns",owHome);
531
	bitmapSearchPath[i++] = MemNewString(bmPath);
531
	bitmapSearchPath[i++] = MemNewString(bmPath);
532
 
532
 
533
	(void)sprintf(bmPath, "%s/include/X11/bitmaps",owHome);
533
	(void)sprintf(bmPath, "%s/bitmaps",owHome);
534
	bitmapSearchPath[i++] = MemNewString(bmPath);
534
	bitmapSearchPath[i++] = MemNewString(bmPath);
535
535
536
	bitmapSearchPath[i++] = MemNewString("/usr/X11/include/X11/bitmaps");
536
	bitmapSearchPath[i++] = MemNewString("/usr/X11/include/X11/bitmaps");
(-)olvwm-4.0/usermenu.c (-8 / +8 lines)
Lines 526-542 Link Here
526
526
527
    b = 0;
527
    b = 0;
528
528
529
    buttons[b++] = createSimpleButton(GetNewText("xterm"), NULL,
529
    buttons[b++] = createSimpleButton(GetNewText("Bash"), NULL,
530
				      AppMenuFunc,
530
				      AppMenuFunc,
531
				      MemNewString("xterm"));
531
				      MemNewString("xterm -ls -rv -e bash"));
532
    
532
    
533
    buttons[b++] = createSimpleButton(GetNewText("emacs"), NULL,
533
    buttons[b++] = createSimpleButton(GetNewText("Emacs"), NULL,
534
				     AppMenuFunc,
534
				     AppMenuFunc,
535
				     MemNewString("emacs"));
535
				     MemNewString("emacs"));
536
    
536
    
537
    buttons[b++] = createSimpleButton(GetNewText("Netscape"), NULL,
537
    buttons[b++] = createSimpleButton(GetNewText("Browser"), NULL,
538
				     AppMenuFunc,
538
				     AppMenuFunc,
539
				     MemNewString("netscape"));    
539
				     MemNewString("opera||mozilla||netscape")); 
540
 
540
 
541
    buttons[b++] = createSeparatorButton();
541
    buttons[b++] = createSeparatorButton();
542
 
542
 
Lines 862-868 Link Here
862
		home = ".";
862
		home = ".";
863
 
863
 
864
	if ((owHome = getenv("OPENWINHOME")) == NULL)
864
	if ((owHome = getenv("OPENWINHOME")) == NULL)
865
		owHome = "/usr/openwin";
865
		owHome = "/usr/share/olvwm";
866
 
866
 
867
	menuSearchPath = (char **)MemAlloc(NUM_SEARCH_PATH*sizeof(char *));
867
	menuSearchPath = (char **)MemAlloc(NUM_SEARCH_PATH*sizeof(char *));
868
 
868
 
Lines 892-899 Link Here
892
	sprintf(buf, "%s/lib/%%s", owHome);
892
	sprintf(buf, "%s/lib/%%s", owHome);
893
	menuSearchPath[i++] = MemNewString(buf);
893
	menuSearchPath[i++] = MemNewString(buf);
894
894
895
	/* /usr/openwin/lib/<menufile> */
895
	/* /usr/share/olvwm/<menufile> */
896
	menuSearchPath[i++] = MemNewString("/usr/openwin/lib/%s");
896
	menuSearchPath[i++] = MemNewString("/usr/share/olvwm/%s");
897
897
898
	menuSearchPath[i] = (char *)NULL;
898
	menuSearchPath[i] = (char *)NULL;
899
899

Return to bug 2391