diff options
| author | Daniel Mack <daniel@caiaq.de> | 2009-11-24 17:38:25 +0100 |
|---|---|---|
| committer | Daniel Mack <daniel@caiaq.de> | 2009-11-24 17:38:25 +0100 |
| commit | d5d488e33d85549c81d007497c8301c920d0a6e4 (patch) | |
| tree | 5805a0dfc83aa8306a16f0b96f49530aa46c8765 /src/modules/dbus/iface-sample.c | |
| parent | ed7642ebac32bde8d9c47f3a1d8eabf75c3ea986 (diff) | |
| parent | 0fcdc3d15d759e576ba3d71cc874c1036dcd36a0 (diff) | |
Merge branch 'master' of git://0pointer.de/pulseaudio
Diffstat (limited to 'src/modules/dbus/iface-sample.c')
| -rw-r--r-- | src/modules/dbus/iface-sample.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/modules/dbus/iface-sample.c b/src/modules/dbus/iface-sample.c index b0542a60..c1fa193c 100644 --- a/src/modules/dbus/iface-sample.c +++ b/src/modules/dbus/iface-sample.c @@ -450,7 +450,7 @@ static void handle_remove(DBusConnection *conn, DBusMessage *msg, void *userdata static void subscription_cb(pa_core *c, pa_subscription_event_type_t t, uint32_t idx, void *userdata) { pa_dbusiface_sample *s = userdata; - DBusMessage *signal = NULL; + DBusMessage *signal_msg = NULL; pa_assert(c); pa_assert(s); @@ -468,15 +468,15 @@ static void subscription_cb(pa_core *c, pa_subscription_event_type_t t, uint32_t pa_proplist_update(s->proplist, PA_UPDATE_SET, s->sample->proplist); - pa_assert_se(signal = dbus_message_new_signal(s->path, - PA_DBUSIFACE_SAMPLE_INTERFACE, - signals[SIGNAL_PROPERTY_LIST_UPDATED].name)); - dbus_message_iter_init_append(signal, &msg_iter); + pa_assert_se(signal_msg = dbus_message_new_signal(s->path, + PA_DBUSIFACE_SAMPLE_INTERFACE, + signals[SIGNAL_PROPERTY_LIST_UPDATED].name)); + dbus_message_iter_init_append(signal_msg, &msg_iter); pa_dbus_append_proplist(&msg_iter, s->proplist); - pa_dbus_protocol_send_signal(s->dbus_protocol, signal); - dbus_message_unref(signal); - signal = NULL; + pa_dbus_protocol_send_signal(s->dbus_protocol, signal_msg); + dbus_message_unref(signal_msg); + signal_msg = NULL; } } |