korg/bluez
0
0
Fork 0
mirror of https://git.kernel.org/pub/scm/bluetooth/bluez.git synced 2024-11-18 01:34:31 +08:00
Code Issues Packages Projects Releases Wiki Activity

Use g_key_file_get_string_list instead of g_key_file_get_string

Browse Source
This commit is contained in:
Johan Hedberg 2008-05-16 12:49:57 +00:00
parent 3642221a79
commit 86ca72eb30
2 changed files with 46 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
audio/manager.c
View File

@ -1460,53 +1460,47 @@ static void server_exit(void)
int audio_manager_init(DBusConnection *conn, GKeyFile *config)
{
char *str;
GError *err = NULL;
char **list;
int i;
connection = dbus_connection_ref(conn);
if (config) {
str = g_key_file_get_string(config, "General", "Enable", &err);
if (!config)
goto proceed;
if (err) {
debug("audio.conf: %s", err->message);
g_error_free(err);
err = NULL;
} else {
if (strstr(str, "Headset"))
enabled.headset = TRUE;
if (strstr(str, "Gateway"))
enabled.gateway = TRUE;
if (strstr(str, "Sink"))
enabled.sink = TRUE;
if (strstr(str, "Source"))
enabled.source = TRUE;
if (strstr(str, "Control"))
enabled.control = TRUE;
g_free(str);
}
str = g_key_file_get_string(config, "General", "Disable", &err);
if (err) {
debug("audio.conf: %s", err->message);
g_error_free(err);
err = NULL;
} else {
if (strstr(str, "Headset"))
enabled.headset = FALSE;
if (strstr(str, "Gateway"))
enabled.gateway = FALSE;
if (strstr(str, "Sink"))
enabled.sink = FALSE;
if (strstr(str, "Source"))
enabled.source = FALSE;
if (strstr(str, "Control"))
enabled.control = FALSE;
g_free(str);
}
list = g_key_file_get_string_list(config, "General", "Enable",
NULL, NULL);
for (i = 0; list && list[i] != NULL; i++) {
if (g_str_equal(list[i], "Headset"))
enabled.headset = TRUE;
else if (g_str_equal(list[i], "Gateway"))
enabled.gateway = TRUE;
else if (g_str_equal(list[i], "Sink"))
enabled.sink = TRUE;
else if (g_str_equal(list[i], "Source"))
enabled.source = TRUE;
else if (g_str_equal(list[i], "Control"))
enabled.control = TRUE;
}
g_strfreev(list);
list = g_key_file_get_string_list(config, "General", "Disable",
NULL, NULL);
for (i = 0; list && list[i] != NULL; i++) {
if (g_str_equal(list[i], "Headset"))
enabled.headset = FALSE;
else if (g_str_equal(list[i], "Gateway"))
enabled.gateway = FALSE;
else if (g_str_equal(list[i], "Sink"))
enabled.sink = FALSE;
else if (g_str_equal(list[i], "Source"))
enabled.source = FALSE;
else if (g_str_equal(list[i], "Control"))
enabled.control = FALSE;
}
g_strfreev(list);
proceed:
if (!dbus_connection_create_object_path(conn, AUDIO_MANAGER_PATH,
NULL, manager_unregister)) {
error("D-Bus failed to register %s path", AUDIO_MANAGER_PATH);

19
network/main.c
View File

@ -68,7 +68,7 @@ static void read_config(const char *file)
{
GKeyFile *keyfile;
GError *err = NULL;
char *disabled;
char **disabled;
keyfile = g_key_file_new();
@ -78,19 +78,22 @@ static void read_config(const char *file)
goto done;
}
disabled = g_key_file_get_string(keyfile, "General",
"Disable", &err);
disabled = g_key_file_get_string_list(keyfile, "General",
"Disable", NULL, &err);
if (err) {
debug("%s: %s", file, err->message);
g_error_free(err);
err = NULL;
} else {
if (strstr(disabled, "Connection"))
conf.connection_enabled = FALSE;
if (strstr(disabled, "Server"))
conf.server_enabled = FALSE;
int i;
for (i = 0; disabled[i] != NULL; i++) {
if (g_str_equal(disabled[i], "Connection"))
conf.connection_enabled = FALSE;
else if (g_str_equal(disabled[i], "Server"))
conf.server_enabled = FALSE;
}
g_strfreev(disabled);
}
g_free(disabled);
conf.security = !g_key_file_get_boolean(keyfile, "General",
"DisableSecurity", &err);