[recipes] Avoid a warning at shutdown
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [recipes] Avoid a warning at shutdown
- Date: Sat, 25 Feb 2017 06:22:36 +0000 (UTC)
commit 678151354f9dac75cf66f2682f045bed03998a00
Author: Matthias Clasen <mclasen redhat com>
Date: Sat Feb 25 01:21:07 2017 -0500
Avoid a warning at shutdown
When the object data is cleared when the timer is finalize,
signal handlers have already beeen cleaned up, so we must not
try to disconnect again. In other cases, we explicitly disconnect
in the complete handler, so there is really no need to do it here.
src/gr-cooking-view.c | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
---
diff --git a/src/gr-cooking-view.c b/src/gr-cooking-view.c
index ca0dde4..db70129 100644
--- a/src/gr-cooking-view.c
+++ b/src/gr-cooking-view.c
@@ -107,8 +107,6 @@ timer_data_free (gpointer data)
{
TimerData *td = data;
- if (td->handler)
- g_signal_handler_disconnect (td->timer, td->handler);
g_free (td->id);
g_free (td);
@@ -125,6 +123,9 @@ timer_active (GrTimer *timer,
TimerData *td = g_object_get_data (G_OBJECT (timer), "timer-data");
GrCookingView *view = td->view;
+ g_assert (timer == d->timer);
+ g_assert (timer == td->timer);
+
if (d->mini_timer)
gtk_widget_show (d->mini_timer);
@@ -133,7 +134,7 @@ timer_active (GrTimer *timer,
g_signal_handler_disconnect (timer, d->handler);
d->handler = 0;
- td->handler = g_signal_connect (d->timer, "complete",
+ td->handler = g_signal_connect (timer, "complete",
G_CALLBACK (timer_complete), td);
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]