comparison src/preferences.c @ 375:612b39ee9a7e

Rename l_conf to layout_order and make it more local.

374:a264519f1c21

 */ 

static void config_window_apply(void)
{
	const gchar *buf;
	gchar *l_conf;
	gint new_style;
	gint i;
	gint refresh = FALSE;

	for(i = 0; i < GQ_EDITOR_SLOTS; i++)

	for (i=0; ExifUIList[i].key; i++)
		{
		ExifUIList[i].current = ExifUIList[i].temp;
		}

	l_conf = layout_config_get(layout_widget, &new_style);

	if (new_style != options->layout.style ||
	    (l_conf == NULL) != (options->layout.order == NULL) ||
	    !options->layout.order ||
	    strcmp(l_conf, options->layout.order) != 0)
		{
		if (refresh) filter_rebuild();
		refresh = FALSE;

		g_free(options->layout.order);
		options->layout.order = l_conf;
		l_conf = NULL;

		options->layout.style = new_style;

		layout_styles_update();
		}

	g_free(l_conf);

	image_options_sync();

	if (refresh)
		{

375:612b39ee9a7e

 */ 

static void config_window_apply(void)
{
	const gchar *buf;
	gint new_style;
	gint i;
	gint refresh = FALSE;

	for(i = 0; i < GQ_EDITOR_SLOTS; i++)

	for (i=0; ExifUIList[i].key; i++)
		{
		ExifUIList[i].current = ExifUIList[i].temp;
		}

	{
	gchar *layout_order = layout_config_get(layout_widget, &new_style);

	if (new_style != options->layout.style ||
	    (layout_order == NULL) != (options->layout.order == NULL) ||
	    !options->layout.order ||
	    strcmp(layout_order, options->layout.order) != 0)
		{
		if (refresh) filter_rebuild();
		refresh = FALSE;

		g_free(options->layout.order);
		options->layout.order = layout_order;
		layout_order = NULL; /* g_free() later */

		options->layout.style = new_style;

		layout_styles_update();
		}

	g_free(layout_order);
	}

	image_options_sync();

	if (refresh)
		{