--- a/libpurple/example/nullclient.c Thu Jun 15 12:04:59 2017 -0500
+++ b/libpurple/example/nullclient.c Thu Jun 15 12:13:53 2017 -0500
@@ -36,84 +36,6 @@
#include "defines.h"
-/**
- * The following eventloop functions are used in both pidgin and purple-text. If your
- * application uses glib mainloop, you can safely use this verbatim.
- */
-#define PURPLE_GLIB_READ_COND (G_IO_IN | G_IO_HUP | G_IO_ERR)
-#define PURPLE_GLIB_WRITE_COND (G_IO_OUT | G_IO_HUP | G_IO_ERR | G_IO_NVAL)
-
-typedef struct _PurpleGLibIOClosure {
- PurpleInputFunction function;
- guint result;
- gpointer data;
-} PurpleGLibIOClosure;
-
-static void purple_glib_io_destroy(gpointer data)
-{
- g_free(data);
-}
-
-static gboolean purple_glib_io_invoke(GIOChannel *source, GIOCondition condition, gpointer data)
-{
- PurpleGLibIOClosure *closure = data;
- PurpleInputCondition purple_cond = 0;
-
- if (condition & PURPLE_GLIB_READ_COND)
- purple_cond |= PURPLE_INPUT_READ;
- if (condition & PURPLE_GLIB_WRITE_COND)
- purple_cond |= PURPLE_INPUT_WRITE;
-
- closure->function(closure->data, g_io_channel_unix_get_fd(source),
- purple_cond);
-
- return TRUE;
-}
-
-static guint glib_input_add(gint fd, PurpleInputCondition condition,
- PurpleInputFunction function, gpointer data)
-{
- PurpleGLibIOClosure *closure = g_new0(PurpleGLibIOClosure, 1);
- GIOChannel *channel;
- GIOCondition cond = 0;
-
- closure->function = function;
- closure->data = data;
-
- if (condition & PURPLE_INPUT_READ)
- cond |= PURPLE_GLIB_READ_COND;
- if (condition & PURPLE_INPUT_WRITE)
- cond |= PURPLE_GLIB_WRITE_COND;
-
-#ifdef _WIN32
- channel = g_io_channel_win32_new_socket(fd);
-#else
- channel = g_io_channel_unix_new(fd);
-#endif
- closure->result = g_io_add_watch_full(channel, G_PRIORITY_DEFAULT,
- cond, purple_glib_io_invoke, closure, purple_glib_io_destroy);
-
- g_io_channel_unref(channel);
- return closure->result;
-}
-
-static PurpleEventLoopUiOps glib_eventloops =
-{
- g_timeout_add,
- g_source_remove,
- glib_input_add,
- g_source_remove,
- NULL,
- g_timeout_add_seconds,
-
- /* padding */
- NULL,
- NULL,
- NULL,
- NULL
-};
-/*** End of the eventloop functions. ***/
-
/*** Conversation uiops ***/
static void
null_write_conv(PurpleConversation *conv, PurpleMessage *msg)
@@ -189,10 +111,6 @@
*/
purple_core_set_ui_ops(&null_core_uiops);
- /* Set the uiops for the eventloop. If your client is glib-based, you can safely
- * copy this verbatim. */
- purple_eventloop_set_ui_ops(&glib_eventloops);
-
/* Now that all the essential stuff has been set, let's try to init the core. It's
* necessary to provide a non-NULL name for the current ui to the core. This name
* is used by stuff that depends on this ui, for example the ui-specific plugins. */