isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-12-24 20:12:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move atomnames.h to x11/

Browse Source 
This should *not* be part of the public API.
This commit is contained in:
Jasper St. Pierre 2015-04-27 16:36:46 -07:00
parent 0f8e387dc0
commit ca6e799b97
5 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/Makefile.am
View File

@ -210,10 +210,9 @@ libmutter_la_SOURCES = \
meta/theme.h \ meta/theme.h \
ui/theme-private.h \ ui/theme-private.h \
ui/ui.c \ ui/ui.c \
x11/iconcache.c \
x11/iconcache.h \
x11/async-getprop.c \ x11/async-getprop.c \
x11/async-getprop.h \ x11/async-getprop.h \
x11/atomnames.h \
x11/events.c \ x11/events.c \
x11/events.h \ x11/events.h \
x11/group-private.h \ x11/group-private.h \
@ -221,6 +220,8 @@ libmutter_la_SOURCES = \
x11/group-props.h \ x11/group-props.h \
x11/group.c \ x11/group.c \
meta/group.h \ meta/group.h \
x11/iconcache.c \
x11/iconcache.h \
x11/session.c \ x11/session.c \
x11/session.h \ x11/session.h \
x11/window-props.c \ x11/window-props.c \
@ -338,16 +339,10 @@ libmutterinclude_base_headers = \
$(libmutterinclude_headers) \ $(libmutterinclude_headers) \
$(libmutterinclude_built_headers) $(libmutterinclude_built_headers)
# Excluded from scanning for introspection but installed
# atomnames.h: macros cause problems for scanning process
libmutterinclude_extra_headers = \
meta/atomnames.h
libmutterincludedir = $(includedir)/mutter/meta libmutterincludedir = $(includedir)/mutter/meta
libmutterinclude_HEADERS = \ libmutterinclude_HEADERS = \
$(libmutterinclude_headers) \ $(libmutterinclude_headers)
$(libmutterinclude_extra_headers)
nodist_libmutterinclude_HEADERS = \ nodist_libmutterinclude_HEADERS = \
$(libmutterinclude_built_headers) $(libmutterinclude_built_headers)

2
src/core/display-private.h
View File

@ -121,7 +121,7 @@ struct _MetaDisplay
* class is constructed. * class is constructed.
*/ */
#define item(x) Atom atom_##x; #define item(x) Atom atom_##x;
#include <meta/atomnames.h> #include <x11/atomnames.h>
#undef item #undef item
/* The window and serial of the most recent FocusIn event. */ /* The window and serial of the most recent FocusIn event. */

4
src/core/display.c
View File

@ -549,7 +549,7 @@ meta_display_open (void)
/* A list of all atom names, so that we can intern them in one go. */ /* A list of all atom names, so that we can intern them in one go. */
char *atom_names[] = { char *atom_names[] = {
#define item(x) #x, #define item(x) #x,
#include <meta/atomnames.h> #include <x11/atomnames.h>
#undef item #undef item
}; };
Atom atoms[G_N_ELEMENTS(atom_names)]; Atom atoms[G_N_ELEMENTS(atom_names)];
@ -610,7 +610,7 @@ meta_display_open (void)
{ {
int i = 0; int i = 0;
#define item(x) display->atom_##x = atoms[i++]; #define item(x) display->atom_##x = atoms[i++];
#include <meta/atomnames.h> #include <x11/atomnames.h>
#undef item #undef item
} }

2
src/core/screen.c
View File

@ -294,7 +294,7 @@ set_supported_hint (MetaScreen *screen)
Atom atoms[] = { Atom atoms[] = {
#define EWMH_ATOMS_ONLY #define EWMH_ATOMS_ONLY
#define item(x) screen->display->atom_##x, #define item(x) screen->display->atom_##x,
#include <meta/atomnames.h> #include <x11/atomnames.h>
#undef item #undef item
#undef EWMH_ATOMS_ONLY #undef EWMH_ATOMS_ONLY

0
src/meta/atomnames.h → src/x11/atomnames.h
View File