← Back to branch summary

~jbicha/ubuntu/oneiric/gjs/1.29.18

« back to all changes in this revision

Viewing changes to gi/object.c

  • Committer: Bazaar Package Importer
  • Author(s): Micah Gersten
  • Date: 2010-08-12 00:22:06 UTC
  • mfrom: (1.3.4 sid)
  • Revision ID: james.westby@ubuntu.com-20100812002206-zc5bfuqte3of6j2t
Tags: 0.7.1-1ubuntu1
https://launchpad.net/bugs/616598
* Merge from debian unstable. (LP: #616598)  Remaining changes:
  + debian/control: 
    - Add Ubuntu VCS info
    - Drop libmozjs Build-Depends; Ubuntu does not have this library.
    - Drop chrpath Build-Depends; we need to keep the RPATH because libmozjs
      is not a system library in Ubuntu.
    - Add xulrunner{,-dev}:Depends to binary packages
    - Bump xulrunner-dev build depends to 1.9.2
    - Build-depend on unversioned automake
  + debian/rules:
    - Generate strict dependencies on xulrunner.
    - Apply patch to fix libtool's handling of --as-needed
    - Add -Wl,--as-needed to LDFLAGS
  + debian/libgjs0a.lintian-overrides:
    - Override the entire rpath tag, not just for the specific libraries.
      The full lintian warning will change with each xulrunner version.
  + debian/ltmain-add-as-needed.patch
    - Fix libtool's ordering of --as-needed argument.
  + add debian/patches/01_disable_memcheck.patch
    - Don't make leaks fatal, see b.g.o #616193
  + add debian/patches/02_gobject_introspection.patch:
    - Use gobject-introspection 0.9
* Add debian/patches/03_libmozjs_private.patch (originally in 0.5-1ubuntu1)
  - Move @JS_PACKAGE@ libmozjs to Requires.private to prevent applications
    unnecessarily linking with libmozjs

Show diffs side-by-side

added added

removed removed

Lines of Context:
gi/object.c
31
31
#include "function.h"
32
32
#include "value.h"
33
33
#include "keep-alive.h"
 
34
#include "gjs_gi_trace.h"
34
35
 
35
36
#include <gjs/gjs.h>
36
37
 
765
766
        gjs_debug_lifecycle(GJS_DEBUG_GOBJECT,
766
767
                            "JSObject created with GObject %p %s",
767
768
                            priv->gobj, g_type_name_from_instance((GTypeInstance*) priv->gobj));
 
769
 
 
770
        TRACE(GJS_OBJECT_PROXY_NEW(priv, priv->gobj, g_base_info_get_namespace ( (GIBaseInfo*) priv->info),
 
771
                                    g_base_info_get_name ( (GIBaseInfo*) priv->info) ));
768
772
    }
769
773
 
770
774
    return JS_TRUE;
786
790
    if (priv == NULL)
787
791
        return; /* we are the prototype, not a real instance, so constructor never called */
788
792
 
 
793
    TRACE(GJS_OBJECT_PROXY_FINALIZE(priv, priv->gobj, g_base_info_get_namespace ( (GIBaseInfo*) priv->info),
 
794
                                    g_base_info_get_name ( (GIBaseInfo*) priv->info) ));
 
795
 
789
796
    if (priv->gobj) {
790
797
        g_assert(priv->gobj->ref_count > 0);
791
798
        set_js_obj(context, priv->gobj, NULL);
1371
1378
                                       /* number of constructor args */
1372
1379
                                       0,
1373
1380
                                       /* props of prototype */
1374
 
                                       &gjs_object_instance_proto_props[0],
 
1381
                                       parent_proto ? NULL : &gjs_object_instance_proto_props[0],
1375
1382
                                       /* funcs of prototype */
1376
 
                                       &gjs_object_instance_proto_funcs[0],
 
1383
                                       parent_proto ? NULL : &gjs_object_instance_proto_funcs[0],
1377
1384
                                       /* props of constructor, MyConstructor.myprop */
1378
1385
                                       NULL,
1379
1386
                                       /* funcs of constructor, MyConstructor.myfunc() */