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

Diff of /trunk/Src/wptKeyRevokersDlg.cpp

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

revision 224 by twoaday, Tue May 9 10:29:07 2006 UTC revision 225 by twoaday, Tue Jun 6 13:37:59 2006 UTC
# Line 112  revokelist_init (HWND ctrl, winpt_key_t Line 112  revokelist_init (HWND ctrl, winpt_key_t
112      gpg_desig_rev_t rev=NULL, r;      gpg_desig_rev_t rev=NULL, r;
113      listview_ctrl_t lv;      listview_ctrl_t lv;
114      const char *alg;      const char *alg;
115      const char *uid = NULL;      const char *uid = NULL, *kid;
116      char keyid[32];      char keyid[32];
117    
118      err = key_get_revokers (key, 0, &rev);      err = key_get_revokers (key, 0, &rev);
# Line 124  revokelist_init (HWND ctrl, winpt_key_t Line 124  revokelist_init (HWND ctrl, winpt_key_t
124      revokelist_build (&lv, ctrl);      revokelist_build (&lv, ctrl);
125      for (r = rev; r; r = r->next) {      for (r = rev; r; r = r->next) {
126          memset (&revkey, 0, sizeof (revkey));          memset (&revkey, 0, sizeof (revkey));
127          if (winpt_get_pubkey (r->fpr+32, &revkey))          kid = get_keyid_from_fpr (r->fpr);
128            if (winpt_get_pubkey (kid, &revkey))
129              uid = _("user ID not found");              uid = _("user ID not found");
130          else          else
131              uid = revkey.ext->uids->name;              uid = revkey.ext->uids->name;
132          _snprintf (keyid, sizeof (keyid)-1, "0x%s", r->fpr+32);          _snprintf (keyid, sizeof (keyid)-1, "0x%s", kid);
133          listview_add_item2 (lv, "", revkey.ext);          listview_add_item2 (lv, "", revkey.ext);
134          alg = get_key_pubalgo (r->pubkey_algo);          alg = get_key_pubalgo (r->pubkey_algo);
135          listview_add_sub_item (lv, 0, REV_COL_ALGO, alg);          listview_add_sub_item (lv, 0, REV_COL_ALGO, alg);
# Line 150  key_revokers_dlg_proc (HWND dlg, UINT ms Line 151  key_revokers_dlg_proc (HWND dlg, UINT ms
151      int rc;      int rc;
152            
153      switch (msg) {      switch (msg) {
154      case WM_INITDIALOG:      case WM_INITDIALOG:
         gpg_keycache_t ctx;  
155          key = (winpt_key_t)lparam;          key = (winpt_key_t)lparam;
156          if (!key)          if (!key)
157              dlg_fatal_error( dlg, "Could not get dilaog param" );              BUG (0);
         ctx = keycache_get_ctx (1);  
158          lv = revokelist_init (GetDlgItem (dlg, IDC_KEYREVOKERS_LIST), key);          lv = revokelist_init (GetDlgItem (dlg, IDC_KEYREVOKERS_LIST), key);
   
159          SetDlgItemText (dlg, IDC_KEYREVOKERS_INF, _("Designated Revoker Keys"));          SetDlgItemText (dlg, IDC_KEYREVOKERS_INF, _("Designated Revoker Keys"));
160          SetWindowText (dlg, _("Key Revokers"));          SetWindowText (dlg, _("Key Revokers"));
161          SetForegroundWindow (dlg);          SetForegroundWindow (dlg);
# Line 187  key_revokers_dlg_proc (HWND dlg, UINT ms Line 185  key_revokers_dlg_proc (HWND dlg, UINT ms
185                      memset (&pk, 0, sizeof (pk));                      memset (&pk, 0, sizeof (pk));
186                      if (winpt_get_pubkey (keyid, &pk))                      if (winpt_get_pubkey (keyid, &pk))
187                          BUG (NULL);                          BUG (NULL);
188                        /* XXX: utf8 decode problem. */
189                      if (pk.ext && pk.ext->uids)                      if (pk.ext && pk.ext->uids)
190                          listview_add_sub_item (lv, idx, REV_COL_NAME, pk.ext->uids->name);                          listview_add_sub_item (lv, idx, REV_COL_NAME, pk.ext->uids->name);
191                  }                  }
Legend:
Removed from v.224  
changed lines
  Added in v.225
[email protected]
 ViewVC Help
Powered by ViewVC 1.1.26