besser82 / rpms / pidgin

Forked from rpms/pidgin 6 years ago
Clone
96e6aac
diff -up pidgin-2.4.2/libpurple/connection.c.resolv pidgin-2.4.2/libpurple/connection.c
96e6aac
--- pidgin-2.4.2/libpurple/connection.c.resolv	2008-02-02 10:09:14.000000000 -0500
96e6aac
+++ pidgin-2.4.2/libpurple/connection.c	2008-05-17 10:42:56.000000000 -0400
96e6aac
@@ -40,6 +40,10 @@
96e6aac
 
96e6aac
 #define KEEPALIVE_INTERVAL 30
96e6aac
 
96e6aac
+#include <netinet/in.h>
96e6aac
+#include <arpa/nameser.h>
96e6aac
+#include <resolv.h>
96e6aac
+
96e6aac
 static GList *connections = NULL;
96e6aac
 static GList *connections_connecting = NULL;
96e6aac
 static PurpleConnectionUiOps *connection_ui_ops = NULL;
96e6aac
@@ -153,6 +157,9 @@ purple_connection_new(PurpleAccount *acc
96e6aac
 
96e6aac
 	purple_signal_emit(purple_connections_get_handle(), "signing-on", gc);
96e6aac
 
96e6aac
+	/* Re-read resolv.conf and friends in case DNS servers have changed */
96e6aac
+	res_init();
96e6aac
+
96e6aac
 	if (regist)
96e6aac
 	{
96e6aac
 		purple_debug_info("connection", "Registering.  gc = %p\n", gc);
96e6aac
diff -up pidgin-2.4.2/libpurple/network.c.resolv pidgin-2.4.2/libpurple/network.c
96e6aac
--- pidgin-2.4.2/libpurple/network.c.resolv	2008-05-16 11:36:56.000000000 -0400
96e6aac
+++ pidgin-2.4.2/libpurple/network.c	2008-05-17 10:46:47.000000000 -0400
96e6aac
@@ -624,8 +624,6 @@ nm_update_state(NMState state)
96e6aac
 	switch(state)
96e6aac
 	{
96e6aac
 		case NM_STATE_CONNECTED:
96e6aac
-			/* Call res_init in case DNS servers have changed */
96e6aac
-			res_init();
96e6aac
 			if (ui_ops != NULL && ui_ops->network_connected != NULL)
96e6aac
 				ui_ops->network_connected();
96e6aac
 			prev = state;