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

Diff of /trunk/Src/wptKeyEditDlgs.cpp

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

revision 186 by twoaday, Mon Mar 20 12:48:52 2006 UTC revision 187 by twoaday, Wed Mar 22 11:04:20 2006 UTC
# Line 167  do_init_keylist (HWND dlg, winpt_key_t k Line 167  do_init_keylist (HWND dlg, winpt_key_t k
167          kid = key->subkeys->keyid;          kid = key->subkeys->keyid;
168          if (!s || !strcmp (kid+8, k->keyid))          if (!s || !strcmp (kid+8, k->keyid))
169              continue;              continue;
170          u = utf8_to_wincp (s, strlen (s));          u = utf8_to_native (s);
171          SendDlgItemMessage (dlg, IDC_ADDREV_KEYLIST, CB_ADDSTRING,          SendDlgItemMessage (dlg, IDC_ADDREV_KEYLIST, CB_ADDSTRING,
172                              0, (WPARAM)(char *)u);                              0, (WPARAM)(char *)u);
173          free (u);          free (u);
# Line 194  do_add_new_userid (listview_ctrl_t lv, Line 194  do_add_new_userid (listview_ctrl_t lv,
194      n = strlen (utf8_name) + strlen (email) + 16;      n = strlen (utf8_name) + strlen (email) + 16;
195      if (comment)      if (comment)
196          n += strlen (comment);          n += strlen (comment);
197      uid = utf8_to_wincp (utf8_name, strlen (utf8_name));      uid = utf8_to_native (utf8_name);
198      p = new char[n+1];      p = new char[n+1];
199      if (!p)      if (!p)
200          BUG (NULL);          BUG (NULL);
# Line 252  do_find_userid (const char *keyid, const Line 252  do_find_userid (const char *keyid, const
252      GpgKeyEdit *ke;      GpgKeyEdit *ke;
253      gpgme_error_t err;      gpgme_error_t err;
254      gpg_uid_info_t inf, ui;      gpg_uid_info_t inf, ui;
255        char *ui_name = NULL;
256      int pos = -1;      int pos = -1;
257    
258      ke = new GpgKeyEdit (keyid);      ke = new GpgKeyEdit (keyid);
# Line 267  do_find_userid (const char *keyid, const Line 268  do_find_userid (const char *keyid, const
268      }      }
269    
270      for (ui = inf; ui; ui = ui->next) {      for (ui = inf; ui; ui = ui->next) {
271          if (name && email && ui->email && ui->name) {          safe_free (ui_name);
272            ui_name = utf8_to_native (ui->name);
273            if (name && email && ui->email && ui_name) {
274              if (!strcmp (ui->email, email) &&              if (!strcmp (ui->email, email) &&
275                  !strncmp (ui->name, name, strlen (name))) {                  !strncmp (ui_name, name, strlen (name))) {
276                  pos = ui->index;                  pos = ui->index;
277                  break;                  break;
278              }              }
# Line 284  do_find_userid (const char *keyid, const Line 287  do_find_userid (const char *keyid, const
287                 as the fallbck when no email address is available. */                 as the fallbck when no email address is available. */
288              continue;              continue;
289          }          }
290          if (ui->name && name && !strcmp (ui->name, name)) {          if (ui_name && name && !strcmp (ui_name, name)) {
291              pos = ui->index;              pos = ui->index;
292              break;              break;
293          }          }
# Line 293  do_find_userid (const char *keyid, const Line 296  do_find_userid (const char *keyid, const
296          *r_inf = inf;          *r_inf = inf;
297      else      else
298          gpg_uid_info_release (inf);          gpg_uid_info_release (inf);
299        safe_free (ui_name);
300      return pos;      return pos;
301  }  }
302    
# Line 548  keyedit_adduid_dlg_proc (HWND dlg, UINT Line 552  keyedit_adduid_dlg_proc (HWND dlg, UINT
552                            
553              rc = GetDlgItemText (dlg, IDC_ADDUID_COMMENT,              rc = GetDlgItemText (dlg, IDC_ADDUID_COMMENT,
554                                   comment, sizeof comment -1);                                   comment, sizeof comment -1);
555                utf8_name = native_to_utf8 (name);
             /* XXX: something is wrong with the encoding :-( */  
             utf8_name = wincp_to_utf8 (name, strlen (name));  
556    
557              ke = new GpgKeyEdit (ctx->keyid);              ke = new GpgKeyEdit (ctx->keyid);
558              if (!ke)              if (!ke)
# Line 1181  userid_list_init (HWND dlg, winpt_key_t Line 1183  userid_list_init (HWND dlg, winpt_key_t
1183          /* XXX: add comment if available */          /* XXX: add comment if available */
1184          attr = u->name;          attr = u->name;
1185          if (attr) {          if (attr) {
1186              char *uid = utf8_to_wincp (attr, strlen (attr));              char *uid = utf8_to_native (attr);
1187              if (uid) {              if (uid) {
1188                  listview_add_sub_item (lv, j, 1, uid);                  listview_add_sub_item (lv, j, 1, uid);
1189                  free (uid);                  free (uid);
Legend:
Removed from v.186  
changed lines
  Added in v.187
[email protected]
 ViewVC Help
Powered by ViewVC 1.1.26