Synchronize xcursor.c
This commit is contained in:
parent
1330abc93d
commit
b4e271c664
1 changed files with 3 additions and 8 deletions
11
3rdparty/xcursor.c
vendored
11
3rdparty/xcursor.c
vendored
|
@ -24,10 +24,10 @@
|
|||
*/
|
||||
|
||||
#include "xcursor.h"
|
||||
#include <dirent.h>
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include <dirent.h>
|
||||
|
||||
/*
|
||||
* From libXcursor/include/X11/extensions/Xcursor.h
|
||||
|
@ -617,7 +617,7 @@ XcursorFileLoadImages (FILE *file, int size)
|
|||
#endif
|
||||
|
||||
#ifndef XCURSORPATH
|
||||
#define XCURSORPATH "~/.local/share/icons:~/.icons:/usr/share/icons:/usr/share/pixmaps:"ICONDIR
|
||||
#define XCURSORPATH "~/.icons:/usr/share/icons:/usr/share/pixmaps:~/.cursors:/usr/share/cursors/xorg-x11:"ICONDIR
|
||||
#endif
|
||||
|
||||
static const char *
|
||||
|
@ -838,12 +838,7 @@ XcursorScanTheme (const char *theme, const char *name)
|
|||
* Recurse to scan inherited themes
|
||||
*/
|
||||
for (i = inherits; i && f == NULL; i = _XcursorNextPath (i))
|
||||
{
|
||||
if (strcmp(i, theme) != 0)
|
||||
f = XcursorScanTheme (i, name);
|
||||
else
|
||||
printf("Not calling XcursorScanTheme because of circular dependency: %s. %s", i, name);
|
||||
}
|
||||
f = XcursorScanTheme (i, name);
|
||||
if (inherits != NULL)
|
||||
free (inherits);
|
||||
return f;
|
||||
|
|
Loading…
Reference in a new issue