# HG changeset patch
# User zas_
# Date 1207829254 0
# Node ID bda275cf98215fd8c41ba4572befa1ac4788c829
# Parent  49eaa6463492d18ddc9ffd2799ed3c61ae270ec8
Fix fCamera even more.

diff -r 49eaa6463492 -r bda275cf9821 src/exif-common.c
--- a/src/exif-common.c	Thu Apr 10 11:31:20 2008 +0000
+++ b/src/exif-common.c	Thu Apr 10 12:07:34 2008 +0000
@@ -81,8 +81,7 @@
 		;
 	if (!i) 
 		return t;
-	--i;
-	if (s[i]==' ' || !s[i])
+	if (s[i-1] == ' ' || !s[i])
 		{
 		while (t[i] == ' ')
 			i++;
@@ -156,6 +155,7 @@
 } while(0)
 			REMOVE_SUFFIX(make," Corporation"); /* Pentax */
 			REMOVE_SUFFIX(make," OPTICAL CO.,LTD"); /* OLYMPUS */
+			REMOVE_SUFFIX(make," CORPORATION"); /* Nikon */
 		}
 		if (model)
 			g_strstrip(model);
@@ -176,11 +176,11 @@
 		model2 = remove_common_prefix(make, model);
 		software2 = remove_common_prefix(model2, software);
 
-		text = g_strdup_printf("%s%s%s%s%s%s", (make) ? make : "", ((make) && (model)) ? " " : "",
+		text = g_strdup_printf("%s%s%s%s%s%s", (make) ? make : "", (make && model2) ? " " : "",
 						       (model2) ? model2 : "",
-						       (software2) ? " (" : "",
+						       (software2 && (make || model2)) ? " (" : "",
 						       (software2) ? software2 : "",
-						       (software2) ? ")" : "");
+						       (software2 && (make || model2)) ? ")" : "");
 
 		g_free(make);
 		g_free(model);