← Back to branch summary

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

« back to all changes in this revision

Viewing changes to editor/libeditor/html/nsHTMLCSSUtils.cpp

  • 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:
editor/libeditor/html/nsHTMLCSSUtils.cpp
614
614
      // from the document, get the abtractView
615
615
      res = documentView->GetDefaultView(getter_AddRefs(abstractView));
616
616
      if (NS_FAILED(res)) return res;
617
 
      // from the abstractView, get the CSS view
618
 
      CallQueryInterface(abstractView, aViewCSS);
619
 
      return NS_OK;
 
617
      if (abstractView) {
 
618
        // from the abstractView, get the CSS view
 
619
        CallQueryInterface(abstractView, aViewCSS);
 
620
        return NS_OK;
 
621
      }
620
622
    }
621
623
  }
622
624
  *aViewCSS = nsnull;