[tracker] libtracker-common: Don't return non-stripped strings in tracker_coalesce()



commit 026db78339ed82a30c3260f30c4cd8ac95e4b930
Author: Martyn Russell <martyn lanedo com>
Date:   Thu Nov 5 12:11:28 2009 +0000

    libtracker-common: Don't return non-stripped strings in tracker_coalesce()
    
    We also use tracker_is_blank_string() now so we don't return empty strings either.

 src/libtracker-common/tracker-utils.c |   12 +++++-------
 1 files changed, 5 insertions(+), 7 deletions(-)
---
diff --git a/src/libtracker-common/tracker-utils.c b/src/libtracker-common/tracker-utils.c
index 4897653..efe10fe 100644
--- a/src/libtracker-common/tracker-utils.c
+++ b/src/libtracker-common/tracker-utils.c
@@ -511,16 +511,14 @@ tracker_coalesce (gint n_values,
 
 	va_start (args, n_values);
 
-	for (i = 0; i < n_values; i++) {
+	for (i = 0; i < n_values && !result; i++) {
 		gchar *value;
 
 		value = va_arg (args, gchar *);
-		if (value) {
-			if (*value && !result) {
-				result = value;
-			} else {
-				g_free (value);
-			}
+		if (!tracker_is_blank_string (value)) {
+			result = g_strstrip (value);
+		} else {
+			g_free (value);
 		}
 	}
 



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]