diff options
| author | Egbert Eich <eich@freedesktop.org> | 2004-04-15 10:13:24 +0000 |
|---|---|---|
| committer | Egbert Eich <eich@freedesktop.org> | 2004-04-15 10:13:24 +0000 |
| commit | 08f8e56701977d8d3c5a67b22047019633ba6375 (patch) | |
| tree | c18cbf09d48aaafcf00c3c86bc95148bd40d56e9 /src/xlibi18n/utf8WMProps.c | |
| parent | 90b6f32bbe219045cebe7927b55261d63583fa06 (diff) | |
Merged changes from RELEASE-1 branchXORG-CURRENT-CLOSED
Diffstat (limited to 'src/xlibi18n/utf8WMProps.c')
| -rw-r--r-- | src/xlibi18n/utf8WMProps.c | 24 |
1 files changed, 3 insertions, 21 deletions
diff --git a/src/xlibi18n/utf8WMProps.c b/src/xlibi18n/utf8WMProps.c index 811dc74..084e3d3 100644 --- a/src/xlibi18n/utf8WMProps.c +++ b/src/xlibi18n/utf8WMProps.c @@ -56,7 +56,7 @@ from The Open Group. #include <X11/Xlocale.h> void -XFree86utf8SetWMProperties ( +Xutf8SetWMProperties ( Display *dpy, Window w, _Xconst char *windowName, @@ -72,11 +72,11 @@ XFree86utf8SetWMProperties ( XTextProperty *iprop = NULL; if (windowName && - XFree86utf8TextListToTextProperty(dpy, (char**)&windowName, 1, + Xutf8TextListToTextProperty(dpy, (char**)&windowName, 1, XStdICCTextStyle, &wname) >= Success) wprop = &wname; if (iconName && - XFree86utf8TextListToTextProperty(dpy, (char**)&iconName, 1, + Xutf8TextListToTextProperty(dpy, (char**)&iconName, 1, XStdICCTextStyle, &iname) >= Success) iprop = &iname; XSetWMProperties(dpy, w, wprop, iprop, argv, argc, @@ -88,21 +88,3 @@ XFree86utf8SetWMProperties ( /* Note: The WM_LOCALE_NAME property is set by XSetWMProperties. */ } -#ifndef NOXFREE86COMPAT -#undef Xutf8SetWMProperties -void -Xutf8SetWMProperties ( - Display *dpy, - Window w, - _Xconst char *windowName, - _Xconst char *iconName, - char **argv, - int argc, - XSizeHints *sizeHints, - XWMHints *wmHints, - XClassHint *classHints) -{ - XFree86utf8SetWMProperties (dpy, w, windowName, iconName, argv, argc, - sizeHints, wmHints, classHints); -} -#endif |