Unity Settings Daemon

Merge lp:~themuso/unity-settings-daemon/fix-gtk-modules-dir-location into lp:unity-settings-daemon

  1. fix-gtk-modules-dir-location
  2. Merge into trunk
Proposed by Luke Yelavich
Status: Merged
Approved by: Sebastien Bacher
Approved revision: 4022
Merged at revision: 4024
Proposed branch: lp:~themuso/unity-settings-daemon/fix-gtk-modules-dir-location
Merge into: lp:unity-settings-daemon
Diff against target: 21 lines (+2/-2)
1 file modified
plugins/xsettings/Makefile.am (+2/-2)
To merge this branch: bzr merge lp:~themuso/unity-settings-daemon/fix-gtk-modules-dir-location
Reviewer Review Type Date Requested Status
Sebastien Bacher Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+208041@code.launchpad.net

Commit message

Look for gtk-modules related files in the correct location.

Description of the change

Look for gtk-modules related files in the correct location.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:4022
http://jenkins.qa.ubuntu.com/job/unity-settings-daemon-ci/18/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-settings-daemon-trusty-amd64-ci/18
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-settings-daemon-trusty-armhf-ci/18
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-settings-daemon-trusty-i386-ci/18

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-settings-daemon-ci/18/rebuild

review: Approve (continuous-integration)
Revision history for this message
Sebastien Bacher (seb128) wrote :

thanks

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'plugins/xsettings/Makefile.am'
2--- plugins/xsettings/Makefile.am 2013-12-04 23:55:26 +0000
3+++ plugins/xsettings/Makefile.am 2014-02-24 23:31:17 +0000
4@@ -23,7 +23,7 @@
5 -I$(top_srcdir)/gnome-settings-daemon \
6 -I$(top_srcdir)/data/ \
7 -DGNOME_SETTINGS_LOCALEDIR=\""$(datadir)/locale"\" \
8- -DGTK_MODULES_DIRECTORY=\""$(libdir)/gnome-settings-daemon-@GSD_API_VERSION@/gtk-modules/"\" \
9+ -DGTK_MODULES_DIRECTORY=\""$(libdir)/unity-settings-daemon-@GSD_API_VERSION@/gtk-modules/"\" \
10 $(AM_CPPFLAGS)
11
12 libexec_PROGRAMS = usd-test-xsettings
13@@ -67,7 +67,7 @@
14 -I$(top_srcdir)/gnome-settings-daemon \
15 -I$(top_srcdir)/data/ \
16 -DGNOME_SETTINGS_LOCALEDIR=\""$(datadir)/locale"\" \
17- -DGTK_MODULES_DIRECTORY=\""$(libdir)/gnome-settings-daemon-@GSD_API_VERSION@/gtk-modules/"\" \
18+ -DGTK_MODULES_DIRECTORY=\""$(libdir)/unity-settings-daemon-@GSD_API_VERSION@/gtk-modules/"\" \
19 $(AM_CPPFLAGS)
20
21 libxsettings_la_CFLAGS = \

Subscribers

People subscribed via source and target branches