diff options
| author | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2010-09-16 19:08:41 +0800 |
|---|---|---|
| committer | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2010-09-27 21:28:48 +0800 |
| commit | 4ef008b72acb19f756f39e1a3795d1f3fc2c6820 (patch) | |
| tree | 1a722d72acd3711a1578fa36e3f9e984502d01e7 | |
| parent | fa600a4ea18f2c5e7163698fb44adccd9bc230b2 (diff) | |
| download | gsoc2013-empathy-4ef008b72acb19f756f39e1a3795d1f3fc2c6820.tar gsoc2013-empathy-4ef008b72acb19f756f39e1a3795d1f3fc2c6820.tar.gz gsoc2013-empathy-4ef008b72acb19f756f39e1a3795d1f3fc2c6820.tar.bz2 gsoc2013-empathy-4ef008b72acb19f756f39e1a3795d1f3fc2c6820.tar.lz gsoc2013-empathy-4ef008b72acb19f756f39e1a3795d1f3fc2c6820.tar.xz gsoc2013-empathy-4ef008b72acb19f756f39e1a3795d1f3fc2c6820.tar.zst gsoc2013-empathy-4ef008b72acb19f756f39e1a3795d1f3fc2c6820.zip | |
factor out disconnect_video_output_motion_handler()
| -rw-r--r-- | src/empathy-call-window.c | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/src/empathy-call-window.c b/src/empathy-call-window.c index 685f0d21f..7b94a468a 100644 --- a/src/empathy-call-window.c +++ b/src/empathy-call-window.c @@ -1773,10 +1773,9 @@ empathy_call_window_dispose (GObject *object) G_OBJECT_CLASS (empathy_call_window_parent_class)->dispose (object); } -void -empathy_call_window_finalize (GObject *object) +static void +disconnect_video_output_motion_handler (EmpathyCallWindow *self) { - EmpathyCallWindow *self = EMPATHY_CALL_WINDOW (object); EmpathyCallWindowPriv *priv = GET_PRIV (self); if (priv->video_output_motion_handler_id != 0) @@ -1785,6 +1784,15 @@ empathy_call_window_finalize (GObject *object) priv->video_output_motion_handler_id); priv->video_output_motion_handler_id = 0; } +} + +void +empathy_call_window_finalize (GObject *object) +{ + EmpathyCallWindow *self = EMPATHY_CALL_WINDOW (object); + EmpathyCallWindowPriv *priv = GET_PRIV (self); + + disconnect_video_output_motion_handler (self); /* free any data held directly by the object here */ g_mutex_free (priv->lock); @@ -2968,12 +2976,7 @@ empathy_call_window_state_event_cb (GtkWidget *widget, } else { - if (priv->video_output_motion_handler_id != 0) - { - g_signal_handler_disconnect (G_OBJECT (priv->video_output), - priv->video_output_motion_handler_id); - priv->video_output_motion_handler_id = 0; - } + disconnect_video_output_motion_handler (window); } empathy_call_window_fullscreen_set_fullscreen (priv->fullscreen, |