Commit 8f80fbb2 authored by Dan Winship's avatar Dan Winship

Remove some unnecessary source prepare/check functions

GPollableSource and GSocket's "broken" source never trigger on their
own, so with the changes to GSources in the last cycle, their check
and prepare functions are unnecessary (and undesired).

https://bugzilla.gnome.org/show_bug.cgi?id=701511
parent 6d328a0d
...@@ -41,20 +41,6 @@ typedef struct { ...@@ -41,20 +41,6 @@ typedef struct {
GObject *stream; GObject *stream;
} GPollableSource; } GPollableSource;
static gboolean
pollable_source_prepare (GSource *source,
gint *timeout)
{
*timeout = -1;
return FALSE;
}
static gboolean
pollable_source_check (GSource *source)
{
return FALSE;
}
static gboolean static gboolean
pollable_source_dispatch (GSource *source, pollable_source_dispatch (GSource *source,
GSourceFunc callback, GSourceFunc callback,
...@@ -100,8 +86,8 @@ pollable_source_closure_callback (GObject *stream, ...@@ -100,8 +86,8 @@ pollable_source_closure_callback (GObject *stream,
static GSourceFuncs pollable_source_funcs = static GSourceFuncs pollable_source_funcs =
{ {
pollable_source_prepare, NULL,
pollable_source_check, NULL,
pollable_source_dispatch, pollable_source_dispatch,
pollable_source_finalize, pollable_source_finalize,
(GSourceFunc)pollable_source_closure_callback, (GSourceFunc)pollable_source_closure_callback,
......
...@@ -2915,19 +2915,6 @@ g_socket_is_closed (GSocket *socket) ...@@ -2915,19 +2915,6 @@ g_socket_is_closed (GSocket *socket)
#ifdef G_OS_WIN32 #ifdef G_OS_WIN32
/* Broken source, used on errors */ /* Broken source, used on errors */
static gboolean
broken_prepare (GSource *source,
gint *timeout)
{
return FALSE;
}
static gboolean
broken_check (GSource *source)
{
return FALSE;
}
static gboolean static gboolean
broken_dispatch (GSource *source, broken_dispatch (GSource *source,
GSourceFunc callback, GSourceFunc callback,
...@@ -2938,8 +2925,8 @@ broken_dispatch (GSource *source, ...@@ -2938,8 +2925,8 @@ broken_dispatch (GSource *source,
static GSourceFuncs broken_funcs = static GSourceFuncs broken_funcs =
{ {
broken_prepare, NULL,
broken_check, NULL,
broken_dispatch, broken_dispatch,
NULL NULL
}; };
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment