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

Diff of /trunk/Src/wptKeylist.cpp

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

revision 42 by werner, Fri Oct 28 08:25:30 2005 UTC revision 73 by twoaday, Tue Nov 8 07:15:13 2005 UTC
# Line 23  Line 23 
23  #endif  #endif
24    
25  #include <windows.h>  #include <windows.h>
 #include <windows.h>  
26  #include <commctrl.h>  #include <commctrl.h>
27  #include <time.h>  #include <time.h>
28    
# Line 227  get_key_created (long timestamp) Line 226  get_key_created (long timestamp)
226      struct tm *warp;      struct tm *warp;
227    
228      if (timestamp == 0 || timestamp == -1)      if (timestamp == 0 || timestamp == -1)
229          return "????-??-??";          return "????" "-??" "-??";
230      warp = localtime( &timestamp );      warp = localtime( &timestamp );
231      _snprintf( timebuf, sizeof timebuf - 1, "%04d-%02d-%02d",      _snprintf( timebuf, sizeof timebuf - 1, "%04d-%02d-%02d",
232                  warp->tm_year + 1900, warp->tm_mon + 1, warp->tm_mday );                  warp->tm_year + 1900, warp->tm_mon + 1, warp->tm_mday );
# Line 298  get_key_pubalgo (gpgme_pubkey_algo_t alg Line 297  get_key_pubalgo (gpgme_pubkey_algo_t alg
297      case GPGME_PK_ELG:      case GPGME_PK_ELG:
298      case GPGME_PK_ELG_E: return "ELG";      case GPGME_PK_ELG_E: return "ELG";
299      case GPGME_PK_RSA: return "RSA";      case GPGME_PK_RSA: return "RSA";
300        default: return "???";
301      }      }
302      return "???";      return "???";
303  }  }
# Line 369  get_key_trust_str (int val) Line 369  get_key_trust_str (int val)
369  }  }
370    
371    
372    /* Return the status of the key @key. */
373  char*  char*
374  get_key_status (gpgme_key_t key, int uididx, int listmode)  get_key_status (gpgme_key_t key, int uididx, int listmode)
375  {  {
376      gpgme_user_id_t u;      gpgme_user_id_t u;
377      char fmt[64], * p;      const char *attr;
     const char * attr;  
     int i = 0;  
378      u32 key_attr =0;      u32 key_attr =0;
379    
380      if (uididx < 0 || count_userids (key) > uididx)      if (uididx < 0 || count_userids (key) > uididx)
381          uididx = 0;          uididx = 0;
     memset (fmt, 0, sizeof (fmt));  
382      if (listmode) {      if (listmode) {
383            const char *s;
384          
385          if (key->revoked)          if (key->revoked)
386              sprintf (fmt, _("Revoked"));              s = _("Revoked");
387          else if (key->expired)          else if (key->expired)
388              sprintf (fmt, _("Expired"));              s = _("Expired");
389          else if (key->disabled)          else if (key->disabled)
390              sprintf (fmt, _("Disabled"));              s = _("Disabled");
391            else
392              s = "";
393            
394          /* if the key has a special status, we don't continue to figure out          /* if the key has a special status, we don't continue to figure out
395             what any user-id validities. */             what any user-id validities. */
396          if (strlen (fmt) > 0)          if (*s)
397              return m_strdup (fmt);              return m_strdup (s);
398      }      }
399      u = get_nth_userid (key, uididx);      u = get_nth_userid (key, uididx);
400      key_attr = u->validity;      key_attr = u->validity;
401      attr = get_key_trust2 (NULL, key_attr, 0, 0);      attr = get_key_trust2 (NULL, key_attr, 0, 0);
402      p = new char[strlen( attr ) + 2];      return m_strdup (attr);
403      if (!p)  }
         BUG (NULL);  
     sprintf (p, "%s", attr);  
     return p;  
 } /* get_key_status */  
404    
405    
406  /* Integer comparsion of @a and @b.  /* Integer comparsion of @a and @b.
# Line 496  keylist_cmp_cb (LPARAM first, LPARAM sec Line 495  keylist_cmp_cb (LPARAM first, LPARAM sec
495  static const char*  static const char*
496  calc_validity (gpg_group_t grp)  calc_validity (gpg_group_t grp)
497  {  {
498      int level = 0, valid;      int valid=0;
499      gpg_member_t mbr;      gpg_member_t mbr;
500      gpgme_key_t key;      gpgme_key_t key;
501    
# Line 549  keylist_build (listview_ctrl_t *r_lv, HW Line 548  keylist_build (listview_ctrl_t *r_lv, HW
548      listview_ctrl_t lv;      listview_ctrl_t lv;
549      listview_column_t col;      listview_column_t col;
550      int j, n = 0;      int j, n = 0;
551      int kl_nolist = 0, rc = 0;      int rc = 0;
552            
553      rc = listview_new (&lv);      rc = listview_new (&lv);
554      if( rc )      if( rc )
# Line 813  keylist_upd_key (listview_ctrl_t lv, int Line 812  keylist_upd_key (listview_ctrl_t lv, int
812  int  int
813  keylist_add_key (listview_ctrl_t lv, int mode, gpgme_key_t key)  keylist_add_key (listview_ctrl_t lv, int mode, gpgme_key_t key)
814  {  {
815      int uids, rc = 0, i, n = 0;      int uids, rc = 0, i;
816      gpgme_subkey_t k;      gpgme_subkey_t k;
817    
818      /* if the entire key is disabled, just return. */      /* if the entire key is disabled, just return. */

Legend:
Removed from v.42  
changed lines
  Added in v.73

[email protected]
ViewVC Help
Powered by ViewVC 1.1.26