From 2d8575288284b70ede4392e5c411aba57dce3cf5 Mon Sep 17 00:00:00 2001 From: Bradford Hovinen Date: Tue, 28 Aug 2001 13:45:20 +0000 Subject: [PATCH] Retrieve the correct value for wallpaper_types 2001-08-28 Bradford Hovinen * background-properties-capplet.c (get_legacy_settings): Retrieve the correct value for wallpaper_types --- capplets/background/ChangeLog | 3 +++ capplets/background/background-properties-capplet.c | 7 ++++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/capplets/background/ChangeLog b/capplets/background/ChangeLog index 0cd6b4bbb..56922f6ca 100644 --- a/capplets/background/ChangeLog +++ b/capplets/background/ChangeLog @@ -1,5 +1,8 @@ 2001-08-28 Bradford Hovinen + * background-properties-capplet.c (get_legacy_settings): Retrieve + the correct value for wallpaper_types + * applier.c (output_compat_prefs): Output the correct value for wallpaperAlign diff --git a/capplets/background/background-properties-capplet.c b/capplets/background/background-properties-capplet.c index b3af984f1..f7c8be697 100644 --- a/capplets/background/background-properties-capplet.c +++ b/capplets/background/background-properties-capplet.c @@ -149,9 +149,14 @@ get_legacy_settings (Bonobo_ConfigDatabase db) gchar *val_string, *val_filename; int val_ulong = -1, val_long = -1; + static const int wallpaper_types[] = { 0, 1, 3, 2 }; + COPY_FROM_LEGACY (boolean, "/main/enabled", bool, "/Background/Default/Enabled=true"); COPY_FROM_LEGACY (filename, "/main/wallpaper_filename", string, "/Background/Default/wallpaper=none"); - COPY_FROM_LEGACY (ulong, "/main/wallpaper_type", int, "/Background/Default/wallpaperAlign=0"); + + val_ulong = gnome_config_get_int ("/Background/Default/wallpaperAlign=0"); + bonobo_config_set_ulong (db, "/main/wallpaper_type", wallpaper_types[val_ulong], NULL); + copy_color_from_legacy (db, "/main/color1", "/Background/Default/color1"); copy_color_from_legacy (db, "/main/color2", "/Background/Default/color2");