diff options
author | martin-s <martin-s@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2008-10-27 15:58:27 +0000 |
---|---|---|
committer | martin-s <martin-s@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2008-10-27 15:58:27 +0000 |
commit | 2d931e8310372023a069ba5499b954f9ae54d206 (patch) | |
tree | 36d5f8e215140a1fc7d0225a0f357995c81d75d4 /navit/speech | |
parent | 8e93295b3b9e42934839ba412cf1df7af3f4b1b3 (diff) | |
download | navit-2d931e8310372023a069ba5499b954f9ae54d206.tar.gz |
Fix:Core:Further cleanups
git-svn-id: http://svn.code.sf.net/p/navit/code/trunk/navit@1580 ffa7fe5e-494d-0410-b361-a75ebd5db220
Diffstat (limited to 'navit/speech')
-rw-r--r-- | navit/speech/cmdline/speech_cmdline.c | 7 | ||||
-rw-r--r-- | navit/speech/speech_dispatcher/speech_speech_dispatcher.c | 2 |
2 files changed, 6 insertions, 3 deletions
diff --git a/navit/speech/cmdline/speech_cmdline.c b/navit/speech/cmdline/speech_cmdline.c index 037bc84ef..5576e5dea 100644 --- a/navit/speech/cmdline/speech_cmdline.c +++ b/navit/speech/cmdline/speech_cmdline.c @@ -20,6 +20,7 @@ #include <stdlib.h> #include <glib.h> #include "config.h" +#include "item.h" #include "plugin.h" #include "speech.h" @@ -48,12 +49,14 @@ static struct speech_methods speechd_meth = { }; static struct speech_priv * -speechd_new(char *data, struct speech_methods *meth) { +speechd_new(struct speech_methods *meth, struct attr **attrs) { struct speech_priv *this; + struct attr *data; + data=attr_search(attrs, NULL, attr_data); if (! data) return NULL; this=g_new(struct speech_priv,1); - this->cmdline=g_strdup(data); + this->cmdline=g_strdup(data->u.str); *meth=speechd_meth; return this; } diff --git a/navit/speech/speech_dispatcher/speech_speech_dispatcher.c b/navit/speech/speech_dispatcher/speech_speech_dispatcher.c index 524645ef9..b2c0e2a0e 100644 --- a/navit/speech/speech_dispatcher/speech_speech_dispatcher.c +++ b/navit/speech/speech_dispatcher/speech_speech_dispatcher.c @@ -57,7 +57,7 @@ static struct speech_methods speechd_meth = { }; static struct speech_priv * -speechd_new(char *data, struct speech_methods *meth) { +speechd_new(struct speech_methods *meth, struct attr **attrs) { struct speech_priv *this; SPDConnection *conn; |