[glib] Bug 660851: Update GIO for changes in GThread API



commit 53fb4e986777ccad3b382151a23765c162a645c4
Author: Chun-wei Fan <fanchunwei src gnome org>
Date:   Tue Oct 4 23:52:38 2011 +0800

    Bug 660851: Update GIO for changes in GThread API
    
    gsocket.c: Use intern string instead of GStaticPrivate/
               g_static_private_set, as Dan suggested.

 gio/gsocket.c |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)
---
diff --git a/gio/gsocket.c b/gio/gsocket.c
index a03be77..c3c1ac6 100644
--- a/gio/gsocket.c
+++ b/gio/gsocket.c
@@ -217,13 +217,15 @@ socket_strerror (int err)
 #ifndef G_OS_WIN32
   return g_strerror (err);
 #else
-  static GStaticPrivate last_msg = G_STATIC_PRIVATE_INIT;
+  const char *msg_ret;
   char *msg;
 
   msg = g_win32_error_message (err);
-  g_static_private_set (&last_msg, msg, g_free);
 
-  return msg;
+  msg_ret = g_intern_string (msg);
+  g_free (msg);
+
+  return msg_ret;
 #endif
 }
 



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]