# HG changeset patch # User zas_ # Date 1208292921 0 # Node ID 612b39ee9a7e2c73fdb7e0147b2b6a9ae4284099 # Parent a264519f1c21e5d7adef255b589799790a5cced1 Rename l_conf to layout_order and make it more local. diff -r a264519f1c21 -r 612b39ee9a7e src/preferences.c --- a/src/preferences.c Tue Apr 15 20:46:14 2008 +0000 +++ b/src/preferences.c Tue Apr 15 20:55:21 2008 +0000 @@ -146,7 +146,6 @@ static void config_window_apply(void) { const gchar *buf; - gchar *l_conf; gint new_style; gint i; gint refresh = FALSE; @@ -290,26 +289,28 @@ ExifUIList[i].current = ExifUIList[i].temp; } - l_conf = layout_config_get(layout_widget, &new_style); + { + gchar *layout_order = layout_config_get(layout_widget, &new_style); if (new_style != options->layout.style || - (l_conf == NULL) != (options->layout.order == NULL) || + (layout_order == NULL) != (options->layout.order == NULL) || !options->layout.order || - strcmp(l_conf, options->layout.order) != 0) + strcmp(layout_order, 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.order = layout_order; + layout_order = NULL; /* g_free() later */ options->layout.style = new_style; layout_styles_update(); } - g_free(l_conf); + g_free(layout_order); + } image_options_sync();