diff options
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | plugins/common/msd-osd-window.c | 2 | ||||
| -rw-r--r-- | plugins/keyboard/msd-keyboard-manager.c | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac index b2e9fe7..f43fa2a 100644 --- a/configure.ac +++ b/configure.ac @@ -48,7 +48,7 @@ AS_AC_EXPAND(LIBEXECDIR, "$libexecdir") MSD_INTLTOOL_PLUGIN_RULE='%.mate-settings-plugin: %.mate-settings-plugin.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' AC_SUBST([MSD_INTLTOOL_PLUGIN_RULE]) - dnl Unconditionally use this dir to avoid a circular dep with matecc +dnl Unconditionally use this dir to avoid a circular dep with matecc MATE_KEYBINDINGS_KEYSDIR="${datadir}/mate-control-center/keybindings" AC_SUBST(MATE_KEYBINDINGS_KEYSDIR) diff --git a/plugins/common/msd-osd-window.c b/plugins/common/msd-osd-window.c index 5564532..0ed2bf4 100644 --- a/plugins/common/msd-osd-window.c +++ b/plugins/common/msd-osd-window.c @@ -339,7 +339,7 @@ expose_when_composited (GtkWidget *widget, GdkEventExpose *event) cairo_paint_with_alpha (context, window->priv->fade_out_alpha); #endif - done: +done: if (surface != NULL) { cairo_surface_destroy (surface); } diff --git a/plugins/keyboard/msd-keyboard-manager.c b/plugins/keyboard/msd-keyboard-manager.c index ba941b9..3eef1b2 100644 --- a/plugins/keyboard/msd-keyboard-manager.c +++ b/plugins/keyboard/msd-keyboard-manager.c @@ -38,12 +38,12 @@ #include <gtk/gtk.h> #ifdef HAVE_X11_EXTENSIONS_XF86MISC_H - #include <X11/extensions/xf86misc.h> +#include <X11/extensions/xf86misc.h> #endif #ifdef HAVE_X11_EXTENSIONS_XKB_H - #include <X11/XKBlib.h> - #include <X11/keysym.h> +#include <X11/XKBlib.h> +#include <X11/keysym.h> #endif #include "mate-settings-profile.h" |