seahorse r2964 - in trunk: . pgp

[sadam svn gnome org]

Author: sadam
Date: Tue Mar 31 14:55:48 2009
New Revision: 2964
URL: http://svn.gnome.org/viewvc/seahorse?rev=2964&view=rev

Log:
2009-03-31  Adam Schreiber  <sadam clemson edu>

    * pgp/seahorse-hkp-source.c:
    * pgp/seahorse-pgp-uid.c: Fix parsing of uids.  Fixes bug #577362


Modified:
   trunk/ChangeLog
   trunk/pgp/seahorse-hkp-source.c
   trunk/pgp/seahorse-pgp-uid.c

Modified: trunk/pgp/seahorse-hkp-source.c
==============================================================================
--- trunk/pgp/seahorse-hkp-source.c	(original)
+++ trunk/pgp/seahorse-hkp-source.c	Tue Mar 31 14:55:48 2009
@@ -409,8 +409,11 @@
     
 	for (l = lines; *l; l++) {
 
-		line = *l;
+		line = *l;	
 		dehtmlize (line);
+#if DEBUG_HKP_ENABLE
+        fprintf(stderr,"%s\n", line);
+#endif
 
 		/* Start a new key */
 		if (g_ascii_strncasecmp (line, "pub ", 4) == 0) {

Modified: trunk/pgp/seahorse-pgp-uid.c
==============================================================================
--- trunk/pgp/seahorse-pgp-uid.c	(original)
+++ trunk/pgp/seahorse-pgp-uid.c	Tue Mar 31 14:55:48 2009
@@ -154,7 +154,9 @@
                     tail = src + 1;
 		        }
 	            in_name = 0;
-	        }
+	        } else
+	            tail = src + 1;
+	            
 	        in_email = 1;
 	    } else if (*src == '(') {
 	        if (in_name) {