[Galago-commits] r2517 - in trunk/eds-feed: . src

[galago-commits at freedesktop.org]

Author: chipx86
Date: 2006-02-01 19:53:19 -0800 (Wed, 01 Feb 2006)
New Revision: 2517

Modified:
   trunk/eds-feed/ChangeLog
   trunk/eds-feed/src/main.c
Log:
tch by Jorn Baayen to fix a missing empty string check. This closes ticket #13.


Modified: trunk/eds-feed/ChangeLog
===================================================================
--- trunk/eds-feed/ChangeLog	2006-02-02 03:51:35 UTC (rev 2516)
+++ trunk/eds-feed/ChangeLog	2006-02-02 03:53:19 UTC (rev 2517)
@@ -1,3 +1,9 @@
+Wed Feb 01 19:52:27 PST 2006  Christian Hammond <chipx86 at chipx86.com>
+
+	* src/main.c:
+	  - Patch by Jorn Baayen to fix a missing empty string check. This
+	    closes ticket #13.
+
 Fri Jan 27 11:13:51 PST 2006  Christian Hammond <chipx86 at chipx86.com>
 
 	* AUTHORS:

Modified: trunk/eds-feed/src/main.c
===================================================================
--- trunk/eds-feed/src/main.c	2006-02-02 03:51:35 UTC (rev 2516)
+++ trunk/eds-feed/src/main.c	2006-02-02 03:53:19 UTC (rev 2517)
@@ -49,7 +49,8 @@
 		g_message("Adding account %s on %s",
 				  username, galago_service_get_id(service));
 
-		account = galago_service_create_account(service, person, username);
+                if (username && *username != '\0')
+		        account = galago_service_create_account(service, person, username);
 
                 g_free(username);
 
@@ -74,13 +75,15 @@
 
 		username = e_vcard_attribute_get_value(attr);
 
-		if (galago_person_get_account(person, service, username, FALSE))
-		{
-			g_message("Adding account %s on %s",
-					  username, galago_service_get_id(service));
+                if (username && *username != '\0') {
+		        if (galago_person_get_account(person, service, username, FALSE))
+		        {
+			        g_message("Adding account %s on %s",
+				        	  username, galago_service_get_id(service));
 
-			account = galago_service_create_account(service, person, username);
-		}
+			        account = galago_service_create_account(service, person, username);
+		        }
+                }
 
                 g_free(username);
 	}