Attachment #253361 for bug #344335

View | Details | Raw Unified | Return to bug 344335
Collapse All | Expand All

Lines 1225-1230 desktop_init (AppearanceData *data, Link Here

(-)a/capplets/appearance/appearance-desktop.c (+1 lines)
1225	GtkCellRenderer *cr;	1225	GtkCellRenderer *cr;
1226	char *url;	1226	char *url;
1227		1227
		1228	data->wp_xml_list_loaded = FALSE;
1228	data->wp_update_gconf = TRUE;	1229	data->wp_update_gconf = TRUE;
1229		1230
1230	data->wp_uris = NULL;	1231	data->wp_uris = NULL;

Lines 41-46 typedef struct Link Here

(-)a/capplets/appearance/appearance.h (+1 lines)
41		41
42	/* desktop */	42	/* desktop */
43	GHashTable *wp_hash;	43	GHashTable *wp_hash;
		44	gboolean wp_xml_list_loaded;
44	gboolean wp_update_gconf;	45	gboolean wp_update_gconf;
45	GtkIconView *wp_view;	46	GtkIconView *wp_view;
46	GtkTreeModel *wp_model;	47	GtkTreeModel *wp_model;

Lines 378-383 void gnome_wp_xml_load_list (AppearanceD Link Here

(-)a/capplets/appearance/gnome-wp-xml.c (+7 lines)
378	gnome_wp_xml_load_from_dir (WALLPAPER_DATADIR, data);	378	gnome_wp_xml_load_from_dir (WALLPAPER_DATADIR, data);
379		379
380	gnome_wp_load_legacy (data);	380	gnome_wp_load_legacy (data);
		381
		382	data->wp_xml_list_loaded = TRUE;
381	}	383	}
382		384
383	static void gnome_wp_list_flatten (const gchar * key, GnomeWPItem * item,	385	static void gnome_wp_list_flatten (const gchar * key, GnomeWPItem * item,
Lines 394-399 void gnome_wp_xml_save_list (AppearanceD Link Here
394	GSList * list = NULL;	396	GSList * list = NULL;
395	gchar * wpfile;	397	gchar * wpfile;
396		398
		399	if (!data->wp_xml_list_loaded) {
		400	g_hash_table_destroy (data->wp_hash);
		401	return;
		402	}
		403
397	g_hash_table_foreach (data->wp_hash,	404	g_hash_table_foreach (data->wp_hash,
398	(GHFunc) gnome_wp_list_flatten, &list);	405	(GHFunc) gnome_wp_list_flatten, &list);
399	g_hash_table_destroy (data->wp_hash);	406	g_hash_table_destroy (data->wp_hash);

Return to bug 344335