- Fixed wrong call to XChangeProperty() when setting _NET_WM_ICON

- Changed the WPrefs icons with Largo's version
- Replaced Apps with Application in the docs

INSTALL

@@ -383,7 +383,7 @@ when running configure in step 2 of building Window Maker. You will
 also need to supply the --with-appspath option, to specify the path for
 WPrefs.app Example:
 
-./configure --prefix=/home/jshmoe --with-appspath=/home/jshmoe/GNUstep/Apps
+./configure --prefix=/home/jshmoe --with-appspath=/home/jshmoe/GNUstep/Applications
 
 
 Then make /home/jshmoe/bin be included in your search PATH, add

INSTALL.cs

@@ -426,7 +426,7 @@ domovsk
 cestu pro WPrefs.app.
 Příklad:
 
-./configure --prefix=/home/karel --with-appspath=/home/karel/GNUstep/Apps
+./configure --prefix=/home/karel --with-appspath=/home/karel/GNUstep/Applications
 
 Potom přidejte adresář /home/karel/bin do systémové proměnné PATH a adresář
 /home/karel/lib do sytémové proměnné LD_LIBRARY_PATH a nakonec spusťte

INSTALL.es

@@ -413,7 +413,7 @@ opci
 También necesitará proporcionar la opción --with-appspath, para especificar la ruta
 para WPrefs.app. Ejemplo:
 
-./configure --prefix=/home/jshmoe --with-appspath=/home/jshmoe/GNUstep/Apps
+./configure --prefix=/home/jshmoe --with-appspath=/home/jshmoe/GNUstep/Applications
 
 Luego haga /home/jshmoe/bin para que se lo incluya en su ruta de búsqueda, agregue
 /home/jshmoe/lib a su variable de entorno LD_LIBRARY_PATH y ejecute bin/wmaker.inst

INSTALL.fr

@@ -447,7 +447,7 @@ l'option --prefix correctement renseign
 Il est aussi nécessaire d'utiliser l'option --with-appspath, afin de préciser
 le chemin d'accès à WPrefs.app. Par exemple :
 
-./configure --prefix=/home/jshmoe --with-appspath=/home/jshmoe/GNUstep/Apps
+./configure --prefix=/home/jshmoe --with-appspath=/home/jshmoe/GNUstep/Applications
 
 
 Puis, faites en sorte que /home/jshmoe/bin soit inclus dans votre PATH, ajoutez

INSTALL.pt

@@ -373,7 +373,7 @@ Compilando o Window Maker.
 Você ainda precisará fornecer a opção --with-appspath, para especificar o
 caminho do WPrefs.app. Exemplo:
 
-./configure --prefix=/home/jshmoe --with-appspath=/home/jshmoe/GNUstep/Apps
+./configure --prefix=/home/jshmoe --with-appspath=/home/jshmoe/GNUstep/Applications
 
 Depois faça com que /home/jshome/bin seja incluído na variável PATH, adicione
 /home/jshome/lib na variável de ambiente LD_LIBRARY_PATH e rode bin/wmaker.inst

INSTALL.sk

@@ -417,7 +417,7 @@ v druhom kroku kompil
 --with-appspath, pomocou ktorej ¹pecifikujete cestu pre WPrefs.app.
 Príklad:
 
-./configure --prefix=/home/jshome --with-appspath=/home/jshome/GNUstep/Apps
+./configure --prefix=/home/jshome --with-appspath=/home/jshome/GNUstep/Applications
 
 Poto pridajte adresár /home/jshome/bin do premennej PATH, /home/jshome/lib
 do premennej LD_LIBRARY_PATH a spustite bin/wmaker.inst

WINGs/wapplication.c

@@ -117,12 +117,12 @@ WMPathForResourceOfType(char *resource, char *ext)
      * Paths are searched in this order:
      * - resourcePath/ext
      * - argv[0]/ext
