isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-09-19 22:15:54 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix distcheck

Browse Source 
Missing translation files, missing dists and some -Werrors.
This commit is contained in:
Giovanni Campagna 2013-09-03 16:55:26 +02:00
parent a26ded47d9
commit b53bf0e8c2
5 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
po/POTFILES.in
View File

@ -21,9 +21,9 @@ src/core/util.c
src/core/window.c src/core/window.c
src/core/window-props.c src/core/window-props.c
src/core/xprops.c src/core/xprops.c
src/mutter.desktop.in src/mutter-wayland.desktop.in
src/mutter-wm.desktop.in
src/org.gnome.mutter.gschema.xml.in src/org.gnome.mutter.gschema.xml.in
src/org.gnome.mutter.wayland.gschema.xml.in
src/ui/frames.c src/ui/frames.c
src/ui/menu.c src/ui/menu.c
src/ui/metaaccellabel.c src/ui/metaaccellabel.c

5
src/Makefile.am
View File

@ -336,6 +336,7 @@ CLEANFILES = \
mutter-wayland.desktop \ mutter-wayland.desktop \
mutter-wm.desktop \ mutter-wm.desktop \
org.gnome.mutter.gschema.xml \ org.gnome.mutter.gschema.xml \
org.gnome.mutter.wayland.gschema.xml \
$(xml_DATA) \ $(xml_DATA) \
$(mutter_built_sources) \ $(mutter_built_sources) \
$(typelib_DATA) \ $(typelib_DATA) \
@ -352,10 +353,12 @@ EXTRA_DIST=$(desktopfiles_files) \
$(wmproperties_in_files) \ $(wmproperties_in_files) \
$(xml_in_files) \ $(xml_in_files) \
org.gnome.mutter.gschema.xml.in \ org.gnome.mutter.gschema.xml.in \
org.gnome.mutter.wayland.gschema.xml.in \
mutter-schemas.convert \ mutter-schemas.convert \
libmutter-wayland.pc.in \ libmutter-wayland.pc.in \
mutter-enum-types.h.in \ mutter-enum-types.h.in \
mutter-enum-types.c.in mutter-enum-types.c.in \
xrandr.xml idle-monitor.xml
BUILT_SOURCES = $(mutter_built_sources) BUILT_SOURCES = $(mutter_built_sources)
MUTTER_STAMP_FILES = stamp-mutter-enum-types.h MUTTER_STAMP_FILES = stamp-mutter-enum-types.h

2
src/compositor/compositor.c
View File

@ -694,7 +694,7 @@ meta_compositor_manage_screen (MetaCompositor *compositor,
MetaCompScreen *info; MetaCompScreen *info;
MetaDisplay *display = meta_screen_get_display (screen); MetaDisplay *display = meta_screen_get_display (screen);
Display *xdisplay = meta_display_get_xdisplay (display); Display *xdisplay = meta_display_get_xdisplay (display);
Window xwin; Window xwin = None;
gint width, height; gint width, height;
MetaWaylandCompositor *wayland_compositor; MetaWaylandCompositor *wayland_compositor;

10
src/compositor/meta-window-actor.c
View File

@ -451,12 +451,7 @@ meta_window_actor_dispose (GObject *object)
info = meta_screen_get_compositor_data (screen); info = meta_screen_get_compositor_data (screen);
if (!meta_is_wayland_compositor ()) if (!meta_is_wayland_compositor ())
{ meta_window_actor_detach_x11_pixmap (self);
display = meta_screen_get_display (screen);
xdisplay = meta_display_get_xdisplay (display);
meta_window_actor_detach_x11_pixmap (self);
}
if (priv->send_frame_messages_timer != 0) if (priv->send_frame_messages_timer != 0)
{ {
@ -477,6 +472,9 @@ meta_window_actor_dispose (GObject *object)
if (!meta_is_wayland_compositor () && priv->damage != None) if (!meta_is_wayland_compositor () && priv->damage != None)
{ {
display = meta_screen_get_display (screen);
xdisplay = meta_display_get_xdisplay (display);
meta_error_trap_push (display); meta_error_trap_push (display);
XDamageDestroy (xdisplay, priv->damage); XDamageDestroy (xdisplay, priv->damage);
meta_error_trap_pop (display); meta_error_trap_pop (display);

1
src/core/stack-tracker.c
View File

@ -1051,7 +1051,6 @@ stack_tracker_event_received (MetaStackTracker *tracker,
tracker->xserver_serial = op->any.serial; tracker->xserver_serial = op->any.serial;
#warning "TODO: remove unused tracker->xserver_stack"
/* XXX: With the design we have ended up with it looks like we've /* XXX: With the design we have ended up with it looks like we've
* ended up making it unnecessary to maintain tracker->xserver_stack * ended up making it unnecessary to maintain tracker->xserver_stack
* since we only need an xserver_stack during the * since we only need an xserver_stack during the