[Gaim-commits] CVS: gaim/src dnssrv.c,1.14,1.15

[Daniel A. <dat...@us...>]

Update of /cvsroot/gaim/gaim/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17826

Modified Files:
	dnssrv.c 
Log Message:
Using g_thread_exit() instead of simply returning at the bottom of the thread function seems to prevent some weird crashes. Also, display the error message for SRV lookup failures instead of just the error code.

Index: dnssrv.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/dnssrv.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -p -r1.14 -r1.15
--- dnssrv.c	3 Jan 2006 00:23:23 -0000	1.14
+++ dnssrv.c	3 Jan 2006 05:56:22 -0000	1.15
@@ -234,7 +234,9 @@ static gpointer res_thread(gpointer data
 
 	ds = MyDnsQuery_UTF8(rdata->query, type, DNS_QUERY_STANDARD, NULL, &dr, NULL);
 	if (ds != ERROR_SUCCESS) {
-		rdata->errmsg = g_strdup_printf("Couldn't look up SRV record. Error = %d\n", (int) ds);
+		gchar *msg = g_win32_error_message(ds);
+		rdata->errmsg = g_strdup_printf("Couldn't look up SRV record. %s (%lu).\n", msg, ds);
+		g_free(msg);
 	} else {
 		PDNS_RECORD dr_tmp;
 		GSList *lst = NULL;
@@ -265,7 +267,8 @@ static gpointer res_thread(gpointer data
 	/* back to main thread */
 	g_idle_add(res_main_thread_cb, rdata);
 
-	return 0;
+	g_thread_exit(NULL);
+	return NULL;
 }
 
 #endif