← Back to branch summary

~ubuntu-branches/ubuntu/trusty/geis/trusty

« back to all changes in this revision

Viewing changes to libgeis/geis_subscription.c

  • Committer: Package Import Robot
  • Author(s): Stephen M. Webb
  • Date: 2012-11-09 13:57:29 UTC
  • mfrom: (1.1.2)
  • Revision ID: package-import@ubuntu.com-20121109135729-poludf0asjcht9sx
Tags: 2.2.13-0ubuntu1
* New upstream release.
* debian/control: bumped libgrail-dev build dependency to 3.0.8
* debian/patches: removed all patches (merged upstream)
* debian/patches: patched test case for missing symbols

Show diffs side-by-side

added added

removed removed

Lines of Context:
libgeis/geis_subscription.c
337
337
  if (sub->sub_backend_token)
338
338
  {
339
339
    status = geis_backend_token_deactivate(sub->sub_backend_token, sub);
340
 
    geis_backend_token_delete(sub->sub_backend_token);
341
 
    sub->sub_backend_token = NULL;
342
340
  }
343
341
  return status;
344
342
}
426
424
{
427
425
  geis_debug("destroying subscription \"%s\" id %d", sub->sub_name, sub->sub_id);
428
426
  geis_subscription_deactivate(sub);
 
427
 
 
428
  if (sub->sub_backend_token)
 
429
  {
 
430
    geis_backend_token_free_subscription_pdata(sub->sub_backend_token, sub);
 
431
    geis_backend_token_delete(sub->sub_backend_token);
 
432
    sub->sub_backend_token = NULL;
 
433
  }
 
434
 
429
435
  if (sub->sub_geis != NULL)
430
436
  {
431
437
    geis_unref(sub->sub_geis);
507
513
    geis_error("error adding filter to subscription");
508
514
    goto error_exit;
509
515
  }
 
516
  else
 
517
  {
 
518
    /* since we're taking ownership of the filter, we're removing the initial
 
519
       reference that belonged to the API user, created in geis_filter_new().
 
520
       Now the only remaining reference is the one held by our geis_filter_bag */
 
521
    geis_filter_unref(filter);
 
522
  }
510
523
 
511
524
error_exit:
512
525
  return status;