X-Git-Url: http://geeqie.org/cgi-bin/gitweb.cgi?p=geeqie.git;a=blobdiff_plain;f=src%2Fmetadata.c;h=2e92c22f67af3e54eaf868d3f343dceab15f419c;hp=b91a4bb3600dbba55c4ea057d11b1caad5cb4fd4;hb=8de6122502695be2f4247e0d258e72f1b877cc6b;hpb=0d1b46f2476f33312d2e6a96de86ceb697e52050

diff --git a/src/metadata.c b/src/metadata.c
index b91a4bb3..2e92c22f 100644
--- a/src/metadata.c
+++ b/src/metadata.c
@@ -1592,70 +1592,70 @@ static GtkTreeIter keyword_tree_default_append(GtkTreeStore *keyword_tree, GtkTr
 
 void keyword_tree_new_default(void)
 {
-	GtkTreeIter i1, i2, i3;
+	GtkTreeIter i1, i2;
 
 	if (!keyword_tree) keyword_tree_new();
 
-	i1 = keyword_tree_default_append(keyword_tree, NULL, _("People"), TRUE); 
-		i2 = keyword_tree_default_append(keyword_tree, &i1, _("Family"), TRUE); 
-		i2 = keyword_tree_default_append(keyword_tree, &i1, _("Free time"), TRUE); 
-		i2 = keyword_tree_default_append(keyword_tree, &i1, _("Children"), TRUE); 
-		i2 = keyword_tree_default_append(keyword_tree, &i1, _("Sport"), TRUE); 
-		i2 = keyword_tree_default_append(keyword_tree, &i1, _("Culture"), TRUE); 
-			i3 = keyword_tree_default_append(keyword_tree, &i2, _("Festival"), TRUE); 
-	i1 = keyword_tree_default_append(keyword_tree, NULL, _("Nature"), TRUE); 
-		i2 = keyword_tree_default_append(keyword_tree, &i1, _("Animal"), TRUE); 
-			i3 = keyword_tree_default_append(keyword_tree, &i2, _("Bird"), TRUE); 
- 			i3 = keyword_tree_default_append(keyword_tree, &i2, _("Insect"), TRUE); 
- 			i3 = keyword_tree_default_append(keyword_tree, &i2, _("Pets"), TRUE); 
-			i3 = keyword_tree_default_append(keyword_tree, &i2, _("Wildlife"), TRUE); 
-			i3 = keyword_tree_default_append(keyword_tree, &i2, _("Zoo"), TRUE); 
-		i2 = keyword_tree_default_append(keyword_tree, &i1, _("Plant"), TRUE); 
-			i3 = keyword_tree_default_append(keyword_tree, &i2, _("Tree"), TRUE); 
-			i3 = keyword_tree_default_append(keyword_tree, &i2, _("Flower"), TRUE); 
-		i2 = keyword_tree_default_append(keyword_tree, &i1, _("Water"), TRUE); 
-			i3 = keyword_tree_default_append(keyword_tree, &i2, _("River"), TRUE); 
-			i3 = keyword_tree_default_append(keyword_tree, &i2, _("Lake"), TRUE); 
-			i3 = keyword_tree_default_append(keyword_tree, &i2, _("Sea"), TRUE); 
-		i2 = keyword_tree_default_append(keyword_tree, &i1, _("Landscape"), TRUE); 
-	i1 = keyword_tree_default_append(keyword_tree, NULL, _("Art"), TRUE); 
-		i2 = keyword_tree_default_append(keyword_tree, &i1, _("Statue"), TRUE); 
-		i2 = keyword_tree_default_append(keyword_tree, &i1, _("Painting"), TRUE); 
-		i2 = keyword_tree_default_append(keyword_tree, &i1, _("Historic"), TRUE); 
-		i2 = keyword_tree_default_append(keyword_tree, &i1, _("Modern"), TRUE); 
-	i1 = keyword_tree_default_append(keyword_tree, NULL, _("City"), TRUE); 
-		i2 = keyword_tree_default_append(keyword_tree, &i1, _("Park"), TRUE); 
-		i2 = keyword_tree_default_append(keyword_tree, &i1, _("Street"), TRUE); 
-		i2 = keyword_tree_default_append(keyword_tree, &i1, _("Square"), TRUE); 
-	i1 = keyword_tree_default_append(keyword_tree, NULL, _("Architecture"), TRUE); 
-		i2 = keyword_tree_default_append(keyword_tree, &i1, _("Buildings"), FALSE); 
-			i3 = keyword_tree_default_append(keyword_tree, &i2, _("House"), TRUE); 
-			i3 = keyword_tree_default_append(keyword_tree, &i2, _("Cathedral"), TRUE); 
-			i3 = keyword_tree_default_append(keyword_tree, &i2, _("Palace"), TRUE); 
-			i3 = keyword_tree_default_append(keyword_tree, &i2, _("Castle"), TRUE); 
-			i3 = keyword_tree_default_append(keyword_tree, &i2, _("Bridge"), TRUE); 
-		i2 = keyword_tree_default_append(keyword_tree, &i1, _("Interior"), TRUE); 
-		i2 = keyword_tree_default_append(keyword_tree, &i1, _("Historic"), TRUE); 
-		i2 = keyword_tree_default_append(keyword_tree, &i1, _("Modern"), TRUE); 
-	i1 = keyword_tree_default_append(keyword_tree, NULL, _("Places"), FALSE); 
-	i1 = keyword_tree_default_append(keyword_tree, NULL, _("Conditions"), FALSE); 
-		i2 = keyword_tree_default_append(keyword_tree, &i1, _("Night"), TRUE); 
-			i3 = keyword_tree_default_append(keyword_tree, &i2, _("Lights"), TRUE); 
-		i2 = keyword_tree_default_append(keyword_tree, &i1, _("Reflections"), TRUE); 
-		i2 = keyword_tree_default_append(keyword_tree, &i1, _("Sun"), TRUE); 
-		i2 = keyword_tree_default_append(keyword_tree, &i1, _("Weather"), FALSE); 
-			i3 = keyword_tree_default_append(keyword_tree, &i2, _("Fog"), TRUE); 
-			i3 = keyword_tree_default_append(keyword_tree, &i2, _("Rain"), TRUE); 
-			i3 = keyword_tree_default_append(keyword_tree, &i2, _("Clouds"), TRUE); 
-			i3 = keyword_tree_default_append(keyword_tree, &i2, _("Snow"), TRUE); 
-			i3 = keyword_tree_default_append(keyword_tree, &i2, _("Sunny weather"), TRUE); 
-	i1 = keyword_tree_default_append(keyword_tree, NULL, _("Photo"), FALSE); 
-		i2 = keyword_tree_default_append(keyword_tree, &i1, _("Edited"), TRUE); 
-		i2 = keyword_tree_default_append(keyword_tree, &i1, _("Detail"), TRUE); 
-		i2 = keyword_tree_default_append(keyword_tree, &i1, _("Macro"), TRUE); 
-		i2 = keyword_tree_default_append(keyword_tree, &i1, _("Portrait"), TRUE); 
-		i2 = keyword_tree_default_append(keyword_tree, &i1, _("Black and White"), TRUE); 
-		i2 = keyword_tree_default_append(keyword_tree, &i1, _("Perspective"), TRUE); 
+	i1 = keyword_tree_default_append(keyword_tree, NULL, _("People"), TRUE);
+		i2 = keyword_tree_default_append(keyword_tree, &i1, _("Family"), TRUE);
+		i2 = keyword_tree_default_append(keyword_tree, &i1, _("Free time"), TRUE);
+		i2 = keyword_tree_default_append(keyword_tree, &i1, _("Children"), TRUE);
+		i2 = keyword_tree_default_append(keyword_tree, &i1, _("Sport"), TRUE);
+		i2 = keyword_tree_default_append(keyword_tree, &i1, _("Culture"), TRUE);
+			keyword_tree_default_append(keyword_tree, &i2, _("Festival"), TRUE);
+	i1 = keyword_tree_default_append(keyword_tree, NULL, _("Nature"), TRUE);
+		i2 = keyword_tree_default_append(keyword_tree, &i1, _("Animal"), TRUE);
+			keyword_tree_default_append(keyword_tree, &i2, _("Bird"), TRUE);
+			keyword_tree_default_append(keyword_tree, &i2, _("Insect"), TRUE);
+			keyword_tree_default_append(keyword_tree, &i2, _("Pets"), TRUE);
+			keyword_tree_default_append(keyword_tree, &i2, _("Wildlife"), TRUE);
+			keyword_tree_default_append(keyword_tree, &i2, _("Zoo"), TRUE);
+		i2 = keyword_tree_default_append(keyword_tree, &i1, _("Plant"), TRUE);
+			keyword_tree_default_append(keyword_tree, &i2, _("Tree"), TRUE);
+			keyword_tree_default_append(keyword_tree, &i2, _("Flower"), TRUE);
+		i2 = keyword_tree_default_append(keyword_tree, &i1, _("Water"), TRUE);
+			keyword_tree_default_append(keyword_tree, &i2, _("River"), TRUE);
+			keyword_tree_default_append(keyword_tree, &i2, _("Lake"), TRUE);
+			keyword_tree_default_append(keyword_tree, &i2, _("Sea"), TRUE);
+		i2 = keyword_tree_default_append(keyword_tree, &i1, _("Landscape"), TRUE);
+	i1 = keyword_tree_default_append(keyword_tree, NULL, _("Art"), TRUE);
+		i2 = keyword_tree_default_append(keyword_tree, &i1, _("Statue"), TRUE);
+		i2 = keyword_tree_default_append(keyword_tree, &i1, _("Painting"), TRUE);
+		i2 = keyword_tree_default_append(keyword_tree, &i1, _("Historic"), TRUE);
+		i2 = keyword_tree_default_append(keyword_tree, &i1, _("Modern"), TRUE);
+	i1 = keyword_tree_default_append(keyword_tree, NULL, _("City"), TRUE);
+		i2 = keyword_tree_default_append(keyword_tree, &i1, _("Park"), TRUE);
+		i2 = keyword_tree_default_append(keyword_tree, &i1, _("Street"), TRUE);
+		i2 = keyword_tree_default_append(keyword_tree, &i1, _("Square"), TRUE);
+	i1 = keyword_tree_default_append(keyword_tree, NULL, _("Architecture"), TRUE);
+		i2 = keyword_tree_default_append(keyword_tree, &i1, _("Buildings"), FALSE);
+			keyword_tree_default_append(keyword_tree, &i2, _("House"), TRUE);
+			keyword_tree_default_append(keyword_tree, &i2, _("Cathedral"), TRUE);
+			keyword_tree_default_append(keyword_tree, &i2, _("Palace"), TRUE);
+			keyword_tree_default_append(keyword_tree, &i2, _("Castle"), TRUE);
+			keyword_tree_default_append(keyword_tree, &i2, _("Bridge"), TRUE);
+		i2 = keyword_tree_default_append(keyword_tree, &i1, _("Interior"), TRUE);
+		i2 = keyword_tree_default_append(keyword_tree, &i1, _("Historic"), TRUE);
+		i2 = keyword_tree_default_append(keyword_tree, &i1, _("Modern"), TRUE);
+	i1 = keyword_tree_default_append(keyword_tree, NULL, _("Places"), FALSE);
+	i1 = keyword_tree_default_append(keyword_tree, NULL, _("Conditions"), FALSE);
+		i2 = keyword_tree_default_append(keyword_tree, &i1, _("Night"), TRUE);
+			keyword_tree_default_append(keyword_tree, &i2, _("Lights"), TRUE);
+		i2 = keyword_tree_default_append(keyword_tree, &i1, _("Reflections"), TRUE);
+		i2 = keyword_tree_default_append(keyword_tree, &i1, _("Sun"), TRUE);
+		i2 = keyword_tree_default_append(keyword_tree, &i1, _("Weather"), FALSE);
+			keyword_tree_default_append(keyword_tree, &i2, _("Fog"), TRUE);
+			keyword_tree_default_append(keyword_tree, &i2, _("Rain"), TRUE);
+			keyword_tree_default_append(keyword_tree, &i2, _("Clouds"), TRUE);
+			keyword_tree_default_append(keyword_tree, &i2, _("Snow"), TRUE);
+			keyword_tree_default_append(keyword_tree, &i2, _("Sunny weather"), TRUE);
+	i1 = keyword_tree_default_append(keyword_tree, NULL, _("Photo"), FALSE);
+		i2 = keyword_tree_default_append(keyword_tree, &i1, _("Edited"), TRUE);
+		i2 = keyword_tree_default_append(keyword_tree, &i1, _("Detail"), TRUE);
+		i2 = keyword_tree_default_append(keyword_tree, &i1, _("Macro"), TRUE);
+		i2 = keyword_tree_default_append(keyword_tree, &i1, _("Portrait"), TRUE);
+		i2 = keyword_tree_default_append(keyword_tree, &i1, _("Black and White"), TRUE);
+		i2 = keyword_tree_default_append(keyword_tree, &i1, _("Perspective"), TRUE);
 }