Index: src/gth-exif-data-viewer.c
===================================================================
RCS file: /cvs/gnome/gthumb/src/gth-exif-data-viewer.c,v
retrieving revision 1.39
diff -u -r1.39 gth-exif-data-viewer.c
--- src/gth-exif-data-viewer.c	8 Dec 2006 16:47:09 -0000	1.39
+++ src/gth-exif-data-viewer.c	11 Dec 2006 11:00:56 -0000
@@ -111,81 +111,95 @@
 	   that exists in the IFD0 or EXIF blocks. */
 	{ EXIF_TAG_MAKE,
 	  EXIF_TAG_MODEL,
+	  EXIF_TAG_SOFTWARE,
 
-  	  EXIF_TAG_DATE_TIME_ORIGINAL,
+	  EXIF_TAG_DATE_TIME,
+	  EXIF_TAG_SUB_SEC_TIME,
+	  EXIF_TAG_DATE_TIME_ORIGINAL,
 	  EXIF_TAG_SUB_SEC_TIME_ORIGINAL,
 	  EXIF_TAG_DATE_TIME_DIGITIZED,
 	  EXIF_TAG_SUB_SEC_TIME_DIGITIZED,
-	  EXIF_TAG_DATE_TIME,
-	  EXIF_TAG_SUB_SEC_TIME,
 
 	  EXIF_TAG_USER_COMMENT,
-
+	  EXIF_TAG_IMAGE_DESCRIPTION,
 	  EXIF_TAG_ARTIST,
 	  EXIF_TAG_COPYRIGHT,
 
-	  EXIF_TAG_DOCUMENT_NAME,
-	  EXIF_TAG_IMAGE_DESCRIPTION,
 	  EXIF_TAG_IMAGE_UNIQUE_ID,
 
-	  EXIF_TAG_SOFTWARE,
-
 	  EXIF_TAG_RELATED_SOUND_FILE,
 	  -1 },
 
  	/* GTH_METADATA_CATEGORY_EXIF_IMAGE */
 	/* These tags describe the main image data structures, and
 	   come from the IFD0 and EXIF blocks. */
