[Galago-commits] r2658 - in trunk/libgalago: . libgalago

[galago-commits at freedesktop.org]

Author: chipx86
Date: 2006-04-02 16:37:12 -0700 (Sun, 02 Apr 2006)
New Revision: 2658

Modified:
   trunk/libgalago/ChangeLog
   trunk/libgalago/libgalago/galago-core.c
   trunk/libgalago/libgalago/galago-core.h
Log:
Remove galago_add_service() and galago_remove_service().


Modified: trunk/libgalago/ChangeLog
===================================================================
--- trunk/libgalago/ChangeLog	2006-04-02 23:29:18 UTC (rev 2657)
+++ trunk/libgalago/ChangeLog	2006-04-02 23:37:12 UTC (rev 2658)
@@ -1,3 +1,9 @@
+Sun Apr 02 16:36:58 PDT 2006  Christian Hammond <chipx86 at chipx86.com>
+
+	* libgalago/galago-core.c:
+	* libgalago/galago-core.h:
+	  - Remove galago_add_service() and galago_remove_service().
+
 Sun Apr 02 16:28:17 PDT 2006  Christian Hammond <chipx86 at chipx86.com>
 
 	* libgalago/galago-context.c:

Modified: trunk/libgalago/libgalago/galago-core.c
===================================================================
--- trunk/libgalago/libgalago/galago-core.c	2006-04-02 23:29:18 UTC (rev 2657)
+++ trunk/libgalago/libgalago/galago-core.c	2006-04-02 23:37:12 UTC (rev 2658)
@@ -1044,28 +1044,6 @@
 	return _core->exit_with_daemon;
 }
 
-void
-galago_add_service(GalagoService *service)
-{
-	g_return_if_fail(galago_is_initted());
-	g_return_if_fail(service != NULL);
-
-	galago_context_push(galago_object_get_context(GALAGO_OBJECT(_core)));
-	galago_context_add_service(service);
-	galago_context_pop();
-}
-
-void
-galago_remove_service(GalagoService *service)
-{
-	g_return_if_fail(galago_is_initted());
-	g_return_if_fail(service != NULL);
-
-	galago_context_push(galago_object_get_context(GALAGO_OBJECT(_core)));
-	galago_context_remove_service(service);
-	galago_context_pop();
-}
-
 GalagoService *
 galago_get_service(const char *id, GalagoOrigin origin, gboolean query)
 {
@@ -1295,17 +1273,12 @@
 	_core->daemon_active = FALSE;
 	_core->registered = FALSE;
 
-	if (_core->uid)
-	{
-		g_free (_core->uid);
-		_core->uid = NULL;
-	}
-	if (_core->conn_obj_path)
-	{
-		g_free (_core->conn_obj_path);
-		_core->conn_obj_path = NULL;
-	}
+	g_free (_core->uid);
+	g_free (_core->conn_obj_path);
 
+	_core->uid = NULL;
+	_core->conn_obj_path = NULL;
+
 	g_signal_emit(_core, signals[UNREGISTERED], 0);
 }
 

Modified: trunk/libgalago/libgalago/galago-core.h
===================================================================
--- trunk/libgalago/libgalago/galago-core.h	2006-04-02 23:29:18 UTC (rev 2657)
+++ trunk/libgalago/libgalago/galago-core.h	2006-04-02 23:37:12 UTC (rev 2658)
@@ -178,20 +178,6 @@
 									 GalagoServiceFlags flags);
 
 /**
- * Adds a service to Galago's services cache.
- *
- * @param service The service to add.
- */
-void galago_add_service(GalagoService *service);
-
-/**
- * Removes a service from Galago's services cache.
- *
- * @param service The service to remove.
- */
-void galago_remove_service(GalagoService *service);
-
-/**
  * Returns the service with the specified ID.
  *
  * @param id     The service ID.