← Back to branch summary

~ubuntu-branches/ubuntu/raring/gjs/raring

« back to all changes in this revision

Viewing changes to gi/object.c

  • Committer: Package Import Robot
  • Author(s): Jeremy Bicha
  • Date: 2012-09-08 20:48:59 UTC
  • mfrom: (1.10.4)
  • Revision ID: package-import@ubuntu.com-20120908204859-5ak4lr1kkza1mudq
Tags: 1.33.10-0ubuntu1
* New upstream bugfix release.
* debian/control.in:
  - Bump minimum gobject-introspection

Show diffs side-by-side

added added

removed removed

Lines of Context:
gi/object.c
996
996
                        "JSObject created with GObject %p %s",
997
997
                        priv->gobj, g_type_name_from_instance((GTypeInstance*) priv->gobj));
998
998
 
999
 
    TRACE(GJS_OBJECT_PROXY_NEW(priv, priv->gobj, g_base_info_get_namespace ( (GIBaseInfo*) priv->info),
1000
 
                               g_base_info_get_name ( (GIBaseInfo*) priv->info) ));
 
999
    TRACE(GJS_OBJECT_PROXY_NEW(priv, priv->gobj,
 
1000
                               priv->info ? g_base_info_get_namespace((GIBaseInfo*) priv->info) : "_gjs_private",
 
1001
                               priv->info ? g_base_info_get_name((GIBaseInfo*) priv->info) : g_type_name(gtype)));
1001
1002
 
1002
1003
 out:
1003
1004
    return JS_TRUE;
1075
1076
        return; /* we are the prototype, not a real instance, so constructor never called */
1076
1077
 
1077
1078
    TRACE(GJS_OBJECT_PROXY_FINALIZE(priv, priv->gobj,
1078
 
                                    priv->info ? g_base_info_get_namespace ( (GIBaseInfo*) priv->info) : "",
1079
 
                                    priv->info ? g_base_info_get_name ( (GIBaseInfo*) priv->info) : g_type_name(priv->gtype)));
 
1079
                                    priv->info ? g_base_info_get_namespace((GIBaseInfo*) priv->info) : "_gjs_private",
 
1080
                                    priv->info ? g_base_info_get_name((GIBaseInfo*) priv->info) : g_type_name(priv->gtype)));
1080
1081
 
1081
1082
    if (priv->gobj) {
1082
1083
        invalidate_all_signals (priv);
2292
2293
    if (!do_base_typecheck(cx, parent, JS_TRUE))
2293
2294
        return JS_FALSE;
2294
2295
 
 
2296
    if (g_type_from_name(name) != G_TYPE_INVALID) {
 
2297
        gjs_throw (cx, "Type name %s is already registered", name);
 
2298
        return JS_FALSE;
 
2299
    }
 
2300
 
2295
2301
    parent_priv = priv_from_js(cx, parent);
2296
2302
 
2297
2303
    if (!parent_priv)