From 6e19272a42d0eeff07edcd4cfb71ec346f7c959e Mon Sep 17 00:00:00 2001 From: Michal Labedzki Date: Thu, 28 Jun 2012 12:22:28 +0200 Subject: [PATCH] media: Rename set_property to set_player_property This is to avoid conflicts with DBus interface convention used in BlueZ. --- audio/media.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/audio/media.c b/audio/media.c index 195665332..00827d635 100644 --- a/audio/media.c +++ b/audio/media.c @@ -1454,7 +1454,7 @@ static gboolean set_position(struct media_player *mp, DBusMessageIter *iter) return TRUE; } -static gboolean set_property(struct media_player *mp, const char *key, +static gboolean set_player_property(struct media_player *mp, const char *key, DBusMessageIter *entry) { DBusMessageIter var; @@ -1515,7 +1515,7 @@ static gboolean property_changed(DBusConnection *connection, DBusMessage *msg, dbus_message_iter_next(&iter); - set_property(mp, property, &iter); + set_player_property(mp, property, &iter); return TRUE; } @@ -1747,7 +1747,7 @@ static gboolean parse_player_properties(struct media_player *mp, dbus_message_iter_get_basic(&entry, &key); dbus_message_iter_next(&entry); - if (set_property(mp, key, &entry) == FALSE) + if (set_player_property(mp, key, &entry) == FALSE) return FALSE; dbus_message_iter_next(&dict); -- 2.47.3