Sophie

Sophie

distrib > Mandriva > 2007.1 > x86_64 > by-pkgid > 65471f184bc132ecfebf2239f0931744 > files > 5

gaim-2.0.0-2.beta6.2mdv2007.1.src.rpm

diff -ur gaim-2.0.0+beta5.orig/libgaim/connection.c gaim-2.0.0+beta5/libgaim/connection.c
--- gaim-2.0.0+beta5.orig/libgaim/connection.c	2006-11-28 00:12:14.000000000 -0500
+++ gaim-2.0.0+beta5/libgaim/connection.c	2006-11-28 00:24:00.000000000 -0500
@@ -37,6 +37,10 @@
 #include "signals.h"
 #include "util.h"
 
+#include <netinet/in.h>
+#include <arpa/nameser.h>
+#include <resolv.h>
+
 static GList *connections = NULL;
 static GList *connections_connecting = NULL;
 static GaimConnectionUiOps *connection_ui_ops = NULL;
@@ -139,6 +139,9 @@
 
 	gaim_signal_emit(gaim_connections_get_handle(), "signing-on", gc);
 
+	/* Re-read resolv.conf and friends in case DNS servers have changed */
+	res_init();
+
 	if (regist)
 	{
 		gaim_debug_info("connection", "Registering.  gc = %p\n", gc);
diff -ur gaim-2.0.0+beta5.orig/libgaim/network.c gaim-2.0.0+beta5/libgaim/network.c
--- gaim-2.0.0+beta5.orig/libgaim/network.c	2006-11-28 00:12:14.000000000 -0500
+++ gaim-2.0.0+beta5/libgaim/network.c	2006-11-28 00:24:15.000000000 -0500
@@ -558,8 +558,6 @@
 	switch(current)
 	{
 	case LIBNM_ACTIVE_NETWORK_CONNECTION:
-		/* Call res_init in case DNS servers have changed */
-		res_init();
 		if (ui_ops != NULL && ui_ops->network_connected != NULL)
 			ui_ops->network_connected();
 		prev = current;