Merge lp://qastaging/~macslow/notify-osd/gsettings-port into lp://qastaging/notify-osd/oneiric

Proposed by Mirco Müller
Status: Merged
Approved by: Mirco Müller
Approved revision: 443
Merged at revision: 442
Proposed branch: lp://qastaging/~macslow/notify-osd/gsettings-port
Merge into: lp://qastaging/notify-osd/oneiric
Diff against target: 570 lines (+73/-355)
4 files modified
configure.in (+1/-7)
src/Makefile.am (+0/-2)
src/defaults.c (+69/-343)
src/defaults.h (+3/-3)
To merge this branch: bzr merge lp://qastaging/~macslow/notify-osd/gsettings-port
Reviewer Review Type Date Requested Status
Gord Allott (community) Approve
Review via email: mp+67926@code.qastaging.launchpad.net

Description of the change

This is the GConf to GSettings port for NotifyOSD. It covers the pure API-change and also the schema migration. So there's no packaging magic needed to make this work.

Because with the introduction of GNOME 3 and moving away from GConf a lot of NotifyOSD's dynamic nature to adapt to settings-changes of the user had to be dropped, which on the plus-side allowed to get rid of some less-frequent executed code-paths.

NotifyOSD's keys in the GSettings-schema are monitored as is the system-wide key for the font. But the DPI key from GtkSettings can't be monitored.

To post a comment you must log in.
Revision history for this message
Mikkel Kamstrup Erlandsen (kamstrup) wrote :

I don't see any gconf stuff removed from any Makefile.am or
configure.ac - so I guess you still link in libgonf. Is that on
purpose?

443. By Mirco Müller

No need for any gconf in the autotools configure.in and src/Makefile.am since we live on GSettings now

Revision history for this message
Mirco Müller (macslow) wrote :

*cough* got rid of the now superfluous GConf-bits in configure.in and src/Makefile.am

Revision history for this message
Gord Allott (gordallott) wrote :

+1 looks good to me

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches