2005-08-10 Robert Love <rml@novell.com>

* gnome/applet/applet.c: Make applet->dbus_thread joinable so we can
	  wait for it on exit; call exit() in nmwa_destroy() to jump ship.


git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@831 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
Robert Love 2005-08-10 15:18:34 +00:00 committed by Robert Love
parent ca7c51f6c4
commit bf6240910d
2 changed files with 8 additions and 1 deletions

View file

@ -1,3 +1,8 @@
2005-08-10 Robert Love <rml@novell.com>
* gnome/applet/applet.c: Make applet->dbus_thread joinable so we can
wait for it on exit; call exit() in nmwa_destroy() to jump ship.
2005-08-10 Dan Williams <dcbw@redhat.com>
Patch from Bill Moss <bmoss@clemson.edu>

View file

@ -2391,6 +2391,8 @@ static void nmwa_destroy (NMWirelessApplet *applet, gpointer user_data)
gconf_client_notify_remove (applet->gconf_client, applet->gconf_prefs_notify_id);
gconf_client_notify_remove (applet->gconf_client, applet->gconf_vpn_notify_id);
g_object_unref (G_OBJECT (applet->gconf_client));
exit (EXIT_SUCCESS);
}
@ -2455,7 +2457,7 @@ static GtkWidget * nmwa_get_instance (NMWirelessApplet *applet)
g_object_unref (G_OBJECT (applet->gconf_client));
return NULL;
}
if (!(applet->dbus_thread = g_thread_create (nmwa_dbus_worker, applet, FALSE, &error)))
if (!(applet->dbus_thread = g_thread_create (nmwa_dbus_worker, applet, TRUE, &error)))
{
g_mutex_free (applet->data_mutex);
g_object_unref (G_OBJECT (applet->gconf_client));