Merge branch 'master' into gtk3

diff --combined libchimara/Makefile.am
index ef18a90a12d74e051ba8bf7aef22696698600257,96d861d7e6ad7909527dba071c3fe32519d64f98..81c5bc7aec27e371752f666a958b12e63cb0c43e
--- 1/libchimara/Makefile.am
--- 2/libchimara/Makefile.am
+++ b/libchimara/Makefile.am
@@@ -42,7 -42,7 +42,7 @@@ libchimara_la_SOURCES = 
        style.c style.h \
        timer.c timer.h \
        window.c window.h
- libchimara_la_CPPFLAGS = \
+ libchimara_la_CPPFLAGS = $(AM_CPPFLAGS) \
        -DG_LOG_DOMAIN=\"Chimara\" \
        -DLOCALEDIR=\""$(datadir)/locale"\" \
        -DPLUGINDIR=\""$(pluginpath)"\" \
@@@ -84,7 -84,7 +84,7 @@@ introspection_sources = 
        chimara-if.c chimara-if.h
  
  Chimara-1.0.gir: libchimara.la
 -Chimara_1_0_gir_INCLUDES = GObject-2.0 GLib-2.0 Gtk-2.0
 +Chimara_1_0_gir_INCLUDES = GObject-2.0 GLib-2.0 Gtk-3.0
  Chimara_1_0_gir_CFLAGS = @CHIMARA_CFLAGS@ -I$(top_srcdir)
  Chimara_1_0_gir_LIBS = libchimara.la
  Chimara_1_0_gir_FILES = $(introspection_sources)
@@@ -110,7 -110,7 +110,7 @@@ dist_vapi_DATA = chimara.vap
  
  if BUILDING_VAPI
  chimara.vapi: $(INTROSPECTION_GIRS)
 -      $(AM_V_GEN)$(VAPIGEN) --library=chimara --pkg gtk+-2.0 Chimara-1.0.gir && \
 +      $(AM_V_GEN)$(VAPIGEN) --library=chimara --pkg gtk+-3.0 Chimara-1.0.gir && \
        touch $@
  endif