Merge lp:~ken-vandine/overlay-scrollbar/xsession into lp:overlay-scrollbar

[Ken VanDine]

Added Xsession.d file and distcheck fixes for gsettings schema

[Andrea Cimitan (cimi)]

Thanks!

review: Approve

=== added file 'data/81overlay-scrollbar'
--- data/81overlay-scrollbar	1970-01-01 00:00:00 +0000
+++ data/81overlay-scrollbar	2012-05-17 17:43:17 +0000
@@ -0,0 +1,9 @@
+# This file is sourced by Xsession(5), not executed.
+
+if [ -z "$GTK_MODULES" ] ; then
+	GTK_MODULES="overlay-scrollbar"
+else
+	GTK_MODULES="$GTK_MODULES:overlay-scrollbar"
+fi
+
+export GTK_MODULES
 
=== modified file 'data/Makefile.am'
--- data/Makefile.am	2012-04-27 13:40:16 +0000
+++ data/Makefile.am	2012-05-17 17:43:17 +0000
@@ -1,5 +1,14 @@
+EXTRA_DIST = 
 gsettings_ENUM_NAMESPACE = com.canonical.desktop.interface
 gsettings_ENUM_FILES = $(top_srcdir)/os/os-scrollbar.h
 gsettings_SCHEMAS = com.canonical.desktop.interface.gschema.xml
 
 @GSETTINGS_RULES@
+
+EXTRA_DIST += $(gsettings_SCHEMAS)
+
+xsessiondir = $(sysconfdir)/X11/Xsession.d
+
+xsession_DATA = 81overlay-scrollbar
+
+EXTRA_DIST += $(xsession_DATA)