diff options
| author | Johan Hedberg <johan.hedberg@nokia.com> | 2008-03-05 17:51:48 +0000 |
|---|---|---|
| committer | Johan Hedberg <johan.hedberg@nokia.com> | 2008-03-05 17:51:48 +0000 |
| commit | ce8053e02539f99b025054c0055cf4d0ca1485e7 (patch) | |
| tree | 9aca734f8a927f6c7a2454429379ab60a8f07441 | |
| parent | 5db61cea279f4aae935b073dca99bb6ba37d4d4a (diff) | |
Rename ForceMaster to just Master
| -rw-r--r-- | audio/audio.conf | 2 | ||||
| -rw-r--r-- | audio/avdtp.c | 2 | ||||
| -rw-r--r-- | audio/control.c | 2 | ||||
| -rw-r--r-- | audio/manager.c | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/audio/audio.conf b/audio/audio.conf index 4ae2dacc..7f760ea6 100644 --- a/audio/audio.conf +++ b/audio/audio.conf @@ -5,7 +5,7 @@ [General] # Switch to master role for incoming connections (defaults to true) -#ForceMaster=true +#Master=true # If we want to disable support for specific services # Defaults to supporting all implemented services diff --git a/audio/avdtp.c b/audio/avdtp.c index 22e042d4..a92d1281 100644 --- a/audio/avdtp.c +++ b/audio/avdtp.c @@ -2991,7 +2991,7 @@ int avdtp_init(GKeyFile *config) if (avdtp_server) return 0; - tmp = g_key_file_get_boolean(config, "General", "ForceMaster", + tmp = g_key_file_get_boolean(config, "General", "Master", &err); if (err) { debug("audio.conf: %s", err->message); diff --git a/audio/control.c b/audio/control.c index 2c8f03ba..861241b5 100644 --- a/audio/control.c +++ b/audio/control.c @@ -989,7 +989,7 @@ int avrcp_init(DBusConnection *conn, GKeyFile *config) return 0; - tmp = g_key_file_get_boolean(config, "General", "ForceMaster", + tmp = g_key_file_get_boolean(config, "General", "Master", &err); if (err) { debug("audio.conf: %s", err->message); diff --git a/audio/manager.c b/audio/manager.c index 461090a3..c0f4ffd1 100644 --- a/audio/manager.c +++ b/audio/manager.c @@ -1554,7 +1554,7 @@ static int headset_server_init(DBusConnection *conn, GKeyFile *config) if (config) { gboolean tmp; - tmp = g_key_file_get_boolean(config, "General", "ForceMaster", + tmp = g_key_file_get_boolean(config, "General", "Master", &err); if (err) { debug("audio.conf: %s", err->message); |