← Back to branch summary

~phablet-team/ofono/update-ota9

« back to all changes in this revision

Viewing changes to gdbus/watch.c

  • Committer: CI Train Bot
  • Date: 2015-09-28 09:27:15 UTC
  • mfrom: (6903.1.1 ubuntu)
  • Revision ID: ci-train-bot@canonical.com-20150928092715-21sswfnod1pucdd3
https://launchpad.net/bugs/1486004
https://launchpad.net/bugs/1490673
https://launchpad.net/bugs/1490991
https://launchpad.net/bugs/1492483
* Update to upstream release 1.17
* Do not assert when the radio is unavailable (LP: #1490991)
* Fix crash when importing phonebook (LP: #1486004)
* Check only destination port when receiving push (LP: #1490673)
* Fix crash when retrying to close context (LP: #1492483)

Show diffs side-by-side

added added

removed removed

Lines of Context:
gdbus/watch.c
523
523
        member = dbus_message_get_member(message);
524
524
        dbus_message_get_args(message, NULL, DBUS_TYPE_STRING, &arg, DBUS_TYPE_INVALID);
525
525
 
526
 
        /* Sender is always the owner */
527
 
        if (sender == NULL)
528
 
                return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
 
526
        /* If sender != NULL it is always the owner */
529
527
 
530
528
        for (current = listeners; current != NULL; current = current->next) {
531
529
                data = current->data;
533
531
                if (connection != data->connection)
534
532
                        continue;
535
533
 
 
534
                if (!sender && data->owner)
 
535
                        continue;
 
536
 
536
537
                if (data->owner && g_str_equal(sender, data->owner) == FALSE)
537
538
                        continue;
538
539