← Back to branch summary

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

« back to all changes in this revision

Viewing changes to js/src/jsapi.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:
js/src/jsapi.c
1367
1367
#if JS_HAS_GENERATORS
1368
1368
    {js_InitIteratorClasses,    EAGER_ATOM_AND_CLASP(Iterator)},
1369
1369
    {js_InitIteratorClasses,    EAGER_ATOM_AND_CLASP(Generator)},
1370
 
    {js_InitIteratorClasses,    EAGER_ATOM_AND_CLASP(GeneratorExit)},
1371
1370
#endif
1372
1371
 
1373
1372
    {NULL,                      0, NULL, NULL}
2920
2919
JS_GetMethodById(JSContext *cx, JSObject *obj, jsid id, JSObject **objp,
2921
2920
                 jsval *vp)
2922
2921
{
 
2922
    JSObject *obj2;
 
2923
    JSProperty *prop;
 
2924
 
2923
2925
    CHECK_REQUEST(cx);
2924
2926
 
 
2927
    if (!OBJ_LOOKUP_PROPERTY(cx, obj, id, &obj2, &prop))
 
2928
        return JS_FALSE;
 
2929
    if (!prop) {
 
2930
        *vp = JSVAL_VOID;
 
2931
        return JS_TRUE;
 
2932
    }
 
2933
    OBJ_DROP_PROPERTY(cx, obj2, prop);
 
2934
 
2925
2935
#if JS_HAS_XML_SUPPORT
2926
2936
    if (OBJECT_IS_XML(cx, obj)) {
2927
2937
        JSXMLObjectOps *ops;