applications/gnome-control-center
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use correct keys

Browse source 
2001-12-17  Bradford Hovinen  <hovinen@ximian.com>

	* preferences.c (preferences_merge_entry): Use correct keys
This commit is contained in:
Bradford Hovinen 2001-12-17 18:23:47 +00:00 • committed by Bradford Hovinen (Gdict maintainer)
parent ac131fc554
commit 3504b0d5ab
2 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
libbackground/ChangeLog
View file

@ -1,5 +1,9 @@
2001-12-17 Bradford Hovinen <hovinen@ximian.com> 2001-12-17 Bradford Hovinen <hovinen@ximian.com>
* preferences.c (preferences_merge_entry): Eliminate name; use
entry->key on the warning
(preferences_merge_entry): Use correct keys
* applier.c (applier_get_preview_widget): Make sure the pixmap is * applier.c (applier_get_preview_widget): Make sure the pixmap is
masked correctly masked correctly
(applier_apply_prefs): s/gtk_object_destroy/g_object_unref/ (applier_apply_prefs): s/gtk_object_destroy/g_object_unref/

10
libbackground/preferences.c
View file

@ -199,7 +199,6 @@ void
preferences_merge_entry (Preferences *prefs, preferences_merge_entry (Preferences *prefs,
const GConfEntry *entry) const GConfEntry *entry)
{ {
const gchar *name;
const GConfValue *value = gconf_entry_get_value (entry); const GConfValue *value = gconf_entry_get_value (entry);
g_return_if_fail (prefs != NULL); g_return_if_fail (prefs != NULL);
@ -208,7 +207,7 @@ preferences_merge_entry (Preferences *prefs,
if (!strcmp (entry->key, "/background-properties/wallpaper_type")) { if (!strcmp (entry->key, "/background-properties/wallpaper_type")) {
prefs->wallpaper_type = gconf_value_get_int (value); prefs->wallpaper_type = gconf_value_get_int (value);
} }
else if (!strcmp (entry->key, "/background-properties/wallpaper_filename")) { else if (!strcmp (entry->key, "/background-properties/wallpaper-filename")) {
prefs->wallpaper_filename = g_strdup (gconf_value_get_string (value)); prefs->wallpaper_filename = g_strdup (gconf_value_get_string (value));
if (prefs->wallpaper_filename != NULL && if (prefs->wallpaper_filename != NULL &&
@ -238,10 +237,13 @@ preferences_merge_entry (Preferences *prefs,
else else
prefs->gradient_enabled = TRUE; prefs->gradient_enabled = TRUE;
} }
else if (!strcmp (entry->key, "/background-properties/wallpaper_enabled")) { else if (!strcmp (entry->key, "/background-properties/wallpaper-enabled")) {
prefs->wallpaper_enabled = gconf_value_get_bool (value); prefs->wallpaper_enabled = gconf_value_get_bool (value);
}
else if (!strcmp (entry->key, "/background-properties/wallpaper-type")) {
prefs->wallpaper_type = gconf_value_get_int (value);
} else { } else {
g_warning ("%s: Unknown property: %s", __FUNCTION__, name); g_warning ("%s: Unknown property: %s", __FUNCTION__, entry->key);
} }
} }