Attachment #391354 for bug #532128

Lines 369-377 ck_job_finalize (GObject *object) Link Here

(-)a/src/ck-job.c (+2 lines)
369		369
370	if (job->priv->out_watch_id > 0) {	370	if (job->priv->out_watch_id > 0) {
371	g_source_remove (job->priv->out_watch_id);	371	g_source_remove (job->priv->out_watch_id);
		372	job->priv->out_watch_id = 0;
372	}	373	}
373	if (job->priv->err_watch_id > 0) {	374	if (job->priv->err_watch_id > 0) {
374	g_source_remove (job->priv->err_watch_id);	375	g_source_remove (job->priv->err_watch_id);
		376	job->priv->err_watch_id = 0;
375	}	377	}
376	g_free (job->priv->command);	378	g_free (job->priv->command);
377	g_string_free (job->priv->std_out, TRUE);	379	g_string_free (job->priv->std_out, TRUE);

Lines 94-99 _child_watch (GPid pid, Link Here

(-)a/src/ck-run-programs.c (+1 lines)
94		94
95	g_spawn_close_pid (pid);	95	g_spawn_close_pid (pid);
96	g_source_remove (cd->timeout_id);	96	g_source_remove (cd->timeout_id);
		97	cd->timeout_id = 0;
97		98
98	cd->child_is_running = FALSE;	99	cd->child_is_running = FALSE;
99		100

Lines 171-176 remove_idle_hint_timeout (CkTtyIdleMonitor *tty_idle_monitor) Link Here

(-)a/src/ck-tty-idle-monitor.c (+1 lines)
171	{	171	{
172	if (tty_idle_monitor->priv->timeout_id > 0) {	172	if (tty_idle_monitor->priv->timeout_id > 0) {
173	g_source_remove (tty_idle_monitor->priv->timeout_id);	173	g_source_remove (tty_idle_monitor->priv->timeout_id);
		174	tty_idle_monitor->priv->timeout_id = 0;
174	}	175	}
175	}	176	}
176		177

Lines 504-509 ck_vt_monitor_finalize (GObject *object) Link Here

(-)a/src/ck-vt-monitor.c (-1 / +1 lines)
504		504
505	if (vt_monitor->priv->process_queue_id > 0) {	505	if (vt_monitor->priv->process_queue_id > 0) {
506	g_source_remove (vt_monitor->priv->process_queue_id);	506	g_source_remove (vt_monitor->priv->process_queue_id);
		507	vt_monitor->priv->process_queue_id = 0;
507	}	508	}
508		509
509	if (vt_monitor->priv->event_queue != NULL) {	510	if (vt_monitor->priv->event_queue != NULL) {
510	--
511	src/ck-tty-idle-monitor.c \| 8 ++++++--	511	src/ck-tty-idle-monitor.c \| 8 ++++++--
512	1 file changed, 6 insertions(+), 2 deletions(-)	512	1 file changed, 6 insertions(+), 2 deletions(-)

Lines 169-174 ck_tty_idle_monitor_get_property (GObject *object, Link Here

(-)a/src/ck-tty-idle-monitor.c (-2 / +6 lines)
169	static void	169	static void
170	remove_idle_hint_timeout (CkTtyIdleMonitor *tty_idle_monitor)	170	remove_idle_hint_timeout (CkTtyIdleMonitor *tty_idle_monitor)
171	{	171	{
		172	g_debug ("remove_idle_hint_timeout: checking timeout_id %d", tty_idle_monitor->priv->timeout_id);
172	if (tty_idle_monitor->priv->timeout_id > 0) {	173	if (tty_idle_monitor->priv->timeout_id > 0) {
173	g_source_remove (tty_idle_monitor->priv->timeout_id);	174	g_source_remove (tty_idle_monitor->priv->timeout_id);
174	tty_idle_monitor->priv->timeout_id = 0;	175	tty_idle_monitor->priv->timeout_id = 0;
Lines 225-230 check_tty_idle (CkTtyIdleMonitor *monitor) Link Here
225	time_t idletime;	226	time_t idletime;
226	time_t last_access;	227	time_t last_access;
227		228
		229	g_debug ("check_tty_idle: setting timeout_id %d to 0", monitor->priv->timeout_id);
		230	monitor->priv->timeout_id = 0;
		231
228	if (monitor->priv->device == NULL) {	232	if (monitor->priv->device == NULL) {
229	return FALSE;	233	return FALSE;
230	}	234	}
Lines 246-253 check_tty_idle (CkTtyIdleMonitor *monitor) Link Here
246		250
247	tty_idle_monitor_set_idle_hint_internal (monitor, is_idle);	251	tty_idle_monitor_set_idle_hint_internal (monitor, is_idle);
248		252
249	monitor->priv->timeout_id = 0;
250
251	if (is_idle) {	253	if (is_idle) {
252	if (! monitor_add_watch (monitor)) {	254	if (! monitor_add_watch (monitor)) {
253	/* if we can't add a watch just add a new timer */	255	/* if we can't add a watch just add a new timer */
Lines 275-280 static void Link Here
275	schedule_tty_check (CkTtyIdleMonitor *monitor,	277	schedule_tty_check (CkTtyIdleMonitor *monitor,
276	guint seconds)	278	guint seconds)
277	{	279	{
		280	g_debug ("schedule_tty_check: timeout_id %d", monitor->priv->timeout_id);
278	if (monitor->priv->timeout_id == 0) {	281	if (monitor->priv->timeout_id == 0) {
279	#if GLIB_CHECK_VERSION(2,14,0)	282	#if GLIB_CHECK_VERSION(2,14,0)
280	monitor->priv->timeout_id = g_timeout_add_seconds (seconds,	283	monitor->priv->timeout_id = g_timeout_add_seconds (seconds,
Lines 285-290 schedule_tty_check (CkTtyIdleMonitor *monitor, Link Here
285	(GSourceFunc)check_tty_idle,	288	(GSourceFunc)check_tty_idle,
286	monitor);	289	monitor);
287	#endif	290	#endif
		291	g_debug ("schedule_tty_check: timeout_id %d", monitor->priv->timeout_id);
288	}	292	}
289	}	293	}
290		294

Return to bug 532128