--- a/pidgin/gtkeventloop.c Mon Jun 12 22:58:32 2017 +0000
+++ b/pidgin/gtkeventloop.c Wed Jun 14 13:57:23 2017 -0500
@@ -75,12 +75,6 @@
PidginIOClosure *closure = g_new0(PidginIOClosure, 1);
GIOChannel *channel;
GIOCondition cond = 0;
-#ifdef _WIN32
- static int use_glib_io_channel = -1;
-
- if (use_glib_io_channel == -1)
- use_glib_io_channel = (g_getenv("PIDGIN_GLIB_IO_CHANNEL") != NULL) ? 1 : 0;
-#endif
closure->function = function;
closure->data = data;
@@ -91,11 +85,10 @@
cond |= PIDGIN_WRITE_COND;
#ifdef _WIN32
- if (use_glib_io_channel == 0)
- channel = wpurple_g_io_channel_win32_new_socket(fd);
- else
+ channel = g_io_channel_win32_new_socket(fd);
+#else
+ channel = g_io_channel_unix_new(fd);
#endif
- channel = g_io_channel_unix_new(fd);
closure->result = g_io_add_watch_full(channel, G_PRIORITY_DEFAULT, cond,
pidgin_io_invoke, closure, g_free);