NetworkManager r3267 - in branches/NETWORKMANAGER_0_6_0_RELEASE: . gnome/libnm_glib

[dcbw svn gnome org]

Author: dcbw
Date: Thu Jan 24 03:06:48 2008
New Revision: 3267
URL: http://svn.gnome.org/viewvc/NetworkManager?rev=3267&view=rev

Log:
2008-01-23  Dan Williams  <dcbw redhat com>

	* libnm-glib/libnm_glib.c
		- (libnm_glib_init): make thread joinable
		- (libnm_glib_ctx_free): join thread on exit to clean up memory



Modified:
   branches/NETWORKMANAGER_0_6_0_RELEASE/ChangeLog
   branches/NETWORKMANAGER_0_6_0_RELEASE/gnome/libnm_glib/libnm_glib.c

Modified: branches/NETWORKMANAGER_0_6_0_RELEASE/gnome/libnm_glib/libnm_glib.c
==============================================================================
--- branches/NETWORKMANAGER_0_6_0_RELEASE/gnome/libnm_glib/libnm_glib.c	(original)
+++ branches/NETWORKMANAGER_0_6_0_RELEASE/gnome/libnm_glib/libnm_glib.c	Thu Jan 24 03:06:48 2008
@@ -40,8 +40,10 @@
 	DBusConnection	*	dbus_con;
 	guint			dbus_watcher;
 	guint			dbus_watch_interval;
+
 	gboolean			thread_done;
 	gboolean			thread_inited;
+	GThread *			thread;
 
 	GSList *			callbacks;
 	GMutex *			callbacks_lock;
@@ -458,6 +460,9 @@
 	g_slist_foreach (ctx->callbacks, (GFunc)g_free, NULL);
 	g_slist_free (ctx->callbacks);
 
+	if (ctx->thread)
+		g_thread_join (ctx->thread);
+
 	memset (ctx, 0, sizeof (libnm_glib_ctx));
 	memset (&(ctx->check), 0xDD, sizeof (ctx->check));
 	g_free (ctx);
@@ -488,7 +493,6 @@
 libnm_glib_ctx *
 libnm_glib_init (void)
 {
-	GError	*error = NULL;
 	libnm_glib_ctx	*ctx = NULL;
 
 	g_type_init ();
@@ -496,15 +500,12 @@
 		g_thread_init (NULL);
 	dbus_g_thread_init ();
 
-	if (!(ctx = libnm_glib_ctx_new()))
+	if (!(ctx = libnm_glib_ctx_new ()))
 		return NULL;
 
-	if (!g_thread_create (libnm_glib_dbus_worker, ctx, FALSE, &error))
-	{
-		if (error)
-			g_error_free (error);
+	ctx->thread = g_thread_create (libnm_glib_dbus_worker, ctx, TRUE, NULL);
+	if (!ctx->thread)
 		goto error;	
-	}
 
 	/* Wait until initialization of the thread */
 	while (!ctx->thread_inited)