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

always apply the current GConf settings to the initially selected

Browse source 
2008-02-16  Jens Granseuer  <jensgr@gmx.net>

	* appearance-desktop.c: (wp_option_menu_set), (wp_load_stuffs):
	* gnome-wp-item.c: (gnome_wp_item_update), (gnome_wp_item_new):
	* gnome-wp-item.h: always apply the current GConf settings to the
	initially selected wallpaper so that we don't modify the settings if
	GConf state and the definition in backgrounds.xml are not identical
	(bug #516746)

	* gnome-wp-xml.c: (gnome_wp_xml_load_xml): get rid of redundant if

svn path=/trunk/; revision=8489
This commit is contained in:
Jens Granseuer 2008-02-16 00:03:24 +00:00 • committed by Jens Granseuer
parent b695ca96d1
commit 254b98c405
5 changed files with 84 additions and 80 deletions
Download patch file Download diff file Expand all files Collapse all files

4
capplets/appearance/gnome-wp-xml.c
View file

@ -227,13 +227,11 @@ static void gnome_wp_xml_load_xml (AppearanceData *data,
gnome_wp_item_update_description (wp);
g_hash_table_insert (data->wp_hash, wp->filename, wp);
gnome_wp_item_ensure_gnome_bg (wp);
} else {
gnome_wp_item_free (wp);
wp = NULL;
}
if (wp)
gnome_wp_item_ensure_gnome_bg (wp);
}
}
xmlFreeDoc (wplist);