← Back to branch summary

~ubuntu-branches/ubuntu/gutsy/firefox/gutsy

« back to all changes in this revision

Viewing changes to security/nss/lib/pk11wrap/pk11cert.c

  • Committer: Bazaar Package Importer
  • Author(s): Ian Jackson
  • Date: 2006-10-10 18:49:32 UTC
  • mfrom: (1.1.8 upstream)
  • Revision ID: james.westby@ubuntu.com-20061010184932-da75izt7y0e59afq
Tags: 1.99+2.0rc2+dfsg-0ubuntu1
* New upstream version 2.0rc2.
* Fix/workaround for epiphany GtkSocket lifetype crash:
  apply patch id=241087 from Mozilla Bugzilla #241535 to fix LP #63814.
* Change application name to `Firefox', as requested by mdz.
  Files changed:
    - browser/locales/en-US/chrome/branding/brand.dtd
    - browser/locales/en-US/chrome/branding/brand.properties;
  New values:
    - brandShortName and brandFullName: `Bon Echo' => `Firefox'
    - vendorShortName: `Mozilla' => `Ubuntu'
* Make preferences dialogue fit again (bah!).

Show diffs side-by-side

added added

removed removed

Lines of Context:
security/nss/lib/pk11wrap/pk11cert.c
273
273
    }
274
274
 
275
275
    /* Create a PKI object from the cryptoki instance */
276
 
    pkio = nssPKIObject_Create(NULL, co, td, NULL);
 
276
    pkio = nssPKIObject_Create(NULL, co, td, NULL, nssPKIMonitor);
277
277
    if (!pkio) {
278
278
        nssCryptokiObject_Destroy(co);
279
279
        return NULL;
1203
1203
    if (!instance) {
1204
1204
        goto loser;
1205
1205
    }
1206
 
    object = nssPKIObject_Create(NULL, instance, td, NULL);
 
1206
    object = nssPKIObject_Create(NULL, instance, td, NULL, nssPKIMonitor);
1207
1207
    if (!object) {
1208
1208
        goto loser;
1209
1209
    }