mirror of
https://github.com/gryf/wmaker.git
synced 2026-02-08 09:25:49 +01:00
- 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
This commit is contained in:
@@ -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/Apps/ApplicationName.app/ext
|
||||
* - GNUSTEP_LOCAL_ROOT/Apps/ApplicationName.app/ext
|
||||
* - /usr/local/GNUstep/Apps/ApplicationName.app/ext
|
||||
* - GNUSTEP_SYSTEM_ROOT/Apps/ApplicationName.app/ext
|
||||
* - /usr/GNUstep/Apps/ApplicationName.app/ext
|
||||
* - GNUSTEP_USER_ROOT/Applications/ApplicationName.app/ext
|
||||
* - ~/GNUstep/Applications/ApplicationName.app/ext
|
||||
* - GNUSTEP_LOCAL_ROOT/Applications/ApplicationName.app/ext
|
||||
* - /usr/local/GNUstep/Applications/ApplicationName.app/ext
|
||||
* - GNUSTEP_SYSTEM_ROOT/Applications/ApplicationName.app/ext
|
||||
* - /usr/GNUstep/Applications/ApplicationName.app/ext
|
||||
*/
|
||||
|
||||
if (WMApplication.resourcePath) {
|
||||
|
||||
@@ -257,13 +257,11 @@ setMiniwindow(WMWindow *win, RImage *image)
|
||||
CARD32 *data;
|
||||
int x, y;
|
||||
int o;
|
||||
|
||||
|
||||
if (!image)
|
||||
return;
|
||||
|
||||
data= malloc((image->width * image->height + 2) * sizeof(CARD32));
|
||||
if (!data)
|
||||
return;
|
||||
|
||||
data = wmalloc((image->width * image->height + 2) * sizeof(CARD32));
|
||||
|
||||
o= 0;
|
||||
data[o++] = image->width;
|
||||
@@ -283,13 +281,12 @@ setMiniwindow(WMWindow *win, RImage *image)
|
||||
}
|
||||
}
|
||||
|
||||
XChangeProperty(scr->display, win->view->window,
|
||||
scr->netwmIcon, XA_CARDINAL, 32,
|
||||
PropModeReplace,
|
||||
(unsigned char *)data,
|
||||
(image->width * image->height + 2) * sizeof(CARD32));
|
||||
|
||||
free(data);
|
||||
XChangeProperty(scr->display, win->view->window, scr->netwmIcon,
|
||||
XA_CARDINAL, 32, PropModeReplace,
|
||||
(unsigned char *)data,
|
||||
(image->width * image->height + 2));
|
||||
|
||||
wfree(data);
|
||||
}
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user