Mercurial > geeqie.yaz

changeset 375:612b39ee9a7e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Rename l_conf to layout_order and make it more local.
author zas_
date Tue, 15 Apr 2008 20:55:21 +0000
parents a264519f1c21
children 9c89fc358c16
files src/preferences.c
diffstat 1 files changed, 8 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- 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();