From e97c51a4733aa3d49ea19ae163791368ea710d0f Mon Sep 17 00:00:00 2001 From: Edward Hervey Date: Wed, 30 Jan 2008 12:36:06 +0000 Subject: [PATCH] gst/gstmodule.c: Remove do_pending_calls timeout which has been handled more gracefully in pygobject MainLoop for the... Original commit message from CVS: * gst/gstmodule.c: (init_gst): Remove do_pending_calls timeout which has been handled more gracefully in pygobject MainLoop for the past 3 years. Fixes #512916 --- ChangeLog | 7 +++++++ gst/gstmodule.c | 22 ---------------------- 2 files changed, 7 insertions(+), 22 deletions(-) diff --git a/ChangeLog b/ChangeLog index fa2e13e..a871d4f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2008-01-30 Edward Hervey + + * gst/gstmodule.c: (init_gst): + Remove do_pending_calls timeout which has been handled more gracefully + in pygobject MainLoop for the past 3 years. + Fixes #512916 + 2008-01-28 Jan Schmidt * configure.ac: diff --git a/gst/gstmodule.c b/gst/gstmodule.c index 6e6e167..e2f408f 100644 --- a/gst/gstmodule.c +++ b/gst/gstmodule.c @@ -58,26 +58,6 @@ GST_DEBUG_CATEGORY (python_debug); /* for python code */ o=pyg_type_wrapper_new(gtype)); \ Py_DECREF(o); - -/* This is a timeout that gets added to the mainloop to handle SIGINT (Ctrl-C) - * Other signals get handled at some other point where transition from - * C -> Python is being made. - */ -static gboolean -python_do_pending_calls(gpointer data) -{ - PyGILState_STATE state; - - if (PyOS_InterruptOccurred()) { - state = pyg_gil_state_ensure(); - PyErr_SetNone(PyExc_KeyboardInterrupt); - pyg_gil_state_release(state); - } - - return TRUE; -} - - static PyObject* pygstminiobject_from_gvalue(const GValue *value) { @@ -269,8 +249,6 @@ init_gst (void) PyModule_AddStringConstant (m, "CORE_ERROR", (gchar *) g_quark_to_string(GST_CORE_ERROR)); PyModule_AddStringConstant (m, "STREAM_ERROR", (gchar *) g_quark_to_string(GST_STREAM_ERROR)); - g_timeout_add_full (0, 100, python_do_pending_calls, NULL, NULL); - if (PyErr_Occurred ()) { Py_FatalError ("can't initialize module gst"); } -- 2.7.4