OLD | NEW |
1 /* | 1 /* |
2 * Copyright 2004 The WebRTC Project Authors. All rights reserved. | 2 * Copyright 2004 The WebRTC Project Authors. All rights reserved. |
3 * | 3 * |
4 * Use of this source code is governed by a BSD-style license | 4 * Use of this source code is governed by a BSD-style license |
5 * that can be found in the LICENSE file in the root of the source | 5 * that can be found in the LICENSE file in the root of the source |
6 * tree. An additional intellectual property rights grant can be found | 6 * tree. An additional intellectual property rights grant can be found |
7 * in the file PATENTS. All contributing project authors may | 7 * in the file PATENTS. All contributing project authors may |
8 * be found in the AUTHORS file in the root of the source tree. | 8 * be found in the AUTHORS file in the root of the source tree. |
9 */ | 9 */ |
10 | 10 |
(...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
94 ASSERT(instance); | 94 ASSERT(instance); |
95 if (instance) { | 95 if (instance) { |
96 return static_cast<DBusSigFilter *>(instance)->Callback(message); | 96 return static_cast<DBusSigFilter *>(instance)->Callback(message); |
97 } | 97 } |
98 return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; | 98 return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; |
99 } | 99 } |
100 | 100 |
101 // Posts a message to caller thread. | 101 // Posts a message to caller thread. |
102 DBusHandlerResult DBusSigFilter::Callback(DBusMessage *message) { | 102 DBusHandlerResult DBusSigFilter::Callback(DBusMessage *message) { |
103 if (caller_thread_) { | 103 if (caller_thread_) { |
104 caller_thread_->Post(this, DSM_SIGNAL, new DBusSigMessageData(message)); | 104 caller_thread_->Post(RTC_FROM_HERE, this, DSM_SIGNAL, |
| 105 new DBusSigMessageData(message)); |
105 } | 106 } |
106 // Don't "eat" the message here. Let it pop up. | 107 // Don't "eat" the message here. Let it pop up. |
107 return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; | 108 return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; |
108 } | 109 } |
109 | 110 |
110 // From MessageHandler. | 111 // From MessageHandler. |
111 void DBusSigFilter::OnMessage(Message *message) { | 112 void DBusSigFilter::OnMessage(Message *message) { |
112 if (message != NULL && DSM_SIGNAL == message->message_id) { | 113 if (message != NULL && DSM_SIGNAL == message->message_id) { |
113 DBusSigMessageData *msg = | 114 DBusSigMessageData *msg = |
114 static_cast<DBusSigMessageData *>(message->pdata); | 115 static_cast<DBusSigMessageData *>(message->pdata); |
(...skipping 276 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
391 | 392 |
392 void DBusMonitor::OnMonitoringStatusChanged(DBusMonitorStatus status) { | 393 void DBusMonitor::OnMonitoringStatusChanged(DBusMonitorStatus status) { |
393 status_ = status; | 394 status_ = status; |
394 } | 395 } |
395 | 396 |
396 #undef LATE | 397 #undef LATE |
397 | 398 |
398 } // namespace rtc | 399 } // namespace rtc |
399 | 400 |
400 #endif // HAVE_DBUS_GLIB | 401 #endif // HAVE_DBUS_GLIB |
OLD | NEW |