X-Git-Url: http://git.maemo.org/git/?p=espeaktime;a=blobdiff_plain;f=src%2Fconfig.c;h=46773bed43493db1dedec6ad36d7403d92b24f25;hp=8eadd3f78ea3692b9d660261e9fe97022db02641;hb=df91e1a4c233ce7d23b70136b1158fa98d6c59c1;hpb=9f203c4dbeb3095816d839fd317c3c680bf17fd5

diff --git a/src/config.c b/src/config.c
index 8eadd3f..46773be 100644
--- a/src/config.c
+++ b/src/config.c
@@ -14,7 +14,7 @@ void cfg_read(GConfClient *client, struct espeaktime_settings *cfg)
 	cfg->amplitude = gconf_client_get_int(client, GCONF_KEY "/amplitude", NULL);
 	cfg->pitch = gconf_client_get_int(client, GCONF_KEY "/pitch", NULL);
 	cfg->speed = gconf_client_get_int(client, GCONF_KEY "/speed", NULL);
-	cfg->ignore_silent = gconf_client_get_bool(client, GCONF_KEY "/ignore_silent", NULL);
+	cfg->ignore_silent = !gconf_client_get_bool(client, GCONF_KEY "/obey_silent_profile", NULL);
 	if (!cfg->voice)
 		cfg->voice = g_strdup("en-us");
 	if (!cfg->effect)
@@ -27,7 +27,6 @@ void cfg_read(GConfClient *client, struct espeaktime_settings *cfg)
 		cfg->pitch = 50;
 	if (!cfg->speed)
 		cfg->speed = 170;
-	/* TODO: default ignore_silent to TRUE */
 }
 
 void cfg_write(GConfClient *client, struct espeaktime_settings *cfg)
@@ -39,7 +38,7 @@ void cfg_write(GConfClient *client, struct espeaktime_settings *cfg)
 	gconf_client_set_int(client, GCONF_KEY "/amplitude", cfg->amplitude, NULL);
 	gconf_client_set_int(client, GCONF_KEY "/pitch", cfg->pitch, NULL);
 	gconf_client_set_int(client, GCONF_KEY "/speed", cfg->speed, NULL);
-	gconf_client_set_bool(client, GCONF_KEY "/ignore_silent", cfg->ignore_silent, NULL);
+	gconf_client_set_bool(client, GCONF_KEY "/obey_silent_profile", !cfg->ignore_silent, NULL);
 }
 
 void cfg_free(struct espeaktime_settings *cfg)
@@ -70,11 +69,12 @@ void cfg_speak(struct espeaktime_settings *cfg, gboolean test_mode)
 	strftime(text, sizeof(text), cfg->text, tm);
 
 	setenv("EST_TESTMODE", test_mode ? "1" : "0", 1);
-	setenv("EST_IGN_SILENT", cfg->ignore_silent ? "1" : "0", 1);
+	setenv("EST_IGN_SILENT", (cfg->ignore_silent || test_mode)
+		? "1" : "0", 1);
 
 	pid = fork();
 	if (pid < 0) {
-		perror("fork");
+		g_print("fork: %s", g_strerror(errno));
 		return;
 	}
 	if (pid)