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

[galago-commits at freedesktop.org]

Author: chipx86
Date: 2006-04-11 23:44:01 -0700 (Tue, 11 Apr 2006)
New Revision: 2707

Modified:
   trunk/libgalago/ChangeLog
   trunk/libgalago/NEWS
   trunk/libgalago/libgalago/galago-core.c
   trunk/libgalago/libgalago/galago-core.h
Log:
Removed galago_set_exit_with_daemon() and galago_get_exit_with_daemon(). This caused deadlocks in some cases.  Feeds will need to connect to the GalagoCore's "unregistered" signal and exit themselves.


Modified: trunk/libgalago/ChangeLog
===================================================================
--- trunk/libgalago/ChangeLog	2006-04-12 06:41:23 UTC (rev 2706)
+++ trunk/libgalago/ChangeLog	2006-04-12 06:44:01 UTC (rev 2707)
@@ -1,3 +1,13 @@
+Tue Apr 11 23:43:37 PDT 2006  Christian Hammond <chipx86 at chipx86.com>
+
+	* libgalago/galago-core.c:
+	* libgalago/galago-core.h:
+	* NEWS:
+	  - Removed galago_set_exit_with_daemon() and
+	    galago_get_exit_with_daemon(). This caused deadlocks in some cases.
+	    Feeds will need to connect to the GalagoCore's "unregistered" signal
+	    and exit themselves.
+
 Tue Apr 11 02:44:44 PDT 2006  Christian Hammond <chipx86 at chipx86.com>
 
 	A m4/Makefile.am:

Modified: trunk/libgalago/NEWS
===================================================================
--- trunk/libgalago/NEWS	2006-04-12 06:41:23 UTC (rev 2706)
+++ trunk/libgalago/NEWS	2006-04-12 06:44:01 UTC (rev 2707)
@@ -31,6 +31,10 @@
 		  re-registers when it comes back up, without leaking memory. (Bug #34)
 		- Fixed issues where D-BUS could crash when initializing and
 		  uninitializing Galago several times. (Bug #36)
+		- Removed galago_set_exit_with_daemon() and
+		  galago_get_exit_with_daemon(). This caused deadlocks in some cases.
+		  Feeds will need to connect to the GalagoCore's "unregistered" signal
+		  and exit themselves.
 
 	Object model:
 		- Gave most objects GObject properties and property notifications.

Modified: trunk/libgalago/libgalago/galago-core.c
===================================================================
--- trunk/libgalago/libgalago/galago-core.c	2006-04-12 06:41:23 UTC (rev 2706)
+++ trunk/libgalago/libgalago/galago-core.c	2006-04-12 06:44:01 UTC (rev 2707)
@@ -62,7 +62,6 @@
 
 	gboolean daemon_active;
 
-	gboolean exit_with_daemon;
 	gboolean registering_connection;
 
 	guint block_signals;
@@ -376,10 +375,7 @@
 
 			if (old_owner_good)
 			{
-				if (galago_get_exit_with_daemon())
-					exit(0);
-				else
-					_galago_dbus_unregister_connection_finish();
+				_galago_dbus_unregister_connection_finish();
 			}
 
 			if (new_owner_good)
@@ -764,15 +760,11 @@
 static void
 _galago_core_disconnect(void)
 {
-	gboolean unregistered_emitted = FALSE;
-
 	if (_core->priv->dbus_conn != NULL)
 	{
 		if (!_core->priv->daemon && galago_is_registered())
 		{
 			_galago_dbus_unregister_connection();
-
-			unregistered_emitted = TRUE;
 		}
 
 		if (_core->priv->dbus_conn != NULL)
@@ -805,9 +797,6 @@
 
 	_core->priv->filters_added = FALSE;
 	_core->priv->registered    = FALSE;
-
-	if (!unregistered_emitted)
-		g_signal_emit(_core, signals[UNREGISTERED], 0);
 }
 
 GalagoAccount *
@@ -1059,22 +1048,6 @@
 	return _core->priv->watch_all;
 }
 
-void
-galago_set_exit_with_daemon(gboolean exit_with_daemon)
-{
-	g_return_if_fail(galago_is_initted());
-
-	_core->priv->exit_with_daemon = exit_with_daemon;
-}
-
-gboolean
-galago_get_exit_with_daemon(void)
-{
-	g_return_val_if_fail(galago_is_initted(), FALSE);
-
-	return _core->priv->exit_with_daemon;
-}
-
 GalagoService *
 galago_get_service(const char *id, GalagoOrigin origin, gboolean query)
 {

Modified: trunk/libgalago/libgalago/galago-core.h
===================================================================
--- trunk/libgalago/libgalago/galago-core.h	2006-04-12 06:41:23 UTC (rev 2706)
+++ trunk/libgalago/libgalago/galago-core.h	2006-04-12 06:44:01 UTC (rev 2707)
@@ -227,25 +227,6 @@
 gboolean galago_get_watch_all(void);
 
 /**
- * Sets whether or not the application should exit when the Galago
- * daemon disconnects.
- *
- * This is mainly only used for auto-launched feeds.
- *
- * @param exit_with_daemon TRUE if the application should exit with the
- *                         daemon, or FALSE.
- */
-void galago_set_exit_with_daemon(gboolean exit_with_daemon);
-
-/**
- * Returns whether or not the application should exit when the Galago
- * daemon disconnects.
- *
- * @return TRUE if the application should exit with the daemon, or FALSE.
- */
-gboolean galago_get_exit_with_daemon(void);
-
-/**
  * Creates a service and adds it to the local cache.
  *
  * The name and flags will be computed if the ID is understood internally.