[gnio/connection-factory] Fix locking deadlock on connection factory
- From: Alexander Larsson <alexl src gnome org>
- To: svn-commits-list gnome org
- Subject: [gnio/connection-factory] Fix locking deadlock on connection factory
- Date: Sat, 9 May 2009 17:17:55 -0400 (EDT)
commit d4bc5098dbbffeb19e7b485bb18522982bef74b5
Author: Alexander Larsson <alexl redhat com>
Date: Sat May 9 22:27:03 2009 +0200
Fix locking deadlock on connection factory
---
gio/gsocketconnection.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/gio/gsocketconnection.c b/gio/gsocketconnection.c
index f7826f1..286b559 100644
--- a/gio/gsocketconnection.c
+++ b/gio/gsocketconnection.c
@@ -321,10 +321,10 @@ g_socket_connection_factory_lookup_type (GSocketFamily family,
ConnectionFactory *factory, key;
GType g_type;
- G_LOCK (connection_factories);
-
init_builtin_types ();
+ G_LOCK (connection_factories);
+
g_type = G_TYPE_SOCKET_CONNECTION;
if (connection_factories)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]