-     * - GNUSTEP_USER_ROOT/Apps/ApplicationName.app/ext
+     * - GNUSTEP_USER_ROOT/Applications/ApplicationName.app/ext
-     * - ~/GNUstep/Apps/ApplicationName.app/ext
+     * - ~/GNUstep/Applications/ApplicationName.app/ext
-     * - GNUSTEP_LOCAL_ROOT/Apps/ApplicationName.app/ext
+     * - GNUSTEP_LOCAL_ROOT/Applications/ApplicationName.app/ext
-     * - /usr/local/GNUstep/Apps/ApplicationName.app/ext
+     * - /usr/local/GNUstep/Applications/ApplicationName.app/ext
-     * - GNUSTEP_SYSTEM_ROOT/Apps/ApplicationName.app/ext
+     * - GNUSTEP_SYSTEM_ROOT/Applications/ApplicationName.app/ext
-     * - /usr/GNUstep/Apps/ApplicationName.app/ext
+     * - /usr/GNUstep/Applications/ApplicationName.app/ext
      */
 
     if (WMApplication.resourcePath) {

WINGs/wwindow.c

@@ -261,9 +261,7 @@ setMiniwindow(WMWindow *win, RImage *image)
     if (!image)
       return;
 
-    data= malloc((image->width * image->height + 2) * sizeof(CARD32));
+    data = wmalloc((image->width * image->height + 2) * sizeof(CARD32));
-    if (!data)
-      return;
 
     o= 0;
     data[o++] = image->width;
@@ -283,13 +281,12 @@ setMiniwindow(WMWindow *win, RImage *image)
         }
     }
 
-    XChangeProperty(scr->display, win->view->window,
+    XChangeProperty(scr->display, win->view->window, scr->netwmIcon,
-                    scr->netwmIcon, XA_CARDINAL, 32,
+                    XA_CARDINAL, 32, PropModeReplace,
-                    PropModeReplace,
                     (unsigned char *)data,
-                    (image->width * image->height + 2) * sizeof(CARD32));
+                    (image->width * image->height + 2));
 
-    free(data);
+    wfree(data);
 }
 
 

WPrefs.app/README

@@ -73,24 +73,24 @@ WPrefs will be built automatically and installed with the rest of WindowMaker.
 Customized Installation
 -----------------------
 
-By default, WPrefs.app will be installed in the GNUstep applications 
+By default, WPrefs.app will be installed in the GNUstep applications directory, 
-directory, which is /usr/local/GNUstep/Apps. If you want to install it
+which is /usr/local/GNUstep/Applications. If you want to install it somewhere 
-somewhere else, like in /some_weird_path/Apps, set the GNUSTEP_LOCAL_ROOT
+else, like in /some_weird_path/Applications, set the GNUSTEP_LOCAL_ROOT
 environment variable to some_weird_path before running configure for
 WindowMaker. You can also configure Window Maker supplying the --with-appspath
-option to configure, like ./configure --with-appspath=/usr/GNUstep/Apps
+option to configure, like ./configure --with-appspath=/usr/GNUstep/Applications
 If you change your mind after installing, you can move the .app directory 
-to one of the following GNUstep/Apps directories:
+to one of the following GNUstep/Applications directories:
 
-/usr/GNUstep/Apps
+/usr/GNUstep/Applications
 
 OR
 
-/usr/local/GNUstep/Apps
+/usr/local/GNUstep/Applications
 
 OR
 
-~/GNUstep/Apps
+~/GNUstep/Applications
 
 
 

contrib/WindowMaker.spec.in

@@ -76,7 +76,7 @@ if [ -d $RPM_BUILD_ROOT ]; then rm -rf $RPM_BUILD_ROOT; fi
 %config /etc/X11/WindowMaker
 /usr/X11R6/bin/*
 /usr/X11R6/lib/lib*
-/usr/X11R6/lib/GNUstep/Apps/WPrefs.app
+/usr/X11R6/lib/GNUstep/Applications/WPrefs.app
 /usr/include/*
 /usr/share/WindowMaker
 /usr/share/locale/*/LC_MESSAGES/*