← Back to branch summary

~morphis/phablet-extras/ofono-sms-status-report

« back to all changes in this revision

Viewing changes to gdbus/watch.c

  • Committer: Package Import Robot
  • Author(s): Mathieu Trudel-Lapierre
  • Date: 2012-08-22 19:59:08 UTC
  • mfrom: (1.3.3) (6.1.5 experimental)
  • Revision ID: package-import@ubuntu.com-20120822195908-0bmmk1hlh989bgk6
Tags: 1.9-1ubuntu1
https://launchpad.net/bugs/600501
* Merge with Debian experimental; remaining changes:
  - debian/control: explicitly Conflicts with modemmanager: having both
    installed / running at the same time causes issues causes issues with
    both claiming modem devices.
  - debian/patches/02-dont-handle-stacktraces.patch: stop catching stacktraces
    and printing the information internally, so apport can catch and report
    the possible bugs.
  - debian/ofono.postinst: on configure, notify the user that a reboot is
    required (so ofono can get started by upstart). (LP: #600501)
  - debian/rules: pass --no-restart-on-upgrade so ofono isn't automatically
    restarted when upgrades.
  - Adding upstart config / Removing standard init script
  - Adding Apport support
  - Patch for recognizing special Huawei devices with weird serial
  - Override lintian to avoid script-in-etc-init.d... warnings.
  - Update debian/compat to 7
* debian/series: add our patches to debian/patches/series now that the package
  uses quilt.
* debian/patches/02-dont-handle-stacktraces.patch: refreshed.
* debian/ofono-dev.install, debian/ofono.install:
  - Install usr/sbin/dundee and ofono.pc to the proper packages.

Show diffs side-by-side

added added

removed removed

Lines of Context:
gdbus/watch.c
376
376
 
377
377
        connection = dbus_connection_ref(data->connection);
378
378
        listeners = g_slist_remove(listeners, data);
379
 
        filter_data_free(data);
380
379
 
381
380
        /* Remove filter if there are no listeners left for the connection */
382
 
        data = filter_data_find(connection, NULL, NULL, NULL, NULL, NULL,
383
 
                                        NULL);
384
 
        if (data == NULL)
 
381
        if (filter_data_find(connection, NULL, NULL, NULL, NULL, NULL,
 
382
                                                                NULL) == NULL)
385
383
                dbus_connection_remove_filter(connection, message_filter,
386
384
                                                NULL);
387
385
 
 
386
        filter_data_free(data);
388
387
        dbus_connection_unref(connection);
389
388
 
390
389
        return TRUE;
537
536
        remove_match(data);
538
537
 
539
538
        listeners = g_slist_remove(listeners, data);
540
 
        filter_data_free(data);
541
539
 
542
 
        /* Remove filter if there no listener left for the connection */
543
 
        data = filter_data_find(connection, NULL, NULL, NULL, NULL, NULL,
544
 
                                        NULL);
545
 
        if (data == NULL)
 
540
        /* Remove filter if there are no listeners left for the connection */
 
541
        if (filter_data_find(connection, NULL, NULL, NULL, NULL, NULL,
 
542
                                                                NULL) == NULL)
546
543
                dbus_connection_remove_filter(connection, message_filter,
547
544
                                                NULL);
548
545
 
 
546
        filter_data_free(data);
 
547
 
549
548
        return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
550
549
}
551
550
 
666
665
        if (data == NULL)
667
666
                return 0;
668
667
 
669
 
        cb = filter_data_add_callback(data, connect, disconnect, NULL, NULL,
 
668
        cb = filter_data_add_callback(data, connect, disconnect, NULL, destroy,
670
669
                                        user_data);
671
670
        if (cb == NULL)
672
671
                return 0;