Merge branch 'sunweaver-pr/libnx-x11-autoreconf' into 3.6.x

Attributes GH PR #498: https://github.com/ArcticaProject/nx-libs/pull/498

1 files changed, 0 insertions, 54 deletions

diff --git a/nx-X11/lib/X11/ScrResStr.c b/nx-X11/lib/X11/ScrResStr.c
deleted file mode 100644
index 1dd04a383..000000000
--- a/nx-X11/lib/X11/ScrResStr.c
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
-
-Copyright 1991, 1998  The Open Group
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-#include "Xlibint.h"
-#include <nx-X11/Xatom.h>
-
-char *XScreenResourceString(Screen *screen)
-{
-    Atom prop_name;
-    Atom actual_type;
-    int actual_format;
-    unsigned long nitems;
-    unsigned long leftover;
-    char *val = NULL;
-
-    prop_name = XInternAtom(screen->display, "SCREEN_RESOURCES", True);
-    if (prop_name &&
-	XGetWindowProperty(screen->display, screen->root, prop_name,
-			   0L, 100000000L, False,
-			   XA_STRING, &actual_type, &actual_format,
-			   &nitems, &leftover,
-			   (unsigned char **) &val) == Success) {
-	if ((actual_type == XA_STRING) && (actual_format == 8))
-	    return val;
-	Xfree(val);
-    }
-    return (char *)NULL;
-}