2007-05-03 Jorn Baayen <jorn@openedhand.com>

	* libgssdp/Makefile.am:
	* libgssdp/gssdp-client.c:
	* libgssdp/gssdp-resource-browser.c:
	(gssdp_resource_browser_get_property),
	(gssdp_resource_browser_set_property),
	(gssdp_resource_browser_class_init), (resource_available),
	(resource_unavailable), (received_discovery_response),
	(received_announcement), (message_received_cb):
	* libgssdp/gssdp-resource-browser.h:
	* libgssdp/gssdp-resource-group.c:
	(gssdp_resource_group_get_property),
	(gssdp_resource_group_set_property),
	(gssdp_resource_group_class_init),
	(gssdp_resource_group_remove_resource), (message_received_cb),
	(discovery_response_timeout), (discovery_response_free),
	(resource_alive), (resource_byebye):
	* libgssdp/gssdp-resource-group.h:
	* libgssdp/gssdp-service-browser.c:
	* libgssdp/gssdp-service-browser.h:
	* libgssdp/gssdp-service-group.c:
	* libgssdp/gssdp-service-group.h:
	* libgssdp/gssdp.h:
	* tests/test-browser.c: (resource_available_cb), (main):
	* tests/test-publish.c: (main):

	Rename ServiceBrowser and ServiceGroup to ResourceBrowser
	and ServiceGroup as to be consistent with the UPnP book.



git-svn-id: https://svn.o-hand.com/repos/gupnp/gssdp@181 d8cb91d7-bff9-0310-92b9-80b65e4482b2

2 files changed, 24 insertions, 24 deletions

diff --git a/tests/test-browser.c b/tests/test-browser.c
index 86e24c2..126dcfe 100644
--- a/tests/test-browser.c
+++ b/tests/test-browser.c
@@ -22,13 +22,13 @@
 #include <libgssdp/gssdp.h>
 
 static void
-service_available_cb (GSSDPServiceBrowser *service_browser,
-                      const char          *usn,
-                      GList               *locations)
+resource_available_cb (GSSDPResourceBrowser *resource_browser,
+                       const char           *usn,
+                       GList                *locations)
 {
         GList *l;
 
-        g_print ("service available\n"
+        g_print ("resource available\n"
                  "  USN:      %s\n",
                  usn);
         
@@ -37,10 +37,10 @@ service_available_cb (GSSDPServiceBrowser *service_browser,
 }
 
 static void
-service_unavailable_cb (GSSDPServiceBrowser *service_browser,
-                        const char          *usn)
+resource_unavailable_cb (GSSDPResourceBrowser *resource_browser,
+                         const char           *usn)
 {
-        g_print ("service unavailable\n"
+        g_print ("resource unavailable\n"
                  "  USN:      %s\n",
                  usn);
 }
@@ -50,7 +50,7 @@ main (int    argc,
       char **argv)
 {
         GSSDPClient *client;
-        GSSDPServiceBrowser *service_browser;
+        GSSDPResourceBrowser *resource_browser;
         GError *error;
         GMainLoop *main_loop;
 
@@ -66,25 +66,25 @@ main (int    argc,
                 return 1;
         }
 
-        service_browser = gssdp_service_browser_new (client,
-                                                     "upnp:rootdevice");
+        resource_browser = gssdp_resource_browser_new (client,
+                                                       "upnp:rootdevice");
 
-        g_signal_connect (service_browser,
-                          "service-available",
-                          G_CALLBACK (service_available_cb),
+        g_signal_connect (resource_browser,
+                          "resource-available",
+                          G_CALLBACK (resource_available_cb),
                           NULL);
-        g_signal_connect (service_browser,
-                          "service-unavailable",
-                          G_CALLBACK (service_unavailable_cb),
+        g_signal_connect (resource_browser,
+                          "resource-unavailable",
+                          G_CALLBACK (resource_unavailable_cb),
                           NULL);
 
-        gssdp_service_browser_set_active (service_browser, TRUE);
+        gssdp_resource_browser_set_active (resource_browser, TRUE);
 
         main_loop = g_main_loop_new (NULL, FALSE);
         g_main_loop_run (main_loop);
         g_main_loop_unref (main_loop);
 
-        g_object_unref (service_browser);
+        g_object_unref (resource_browser);
         g_object_unref (client);
 
         return 0;
diff --git a/tests/test-publish.c b/tests/test-publish.c
index 82b1683..aebe214 100644
--- a/tests/test-publish.c
+++ b/tests/test-publish.c
@@ -26,7 +26,7 @@ main (int    argc,
       char **argv)
 {
         GSSDPClient *client;
-        GSSDPServiceGroup *service_group;
+        GSSDPResourceGroup *resource_group;
         GError *error;
         GMainLoop *main_loop;
 
@@ -42,21 +42,21 @@ main (int    argc,
                 return 1;
         }
 
-        service_group = gssdp_service_group_new (client);
+        resource_group = gssdp_resource_group_new (client);
 
-        gssdp_service_group_add_service_simple
-                (service_group,
+        gssdp_resource_group_add_resource_simple
+                (resource_group,
                  "upnp:rootdevice",
                  "uuid:1234abcd-12ab-12ab-12ab-1234567abc12::upnp:rootdevice",
                  "http://192.168.1.100/");
 
-        gssdp_service_group_set_available (service_group, TRUE);
+        gssdp_resource_group_set_available (resource_group, TRUE);
 
         main_loop = g_main_loop_new (NULL, FALSE);
         g_main_loop_run (main_loop);
         g_main_loop_unref (main_loop);
 
-        g_object_unref (service_group);
+        g_object_unref (resource_group);
         g_object_unref (client);
 
         return 0;