Fix:Core:Further cleanups

git-svn-id: http://svn.code.sf.net/p/navit/code/trunk/navit@1580 ffa7fe5e-494d-0410-b361-a75ebd5db220

2 files changed, 6 insertions, 3 deletions

diff --git a/navit/speech/cmdline/speech_cmdline.c b/navit/speech/cmdline/speech_cmdline.c
index 037bc84e..5576e5de 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 524645ef..b2c0e2a0 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;