/[winpt]/trunk/Src/wptVerifyList.cpp
ViewVC logotype

Diff of /trunk/Src/wptVerifyList.cpp

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 204 by twoaday, Wed Apr 26 06:37:23 2006 UTC revision 205 by twoaday, Thu Apr 27 12:46:03 2006 UTC
# Line 145  int Line 145  int
145  verlist_add_sig (listview_ctrl_t lv, gpgme_signature_t sig)  verlist_add_sig (listview_ctrl_t lv, gpgme_signature_t sig)
146  {  {
147      gpgme_key_t key = NULL;      gpgme_key_t key = NULL;
     const char * attr;  
148      u32 key_attr;      u32 key_attr;
149        const char *attr;
150      char keyid[32+1];      char keyid[32+1];
     char *uid = NULL;  
151            
152      if (listview_add_item (lv, " "))      if (listview_add_item (lv, " "))
153          return WPTERR_GENERAL;          return WPTERR_GENERAL;
# Line 173  verlist_add_sig (listview_ctrl_t lv, gpg Line 172  verlist_add_sig (listview_ctrl_t lv, gpg
172      }      }
173      listview_add_sub_item (lv, 0, VER_COL_TRUST, (char *)attr);      listview_add_sub_item (lv, 0, VER_COL_TRUST, (char *)attr);
174            
175      attr = sig->fpr;      attr = get_keyid_from_fpr (sig->fpr);      
176      if (!attr || strlen (attr) < 8)      _snprintf (keyid, sizeof keyid -1, "0x%s", attr);
177          listview_add_sub_item (lv, 0, VER_COL_KEYID, "????????");      listview_add_sub_item (lv, 0, VER_COL_KEYID, keyid);
     else {  
         if (strlen (attr) == 40)  
             attr += 32;  
         else if (strlen (attr) == 32)  
             attr += 24;  
         else  
             attr += 8;  
         _snprintf (keyid, sizeof keyid -1, "0x%s", attr);  
         listview_add_sub_item (lv, 0, VER_COL_KEYID, keyid);  
     }  
178            
179      if (!key)      if (!key)
180          attr = _("user ID not found");          attr = _("user ID not found");
# Line 206  verlist_add_sig_log (listview_ctrl_t lv, Line 195  verlist_add_sig_log (listview_ctrl_t lv,
195      gpgme_key_t key = NULL;      gpgme_key_t key = NULL;
196      const char *attr;      const char *attr;
197      char t[64], *name;      char t[64], *name;
     int off = 0;  
198    
199      if (listview_add_item (lv, "")) {      if (listview_add_item (lv, "")) {
200          log_debug ("verlist_add_sig_log: listview_add_item() failed.\n");          log_debug ("verlist_add_sig_log: listview_add_item() failed.\n");
# Line 240  verlist_add_sig_log (listview_ctrl_t lv, Line 228  verlist_add_sig_log (listview_ctrl_t lv,
228      else      else
229          attr = _("Unknown");          attr = _("Unknown");
230      listview_add_sub_item (lv, 0, VER_COL_TRUST, attr);      listview_add_sub_item (lv, 0, VER_COL_TRUST, attr);
231        
232      if (strlen (sig->fpr) == 16)      attr = get_keyid_from_fpr (sig->fpr);
233          off = 8;      _snprintf (t, sizeof (t)-1, "0x%s", attr);
     else  
         off = strlen (sig->fpr) == 40? 32 : 24;  
     _snprintf (t, sizeof (t)-1, "0x%s", sig->fpr + off);  
234      listview_add_sub_item (lv, 0, VER_COL_KEYID, t);      listview_add_sub_item (lv, 0, VER_COL_KEYID, t);
235      listview_add_sub_item (lv, 0, VER_COL_UID,      listview_add_sub_item (lv, 0, VER_COL_UID,
236                             log->user_id?                             log->user_id?
Legend:
Removed from v.204  
changed lines
  Added in v.205
[email protected]
 ViewVC Help
Powered by ViewVC 1.1.26