changeset 324:6c2cf2f12b0d

Drop redundant code.
author zas_
date Sat, 12 Apr 2008 07:00:14 +0000
parents 4e721492341b
children a0fcd4934266
files src/bar_exif.c src/pan-view.c
diffstat 2 files changed, 3 insertions(+), 26 deletions(-) [+]
line wrap: on
line diff
--- a/src/bar_exif.c	Sat Apr 12 06:42:47 2008 +0000
+++ b/src/bar_exif.c	Sat Apr 12 07:00:14 2008 +0000
@@ -27,29 +27,6 @@
 
 #define BAR_EXIF_DATA_COLUMN_WIDTH 250
 
-static const gchar *bar_exif_key_list_real[] = {
-	"fCamera",
-	"fDateTime",
-	"fShutterSpeed",
-	"fAperture",
-	"Exif.Photo.ExposureProgram",
-	"fExposureBias",
-	"fISOSpeedRating",
-	"fFocalLength",
-	"fFocalLength35mmFilm",
-	"fSubjectDistance",
-	"Exif.Photo.MeteringMode",
-	"fFlash",
-	"Exif.Photo.LightSource",
-	"fResolution",
-	"Exif.Image.Orientation",
-	"Exif.Image.ImageDescription",
-	"Exif.Image.Copyright" 
-};
-
-const gchar **bar_exif_key_list = bar_exif_key_list_real;
-const gint bar_exif_key_count = (sizeof(bar_exif_key_list_real) / sizeof(gchar *));
-
 ExifUI ExifUIList[]={
 	{ 0, 0, EXIF_UI_ON,    "fCamera"},
 	{ 0, 0, EXIF_UI_ON,    "fDateTime"},
--- a/src/pan-view.c	Sat Apr 12 06:42:47 2008 +0000
+++ b/src/pan-view.c	Sat Apr 12 07:00:14 2008 +0000
@@ -1438,13 +1438,13 @@
 
 	pan_text_alignment_add(ta, NULL, NULL);
 
-	for (i = 0; i < bar_exif_key_count; i++)
+	for (i = 0; ExifUIList[i].key; i++)
 		{
 		gchar *label;
 		gchar *text;
 
-		label = g_strdup_printf("%s:", exif_get_description_by_key(bar_exif_key_list[i]));
-		text = exif_get_data_as_text(exif, bar_exif_key_list[i]);
+		label = g_strdup_printf("%s:", exif_get_description_by_key(ExifUIList[i].key));
+		text = exif_get_data_as_text(exif, ExifUIList[i].key);
 		text = bar_exif_validate_text(text);
 		pan_text_alignment_add(ta, label, text);
 		g_free(label);