Magellan Linux

Annotation of /trunk/openmotif/patches/openmotif-2.2.3-mwm-configdir.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 153 - (hide annotations) (download)
Tue May 8 20:52:56 2007 UTC (17 years, 1 month ago) by niro
File size: 1549 byte(s)
-import

1 niro 153 diff -urN openMotif-2.2.2.orig/clients/mwm/WmResParse.c openMotif-2.2.2/clients/mwm/WmResParse.c
2     --- openMotif-2.2.2.orig/clients/mwm/WmResParse.c 2002-01-10 21:55:37.000000000 +0100
3     +++ openMotif-2.2.2/clients/mwm/WmResParse.c 2003-06-04 22:20:22.000000000 +0200
4     @@ -2411,7 +2411,7 @@
5     if (MwmBehavior)
6     {
7     strcpy(cfileName, LIBDIR);
8     - strncat(cfileName, "/", MAXWMPATH-strlen(cfileName));
9     + strncat(cfileName, "/mwm/", MAXWMPATH-strlen(cfileName));
10     strncat(cfileName, LANG, MAXWMPATH-strlen(cfileName));
11     strncat(cfileName, SLASH_MWMRC, MAXWMPATH - strlen(cfileName));
12     }
13     @@ -2427,7 +2427,7 @@
14     * Try /$LANG/system.mwmrc within the install tree
15     */
16     strcpy(cfileName, LIBDIR);
17     - strncat(cfileName, "/", MAXWMPATH-strlen(cfileName));
18     + strncat(cfileName, "/mwm/", MAXWMPATH-strlen(cfileName));
19     strncat(cfileName, LANG, MAXWMPATH-strlen(cfileName));
20     strncat(cfileName, SLASH_MWMRC, MAXWMPATH - strlen(cfileName));
21     #endif /* WSM */
22     @@ -2449,7 +2449,7 @@
23     if (MwmBehavior)
24     {
25     strcpy(cfileName, LIBDIR);
26     - strncat(cfileName, SLASH_MWMRC, MAXWMPATH - strlen(cfileName));
27     + strncat(cfileName, "/mwm" SLASH_MWMRC, MAXWMPATH - strlen(cfileName));
28     #ifdef PANELIST
29     fileP = fopen (cfileName, "r");
30     #else /* PANELIST */
31     @@ -2473,7 +2473,7 @@
32     * Try /system.mwmrc within the install tree
33     */
34     strcpy(cfileName, LIBDIR);
35     - strncat(cfileName, SLASH_MWMRC, MAXWMPATH - strlen(cfileName));
36     + strncat(cfileName, "/mwm" SLASH_MWMRC, MAXWMPATH - strlen(cfileName));
37    
38     if (LANG != NULL)
39     {