# HG changeset patch
# User nadvornik
# Date 1224319232 0
# Node ID 78007efd1140c397277715eadbdce5fb607b7863
# Parent  d0add22edb45b48759187f7b467705ed708a9e9c
reordered advanced exif columns

diff -r d0add22edb45 -r 78007efd1140 src/bar_exif.c
--- a/src/bar_exif.c	Sat Oct 18 08:31:25 2008 +0000
+++ b/src/bar_exif.c	Sat Oct 18 08:40:32 2008 +0000
@@ -250,7 +250,11 @@
 			g_free(text);
 
 			description = exif_get_tag_description_by_key(name);
-			if (!description) description = g_strdup(name);
+			if (!description || *description == '\0') 
+				{
+				g_free(description);
+				description = g_strdup(name);
+				}
 			buf = g_strconcat(description, ":", NULL);
 			g_free(description);
 			
@@ -306,7 +310,11 @@
 			g_free(text);
 			elements = g_strdup_printf("%d", exif_item_get_elements(item));
 			description = exif_item_get_description(item);
-			if (!description) description = g_strdup(tag_name);
+			if (!description || *description == '\0') 
+				{
+				g_free(description);
+				description = g_strdup(tag_name);
+				}
 
 			gtk_list_store_append(store, &iter);
 			gtk_list_store_set(store, &iter,
@@ -492,12 +500,12 @@
 
 	bar_exif_add_column_check(eb->listview, "", EXIF_ADVCOL_ENABLED);
 
-	bar_exif_add_column(eb->listview, _("Tag"), EXIF_ADVCOL_TAG, FALSE);
+	bar_exif_add_column(eb->listview, _("Description"), EXIF_ADVCOL_DESCRIPTION, FALSE);
+	bar_exif_add_column(eb->listview, _("Value"), EXIF_ADVCOL_VALUE, TRUE);
 	bar_exif_add_column(eb->listview, _("Name"), EXIF_ADVCOL_NAME, FALSE);
-	bar_exif_add_column(eb->listview, _("Value"), EXIF_ADVCOL_VALUE, TRUE);
+	bar_exif_add_column(eb->listview, _("Tag"), EXIF_ADVCOL_TAG, FALSE);
 	bar_exif_add_column(eb->listview, _("Format"), EXIF_ADVCOL_FORMAT, FALSE);
 	bar_exif_add_column(eb->listview, _("Elements"), EXIF_ADVCOL_ELEMENTS, FALSE);
-	bar_exif_add_column(eb->listview, _("Description"), EXIF_ADVCOL_DESCRIPTION, FALSE);
 
 	eb->advanced_scrolled = gtk_scrolled_window_new(NULL, NULL);
 	gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(eb->advanced_scrolled), GTK_SHADOW_IN);