← Back to branch summary

~darkxst/ubuntu/trusty/gjs/1.38.1

« back to all changes in this revision

Viewing changes to gi/closure.c

  • Committer: Package Import Robot
  • Author(s): Tim Lunn
  • Date: 2013-07-30 09:15:40 UTC
  • mfrom: (1.10.9)
  • Revision ID: package-import@ubuntu.com-20130730091540-7hk361n8pbliyfn2
Tags: 1.37.4-0ubuntu1
https://launchpad.net/bugs/1205971
* New upstream release (LP: #1205971)
* debian/control.in:
  - Bump b-d on gobject-instropection
  - Build-depend on mozjs17 instead of mozjs
  - Bump library packages to libgjs0d (for mozjs17 transition)

Show diffs side-by-side

added added

removed removed

Lines of Context:
gi/closure.c
31
31
#include "keep-alive.h"
32
32
#include <gjs/gjs-module.h>
33
33
#include <gjs/compat.h>
 
34
#include <gjs/runtime.h>
34
35
 
35
36
typedef struct {
36
37
    GClosure base;
270
271
    if (JS_IsExceptionPending(context)) {
271
272
        gjs_debug_closure("Exception was pending before invoking callback??? "
272
273
                          "Not expected");
273
 
        gjs_log_exception(context, NULL);
 
274
        gjs_log_exception(context);
274
275
    }
275
276
 
276
277
    if (!gjs_call_function_value(context,
283
284
        gjs_debug_closure("Closure invocation failed (exception should "
284
285
                          "have been thrown) closure %p callable %p",
285
286
                          closure, c->obj);
286
 
        if (!gjs_log_exception(context, NULL))
 
287
        if (!gjs_log_exception(context))
287
288
            gjs_debug_closure("Closure invocation failed but no exception was set?");
288
289
        goto out;
289
290
    }
290
291
 
291
 
    if (gjs_log_exception(context, NULL)) {
 
292
    if (gjs_log_exception(context)) {
292
293
        gjs_debug_closure("Closure invocation succeeded but an exception was set");
293
294
    }
294
295