diff options
| -rw-r--r-- | lasso/id-wsf/discovery.c | 10 | ||||
| -rw-r--r-- | lasso/id-wsf/discovery.h | 7 | ||||
| -rw-r--r-- | swig/Lasso-wsf.i | 3 |
3 files changed, 5 insertions, 15 deletions
diff --git a/lasso/id-wsf/discovery.c b/lasso/id-wsf/discovery.c index 3c1ba045..00f63f48 100644 --- a/lasso/id-wsf/discovery.c +++ b/lasso/id-wsf/discovery.c @@ -107,12 +107,10 @@ lasso_discovery_add_insert_entry(LassoDiscovery *discovery, const gchar *providerID, LassoDiscoDescription *description, LassoDiscoResourceID *resourceID, - LassoDiscoEncryptedResourceID *encryptedResourceID, - const char *option) + LassoDiscoEncryptedResourceID *encryptedResourceID) { LassoDiscoInsertEntry *entry; LassoDiscoModify *modify; - LassoDiscoOptions *opts; LassoDiscoResourceOffering *resource; LassoDiscoServiceInstance *service; @@ -133,12 +131,6 @@ lasso_discovery_add_insert_entry(LassoDiscovery *discovery, so increment reference count */ resource->ResourceID = g_object_ref(resourceID); resource->EncryptedResourceID = g_object_ref(encryptedResourceID); - /* optional data */ - if (option != NULL) { - opts = lasso_disco_options_new(); - opts->Option = g_list_append(opts->Option, g_strdup(option)); - resource->Options = opts; - } entry = lasso_disco_insert_entry_new(); entry->ResourceOffering = resource; diff --git a/lasso/id-wsf/discovery.h b/lasso/id-wsf/discovery.h index 1aae4c1b..9556d9c1 100644 --- a/lasso/id-wsf/discovery.h +++ b/lasso/id-wsf/discovery.h @@ -76,10 +76,9 @@ LASSO_EXPORT LassoDiscoInsertEntry* lasso_discovery_add_insert_entry( LassoDiscovery *discovery, const gchar *serviceType, const gchar *providerID, - LassoDiscoDescription *description, /* Was GList *descriptions before */ + LassoDiscoDescription *description, LassoDiscoResourceID *resourceID, - LassoDiscoEncryptedResourceID *encryptedResourceID, - const char *option); /* Was GList *options before */ + LassoDiscoEncryptedResourceID *encryptedResourceID); LASSO_EXPORT gint lasso_discovery_add_remove_entry(LassoDiscovery *discovery, const gchar *entryID); @@ -87,7 +86,7 @@ LASSO_EXPORT gint lasso_discovery_add_remove_entry(LassoDiscov LASSO_EXPORT LassoDiscoRequestedServiceType* lasso_discovery_add_requested_service_type( LassoDiscovery *discovery, const gchar *serviceType, - const char *options); /* Was GList *options before */ + const char *options); LASSO_EXPORT gint lasso_discovery_add_resource_offering( LassoDiscovery *discovery, diff --git a/swig/Lasso-wsf.i b/swig/Lasso-wsf.i index 55697746..249da464 100644 --- a/swig/Lasso-wsf.i +++ b/swig/Lasso-wsf.i @@ -2533,8 +2533,7 @@ typedef struct { char *providerID, LassoDiscoDescription *description, LassoDiscoResourceID *resourceID, - LassoDiscoEncryptedResourceID *encryptedResourceID, - char *option); + LassoDiscoEncryptedResourceID *encryptedResourceI); THROW_ERROR int addRemoveEntry(char *entryID); |