Put gnome-settings-daemon after libbackgrounds
2001-12-20 Bradford Hovinen <hovinen@ximian.com> * Makefile.am (SUBDIRS): Put gnome-settings-daemon after libbackgrounds * background-properties-capplet.c: Update * capplets/background/Makefile.am: Update * background.desktop.in.in (Exec): Update * mouse.desktop.in.in (Exec): Update * capplets/keyboard/Makefile.am: Update * keyboard.desktop.in.in (Exec): Update * mouse.desktop.in.in (Exec): Update * gnome-settings-background.c: Update * applier.[ch]: Rename applier to bg_applier to avoid possible namespace collision
This commit is contained in:
parent
a2b2b7932a
commit
02397e55aa
16 changed files with 353 additions and 404 deletions
|
@ -36,20 +36,20 @@
|
|||
#include "preferences.h"
|
||||
#include "applier.h"
|
||||
|
||||
static Applier *applier;
|
||||
static BGApplier *bg_applier;
|
||||
static BGPreferences *prefs;
|
||||
|
||||
static void
|
||||
background_callback (GConfEntry *entry)
|
||||
{
|
||||
bg_preferences_merge_entry (prefs, entry);
|
||||
applier_apply_prefs (applier, prefs);
|
||||
bg_applier_apply_prefs (bg_applier, prefs);
|
||||
}
|
||||
|
||||
void
|
||||
gnome_settings_background_init (GConfEngine *engine)
|
||||
{
|
||||
applier = APPLIER (applier_new (APPLIER_ROOT));
|
||||
bg_applier = BG_APPLIER (bg_applier_new (BG_APPLIER_ROOT));
|
||||
|
||||
prefs = BG_PREFERENCES (bg_preferences_new ());
|
||||
bg_preferences_load (prefs);
|
||||
|
@ -60,5 +60,5 @@ gnome_settings_background_init (GConfEngine *engine)
|
|||
void
|
||||
gnome_settings_background_load (GConfEngine *engine)
|
||||
{
|
||||
applier_apply_prefs (applier, prefs);
|
||||
bg_applier_apply_prefs (bg_applier, prefs);
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue