← Back to branch summary

~ubuntu-branches/ubuntu/natty/gnupg2/natty

« back to all changes in this revision

Viewing changes to g10/photoid.c

  • Committer: Bazaar Package Importer
  • Author(s): Eric Dorland
  • Date: 2009-03-08 22:46:47 UTC
  • mfrom: (1.1.11 upstream)
  • Revision ID: james.westby@ubuntu.com-20090308224647-gq17gatcl71lrc2k
Tags: 2.0.11-1
http://bugs.debian.org/496663
http://bugs.debian.org/496323
* New upstream release. (Closes: #496663)
* debian/control: Make the description a little more distinctive than
  gnupg v1's. Thanks Jari Aalto. (Closes: #496323)

Show diffs side-by-side

added added

removed removed

Lines of Context:
g10/photoid.c
1
1
/* photoid.c - photo ID handling code
2
 
 * Copyright (C) 2001, 2002, 2005 Free Software Foundation, Inc.
 
2
 * Copyright (C) 2001, 2002, 2005, 2006, 2008 Free Software Foundation, Inc.
3
3
 *
4
4
 * This file is part of GnuPG.
5
5
 *
40
40
#include "main.h"
41
41
#include "photoid.h"
42
42
#include "ttyio.h"
 
43
#include "trustdb.h"
43
44
 
44
45
/* Generate a new photo id packet, or return NULL if canceled */
45
46
PKT_user_id *
159
160
         "user" may not be able to dismiss a viewer window! */
160
161
      if(opt.command_fd==-1)
161
162
        {
162
 
          show_photos(uid->attribs,uid->numattribs,pk,NULL);
 
163
          show_photos(uid->attribs,uid->numattribs,pk,NULL,uid);
163
164
          switch(cpr_get_answer_yes_no_quit("photoid.jpeg.okay",
164
165
                                         _("Is this photo correct (y/N/q)? ")))
165
166
            {
282
283
}
283
284
#endif
284
285
 
285
 
void show_photos(const struct user_attribute *attrs,
286
 
                 int count,PKT_public_key *pk,PKT_secret_key *sk)
 
286
void
 
287
show_photos(const struct user_attribute *attrs,
 
288
            int count,PKT_public_key *pk,PKT_secret_key *sk,
 
289
            PKT_user_id *uid)
287
290
{
288
291
#ifndef DISABLE_PHOTO_VIEWER
289
292
  int i;
294
297
  memset(&args,0,sizeof(args));
295
298
  args.pk=pk;
296
299
  args.sk=sk;
 
300
  args.validity_info=get_validity_info(pk,uid);
 
301
  args.validity_string=get_validity_string(pk,uid);
297
302
 
298
303
  if(pk)
299
304
    keyid_from_pk(pk,kid);