← Back to branch summary

~ubuntu-branches/ubuntu/lucid/seahorse/lucid

« back to all changes in this revision

Viewing changes to pgp/seahorse-hkp-source.c

  • Committer: Bazaar Package Importer
  • Author(s): Andreas Moog
  • Date: 2009-04-12 23:36:57 UTC
  • mfrom: (1.2.44 upstream)
  • Revision ID: james.westby@ubuntu.com-20090412233657-0zyuxgptq27tqhqu
Tags: 2.26.1-0ubuntu1
https://launchpad.net/bugs/360225
https://launchpad.net/bugs/351948
https://launchpad.net/bugs/344696
https://launchpad.net/bugs/326087
https://launchpad.net/bugs/341983
* New upstream version: (LP: #360225)
  - PGP UIDs display in order reported by key server, and fix 
    parsing of HKP PGP search UIDs. [Adam Schreiber] (LP: #351948)
  - Fix problem opening preferences window twice. [Adam Schreiber]
    (LP: #344696)
  - Set authorized_keys properly when sending SSH keys to a 
    remote system. [Andreas Moog, Stef Walter] (LP: #326087)
  - Fix crash when entering hkp: url manually. [Stef Walter]
    (LP: #341983)
* debian/patches
  - updated 80_autoconf.patch to apply to new version

Show diffs side-by-side

added added

removed removed

Lines of Context:
pgp/seahorse-hkp-source.c
409
409
    
410
410
        for (l = lines; *l; l++) {
411
411
 
412
 
                line = *l;
 
412
                line = *l;      
413
413
                dehtmlize (line);
 
414
#if DEBUG_HKP_ENABLE
 
415
        fprintf(stderr,"%s\n", line);
 
416
#endif
414
417
 
415
418
                /* Start a new key */
416
419
                if (g_ascii_strncasecmp (line, "pub ", 4) == 0) {
519
522
        g_strfreev (lines);
520
523
 
521
524
        if (key) {
522
 
                seahorse_pgp_key_set_uids (SEAHORSE_PGP_KEY (key), uids);
 
525
                seahorse_pgp_key_set_uids (SEAHORSE_PGP_KEY (key), g_list_reverse (uids));
523
526
                seahorse_object_list_free (uids);
524
 
                seahorse_pgp_key_set_subkeys (SEAHORSE_PGP_KEY (key), subkeys);
 
527
                seahorse_pgp_key_set_subkeys (SEAHORSE_PGP_KEY (key), g_list_reverse (subkeys));
525
528
                seahorse_object_list_free (subkeys);
526
529
        }
527
530
        
1059
1062
        /* Must be http or https, have a host. No querystring, user, path, passwd etc... */
1060
1063
        if ((soup->scheme == SOUP_URI_SCHEME_HTTP || soup->scheme == SOUP_URI_SCHEME_HTTPS) && 
1061
1064
            !soup->user && !soup->password && !soup->query && !soup->fragment &&
1062
 
            g_str_equal (soup->path, "/"))
 
1065
            soup->host && g_str_equal (soup->path ? soup->path : "/", "/"))
1063
1066
            ret = TRUE;
1064
1067
        soup_uri_free (soup);
1065
1068
    }