-	{ EXIF_TAG_PIXEL_X_DIMENSION,
-	  EXIF_TAG_PIXEL_Y_DIMENSION,
-	  EXIF_TAG_ORIENTATION,
+	{ 
 
-	  EXIF_TAG_COLOR_SPACE,
-	  EXIF_TAG_TRANSFER_FUNCTION,
-	  EXIF_TAG_PRIMARY_CHROMATICITIES,
-	  EXIF_TAG_PHOTOMETRIC_INTERPRETATION,
-	  EXIF_TAG_PLANAR_CONFIGURATION,
-	  EXIF_TAG_COMPRESSION,
+	  // Image data structure
 
 	  EXIF_TAG_IMAGE_WIDTH,
 	  EXIF_TAG_IMAGE_LENGTH,
+	  EXIF_TAG_PIXEL_X_DIMENSION,
+	  EXIF_TAG_PIXEL_Y_DIMENSION,
+
+	  EXIF_TAG_ORIENTATION,
 
 	  EXIF_TAG_X_RESOLUTION,
 	  EXIF_TAG_Y_RESOLUTION,
 	  EXIF_TAG_RESOLUTION_UNIT,
 
+	  EXIF_TAG_COMPRESSION,
+
+	  EXIF_TAG_SAMPLES_PER_PIXEL,
+	  EXIF_TAG_BITS_PER_SAMPLE,
+
+	  EXIF_TAG_PLANAR_CONFIGURATION,
+	  EXIF_TAG_YCBCR_SUB_SAMPLING,
+	  EXIF_TAG_YCBCR_POSITIONING,
+	  EXIF_TAG_PHOTOMETRIC_INTERPRETATION,
 	  EXIF_TAG_COMPONENTS_CONFIGURATION,
 	  EXIF_TAG_COMPRESSED_BITS_PER_PIXEL,
 
-	  EXIF_TAG_BITS_PER_SAMPLE,
-	  EXIF_TAG_SAMPLES_PER_PIXEL,
+	  // Offsets
 
 	  EXIF_TAG_STRIP_OFFSETS,
 	  EXIF_TAG_ROWS_PER_STRIP,
 	  EXIF_TAG_STRIP_BYTE_COUNTS,
-
+	  EXIF_TAG_JPEG_INTERCHANGE_FORMAT,
 	  EXIF_TAG_JPEG_INTERCHANGE_FORMAT_LENGTH,
 
+	  // Image data characteristics
+
+	  EXIF_TAG_TRANSFER_FUNCTION,
+	  EXIF_TAG_WHITE_POINT,
+	  EXIF_TAG_PRIMARY_CHROMATICITIES,
 	  EXIF_TAG_YCBCR_COEFFICIENTS,
-	  EXIF_TAG_YCBCR_SUB_SAMPLING,
-	  EXIF_TAG_YCBCR_POSITIONING,
+	  EXIF_TAG_REFERENCE_BLACK_WHITE,
+
+	  EXIF_TAG_COLOR_SPACE,
+
 	  -1 },
 
         /* GTH_METADATA_CATEGORY_EXIF_CONDITIONS */
 	/* These tags describe the conditions when the photo was taken,
 	   and are located in the IFD0 or EXIF blocks. */
 	{ EXIF_TAG_ISO_SPEED_RATINGS,
+	  EXIF_TAG_BRIGHTNESS_VALUE,
+
 	  EXIF_TAG_FNUMBER,
 	  EXIF_TAG_APERTURE_VALUE,
+	  EXIF_TAG_MAX_APERTURE_VALUE,
 
 	  EXIF_TAG_EXPOSURE_TIME,
 	  EXIF_TAG_EXPOSURE_PROGRAM,
 	  EXIF_TAG_EXPOSURE_INDEX,
 	  EXIF_TAG_EXPOSURE_BIAS_VALUE,
 	  EXIF_TAG_EXPOSURE_MODE,
+	  EXIF_TAG_SHUTTER_SPEED_VALUE,
 
 	  EXIF_TAG_METERING_MODE,
 	  EXIF_TAG_LIGHT_SOURCE,
+	  EXIF_TAG_WHITE_BALANCE,
 	  EXIF_TAG_FLASH,
 	  EXIF_TAG_FLASH_ENERGY,
 
@@ -200,28 +214,10 @@
 	  EXIF_TAG_FOCAL_PLANE_Y_RESOLUTION,
 	  EXIF_TAG_FOCAL_PLANE_RESOLUTION_UNIT,
 
-	  EXIF_TAG_DEVICE_SETTING_DESCRIPTION,
-
-	  EXIF_TAG_OECF,
-	  EXIF_TAG_SPATIAL_FREQUENCY_RESPONSE, 
-
-	  EXIF_TAG_WHITE_BALANCE,
-	  EXIF_TAG_WHITE_POINT,
-	  EXIF_TAG_REFERENCE_BLACK_WHITE,
-
-	  EXIF_TAG_BRIGHTNESS_VALUE,
 	  EXIF_TAG_CONTRAST,
 	  EXIF_TAG_SATURATION,
 	  EXIF_TAG_SHARPNESS,
 
-	  EXIF_TAG_GAIN_CONTROL,
-
-	  EXIF_TAG_SPECTRAL_SENSITIVITY,
-	  EXIF_TAG_MAX_APERTURE_VALUE,
-	  EXIF_TAG_SHUTTER_SPEED_VALUE,
-	  EXIF_TAG_SENSING_METHOD,
-	  EXIF_TAG_CFA_PATTERN,
-
 	  EXIF_TAG_SCENE_TYPE,
 	  EXIF_TAG_SCENE_CAPTURE_TYPE,
 
@@ -230,6 +226,16 @@
 	  EXIF_TAG_DIGITAL_ZOOM_RATIO,
 
 	  EXIF_TAG_FILE_SOURCE,
+
+	  EXIF_TAG_SENSING_METHOD,
+	  EXIF_TAG_NEW_CFA_PATTERN,
+
+	  EXIF_TAG_DEVICE_SETTING_DESCRIPTION,
+	  EXIF_TAG_OECF,
+	  EXIF_TAG_SPATIAL_FREQUENCY_RESPONSE, 
+	  EXIF_TAG_SPECTRAL_SENSITIVITY,
+	  EXIF_TAG_GAIN_CONTROL,
+
 	  -1 },
 
 	/* GTH_METADATA_CATEGORY_MAKERNOTE */ 
@@ -240,12 +246,12 @@
 
 	/* GTH_METADATA_CATEGORY_GPS */
 	/* GPS data is stored in a special IFD (GPS) */
-	{ EXIF_TAG_GPS_LATITUDE,
-	  EXIF_TAG_GPS_LATITUDE_REF,
-	  EXIF_TAG_GPS_LONGITUDE,
+	{ EXIF_TAG_GPS_LATITUDE_REF,
+	  EXIF_TAG_GPS_LATITUDE,
 	  EXIF_TAG_GPS_LONGITUDE_REF,
-	  EXIF_TAG_GPS_ALTITUDE,
+	  EXIF_TAG_GPS_LONGITUDE,
 	  EXIF_TAG_GPS_ALTITUDE_REF,
+	  EXIF_TAG_GPS_ALTITUDE,
 	  EXIF_TAG_GPS_TIME_STAMP,
 	  EXIF_TAG_GPS_SATELLITES,
 	  EXIF_TAG_GPS_STATUS,
