overlay-scrollbar

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

  1. xsession
  2. Merge into trunk
Proposed by Ken VanDine
Status: Merged
Approved by: Andrea Cimitan
Approved revision: 350
Merged at revision: 349
Proposed branch: lp:~ken-vandine/overlay-scrollbar/xsession
Merge into: lp:overlay-scrollbar
Diff against target: 32 lines (+18/-0)
2 files modified
data/81overlay-scrollbar (+9/-0)
data/Makefile.am (+9/-0)
To merge this branch: bzr merge lp:~ken-vandine/overlay-scrollbar/xsession
Reviewer Review Type Date Requested Status
Andrea Cimitan Approve
Review via email: mp+106228@code.launchpad.net

Description of the change

Added Xsession.d file and distcheck fixes for gsettings schema

To post a comment you must log in.
Revision history for this message
Andrea Cimitan (cimi) wrote :

Thanks!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added file 'data/81overlay-scrollbar'
2--- data/81overlay-scrollbar 1970-01-01 00:00:00 +0000
3+++ data/81overlay-scrollbar 2012-05-17 17:43:17 +0000
4@@ -0,0 +1,9 @@
5+# This file is sourced by Xsession(5), not executed.
6+
7+if [ -z "$GTK_MODULES" ] ; then
8+ GTK_MODULES="overlay-scrollbar"
9+else
10+ GTK_MODULES="$GTK_MODULES:overlay-scrollbar"
11+fi
12+
13+export GTK_MODULES
14
15=== modified file 'data/Makefile.am'
16--- data/Makefile.am 2012-04-27 13:40:16 +0000
17+++ data/Makefile.am 2012-05-17 17:43:17 +0000
18@@ -1,5 +1,14 @@
19+EXTRA_DIST =
20 gsettings_ENUM_NAMESPACE = com.canonical.desktop.interface
21 gsettings_ENUM_FILES = $(top_srcdir)/os/os-scrollbar.h
22 gsettings_SCHEMAS = com.canonical.desktop.interface.gschema.xml
23
24 @GSETTINGS_RULES@
25+
26+EXTRA_DIST += $(gsettings_SCHEMAS)
27+
28+xsessiondir = $(sysconfdir)/X11/Xsession.d
29+
30+xsession_DATA = 81overlay-scrollbar
31+
32+EXTRA_DIST += $(xsession_DATA)

Subscribers

People subscribed via source and target branches