Mercurial > geeqie.yaz

changeset 300:bda275cf9821

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix fCamera even more.
author zas_
date Thu, 10 Apr 2008 12:07:34 +0000
parents 49eaa6463492
children 8cecb9695d28
files src/exif-common.c
diffstat 1 files changed, 5 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- 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);