Merge lp:~macslow/notify-osd/notify-osd.fix-827897 into lp:notify-osd/oneiric

Proposed by Mirco Müller on 2011-09-19
Status: Merged
Approved by: Mirco Müller on 2011-09-19
Approved revision: 443
Merged at revision: 443
Proposed branch: lp:~macslow/notify-osd/notify-osd.fix-827897
Merge into: lp:notify-osd/oneiric
Diff against target: 22 lines (+7/-0)
2 files modified
data/Makefile.am (+4/-0)
data/notify-osd.convert (+3/-0)
To merge this branch: bzr merge lp:~macslow/notify-osd/notify-osd.fix-827897
Reviewer Review Type Date Requested Status
Sebastien Bacher 2011-09-19 Approve on 2011-09-19
Review via email: mp+75991@code.launchpad.net

Description of the change

Added GConf->GSettings .convert file to fix LP: #827897

To post a comment you must log in.
Sebastien Bacher (seb128) wrote :

seems fine to me, thanks for working on it!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'data/Makefile.am'
2--- data/Makefile.am 2011-07-13 10:07:04 +0000
3+++ data/Makefile.am 2011-09-19 10:16:17 +0000
4@@ -10,6 +10,10 @@
5 EXTRA_DIST=org.freedesktop.Notifications.service.in \
6 com.canonical.NotifyOSD.gschema.xml
7
8+convertdir = $(datadir)/GConf/gsettings
9+convert_DATA = notify-osd.convert
10+EXTRA_DIST += $(convert_DATA)
11+
12 org.freedesktop.Notifications.service: org.freedesktop.Notifications.service.in
13 sed "s,@LIBEXECDIR@,$(libexecdir)," $< > $@
14
15
16=== added file 'data/notify-osd.convert'
17--- data/notify-osd.convert 1970-01-01 00:00:00 +0000
18+++ data/notify-osd.convert 2011-09-19 10:16:17 +0000
19@@ -0,0 +1,3 @@
20+[com.canonical.notify-osd]
21+multihead-mode = /apps/notify-osd/multihead_mode
22+gravity = /apps/notify-osd/gravity

Subscribers

People subscribed via source and target branches