[PATCH 1/1] Use speech-dispatcher instead of speechd in paths.

[Andrei Kholodnyi]

This is a patch retrieved from Debian distro

speech-dispatcher name is used for log files instead of speechd
fixed usage etc/speech-dispatcher in conf
---
 config/speechd.conf        |    6 +++---
 doc/speech-dispatcher.texi |    4 ++--
 src/server/options.c       |    2 +-
 src/server/set.c           |    2 +-
 src/server/speechd.c       |    2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/config/speechd.conf b/config/speechd.conf
index 9f3cb9a..6eec028 100644
--- a/config/speechd.conf
+++ b/config/speechd.conf
@@ -65,7 +65,7 @@ LogDir  "default"
 # The CustomLogFile allows logging all messages of the given kind,
 # regardless their priority, to the given destination.
 
-#CustomLogFile "protocol" "/var/log/speech-dispatcher/speechd-protocol.log"
+#CustomLogFile "protocol" 
"/var/log/speech-dispatcher/speech-dispatcher-protocol.log"
 
 # ----- VOICE PARAMETERS -----
 
@@ -91,7 +91,7 @@ DefaultVolume 100
 # default.  Voice types are symbolic names which map to particular
 # voices provided by the synthesizer according to the output module
 # configuratuion.  Please see the synthesizer-specific configuration
-# in etc/speechd/modules/ to see which voices are assigned to
+# in etc/speech-dispatcher/modules/ to see which voices are assigned to
 # different symbolic names.  The following symbolic names are
 # currently supported: MALE1, MALE2, MALE3, FEMALE1, FEMALE2, FEMALE3,
 # CHILD_MALE, CHILD_FEMALE
@@ -204,7 +204,7 @@ DefaultVolume 100
 #  - binary is the path to the binary executable of this module,
 #    either relative (to lib/speech-dispatcher-modules/) or absolute
 #  - configuration is the path to the config file of this module,
-#    either relative (to etc/speechd/modules/) or absolute
+#    either relative (to etc/speech-dispatcher/modules/) or absolute
 
 AddModule "espeak"       "sd_espeak"   "espeak.conf"
 AddModule "festival"     "sd_festival"  "festival.conf"
diff --git a/doc/speech-dispatcher.texi b/doc/speech-dispatcher.texi
index d015a4f..667a2fb 100644
--- a/doc/speech-dispatcher.texi
+++ b/doc/speech-dispatcher.texi
@@ -540,8 +540,8 @@ spd-conf -d
 
 @item
 Check the appropriate logfile in
- at file{~/.speech-dispatcher/logs/speechd.log} for user Speech
-Dispatcher or in @file{/var/log/speech-dispatcher/speechd.log}. Look
+ at file{~/.speech-dispatcher/logs/speech-dispatcher.log} for user Speech
+Dispatcher or in @file{/var/log/speech-dispatcher/speech-dispatcher.log}. Look
 for lines containing the string 'ERROR' and their surrounding
 contents. If you hear no speech, restart Speech Dispatcher and look
 near the end of the log file -- before any attempts for synthesis of
diff --git a/src/server/options.c b/src/server/options.c
index 21c360c..c4ed236 100644
--- a/src/server/options.c
+++ b/src/server/options.c
@@ -177,7 +177,7 @@ options_parse(int argc, char *argv[])
            exit(1);
          }
            
-         debug_logfile_path = g_strdup_printf("%s/speechd.log",
+         debug_logfile_path = g_strdup_printf("%s/speech-dispatcher.log",
                                               
SpeechdOptions.debug_destination);
          /* Open logfile for writing */
          debug_logfile = fopen(debug_logfile_path, "wx");
diff --git a/src/server/set.c b/src/server/set.c
index 7fb5956..f35ad87 100644
--- a/src/server/set.c
+++ b/src/server/set.c
@@ -385,7 +385,7 @@ set_debug_uid(int uid, int debug)
   if (!SpeechdOptions.debug && !debug) return 1;
  
   if (debug){
-    debug_logfile_path = g_strdup_printf("%s/speechd.log", 
SpeechdOptions.debug_destination);
+    debug_logfile_path = g_strdup_printf("%s/speech-dispatcher.log", 
SpeechdOptions.debug_destination);
 
     debug_logfile = fopen(debug_logfile_path, "w");
     if (debug_logfile == NULL){
diff --git a/src/server/speechd.c b/src/server/speechd.c
index 547a937..e6aabae 100644
--- a/src/server/speechd.c
+++ b/src/server/speechd.c
@@ -799,7 +799,7 @@ destroy_pid_file(void)
 void
 logging_init(void)
 {
-  char *file_name = g_strdup_printf("%s/speechd.log", SpeechdOptions.log_dir); 
   
+  char *file_name = g_strdup_printf("%s/speech-dispatcher.log", 
SpeechdOptions.log_dir);
   assert(file_name != NULL);
   if (!strncmp(file_name,"stdout",6)){
     logfile = stdout;
-- 
1.6.0.4