diff options
| author | Ulrich Sibiller <uli42@gmx.de> | 2020-01-03 14:36:23 +0100 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2020-01-05 21:37:40 +0100 |
| commit | 3cd622cf4085e8c4257ff17c2481d92d3bc443f9 (patch) | |
| tree | 612691d310a69cf67e873e02e77a35f9699aee1b /nx-X11/programs/Xserver/hw/nxagent/X11/include | |
| parent | 475961e651e69b92a25709d99c6c9743a23acd55 (diff) | |
| download | nx-libs-3cd622cf4085e8c4257ff17c2481d92d3bc443f9.tar.gz nx-libs-3cd622cf4085e8c4257ff17c2481d92d3bc443f9.tar.bz2 nx-libs-3cd622cf4085e8c4257ff17c2481d92d3bc443f9.zip | |
Display.c: drop icon file support
The normal case was to use the builtin icons. There were two cases
where the icon file was read from disk:
1) /usr/NX/share/images/nxagent.xpm was existing which normally is not
there
2) case 2 was not true and nxagent.xpm was existing somewhere in the
PATH (!)
(replace nxagent.xpm by x2goagent.xpm if in x2gp mode)
Scanning the path from the PATH variable for xpm files is kind of
unexpected and dangerous, too (think of automounter triggers or
invalid xpm files).
Also remove the xpm files from the distribution.
Diffstat (limited to 'nx-X11/programs/Xserver/hw/nxagent/X11/include')
| -rw-r--r-- | nx-X11/programs/Xserver/hw/nxagent/X11/include/xpm_nxagent.h | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/X11/include/xpm_nxagent.h b/nx-X11/programs/Xserver/hw/nxagent/X11/include/xpm_nxagent.h index b02e5a913..ec72da07e 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/X11/include/xpm_nxagent.h +++ b/nx-X11/programs/Xserver/hw/nxagent/X11/include/xpm_nxagent.h @@ -238,21 +238,13 @@ typedef struct { _XFUNCPROTOBEGIN -/* Keep for hw/nxagent/Holder.c */ +/* Keep for hw/nxagent/Display.c */ FUNC(XpmCreatePixmapFromData, int, (Display *display, Drawable d, char **data, Pixmap *pixmap_return, Pixmap *shapemask_return, XpmAttributes *attributes)); -/* Keep for hw/nxagent/Display.c */ -FUNC(XpmReadFileToPixmap, int, (Display *display, - Drawable d, - const char *filename, - Pixmap *pixmap_return, - Pixmap *shapemask_return, - XpmAttributes *attributes)); - _XFUNCPROTOEND #endif /* XPM_NUMBERS */ |