summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lasso/id-wsf/discovery.c19
-rw-r--r--lasso/id-wsf/discovery.h2
2 files changed, 12 insertions, 9 deletions
diff --git a/lasso/id-wsf/discovery.c b/lasso/id-wsf/discovery.c
index 8731f77d..20363a24 100644
--- a/lasso/id-wsf/discovery.c
+++ b/lasso/id-wsf/discovery.c
@@ -181,11 +181,12 @@ lasso_discovery_add_remove_entry(LassoDiscovery *discovery,
LassoDiscoRequestedServiceType*
lasso_discovery_add_requested_service_type(LassoDiscovery *discovery,
const gchar *serviceType,
- GList *options)
+/* GList *options) */
+ const char *option)
{
LassoDiscoQuery *query;
LassoDiscoRequestedServiceType *rst;
- LassoDiscoOptions *opts;
+ LassoDiscoOptions *opts = NULL;
g_return_val_if_fail(LASSO_IS_DISCOVERY(discovery), NULL);
g_return_val_if_fail(serviceType != NULL, NULL);
@@ -197,13 +198,15 @@ lasso_discovery_add_requested_service_type(LassoDiscovery *discovery,
/* optionals data */
/* create Options */
- if (options != NULL) {
- opts = lasso_disco_options_new();
- while (options != NULL) {
- opts->Option = g_list_append(opts->Option, options->data);
- options = g_list_next(options);
- }
+ if (option != NULL) {
+ opts->Option = g_list_append(opts->Option, (gpointer)option);
rst->Options = opts;
+/* opts = lasso_disco_options_new(); */
+/* while (options != NULL) { */
+/* opts->Option = g_list_append(opts->Option, options->data); */
+/* options = g_list_next(options); */
+/* } */
+/* rst->Options = opts; */
}
/* add RequestedServiceType */
diff --git a/lasso/id-wsf/discovery.h b/lasso/id-wsf/discovery.h
index 661ebac2..ef5442ca 100644
--- a/lasso/id-wsf/discovery.h
+++ b/lasso/id-wsf/discovery.h
@@ -88,7 +88,7 @@ LASSO_EXPORT gint lasso_discovery_add_remove_entry(LassoDiscov
LASSO_EXPORT LassoDiscoRequestedServiceType* lasso_discovery_add_requested_service_type(
LassoDiscovery *discovery,
const gchar *serviceType,
- GList *options);
+ const char *options); /* Was GList *options before */
LASSO_EXPORT gint lasso_discovery_add_resource_offering(
LassoDiscovery *discovery,