seahorse r2877 - in seahorse-plugins/trunk: . libseahorse

[nnielsen svn gnome org]

Author: nnielsen
Date: Tue Mar  3 02:59:59 2009
New Revision: 2877
URL: http://svn.gnome.org/viewvc/seahorse?rev=2877&view=rev

Log:
Only use 16 characters when generating a key identifier for 
notifications. Fixes bug #551012


Modified:
   seahorse-plugins/trunk/ChangeLog
   seahorse-plugins/trunk/libseahorse/seahorse-notification.c

Modified: seahorse-plugins/trunk/libseahorse/seahorse-notification.c
==============================================================================
--- seahorse-plugins/trunk/libseahorse/seahorse-notification.c	(original)
+++ seahorse-plugins/trunk/libseahorse/seahorse-notification.c	Tue Mar  3 02:59:59 2009
@@ -604,8 +604,10 @@
 seahorse_notify_signatures (const gchar* data, gpgme_verify_result_t status)
 {
     const gchar *icon = NULL;
+    const gchar *keyid;
     gchar *title, *body;
     gboolean sig = FALSE;
+    gsize len;
     
     /* Figure out what to display */
     switch (gpgme_err_code (status->signatures->status))  {
@@ -655,10 +657,16 @@
                                         _("Couldn't verify signature."));
         return;
     };
+    
+    /* TODO: This logic needs to be consolidated somewhere */
+    keyid = status->signatures->fpr;
+    len = strlen (keyid);
+    if (len > 16) 
+	    keyid += len - 16;
 
     if (sig) {
         gchar *date = seahorse_util_get_display_date_string (status->signatures->timestamp);
-        gchar *id = g_strdup_printf ("openpgp:%s", status->signatures->fpr);
+        gchar *id = g_strdup_printf ("openpgp:%s", keyid);
         body = g_markup_printf_escaped (body, id, date);
         g_free (date);
         g_free (id);