diff options
author | rbuj <[email protected]> | 2021-10-25 00:28:08 +0200 |
---|---|---|
committer | Luke from DC <[email protected]> | 2022-09-11 17:51:44 +0000 |
commit | 23748971577ddff3731eab86de92f367c598cb70 (patch) | |
tree | 784201ccdf344e318016211689e5ca67c404a30e /src/eom-scroll-view.c | |
parent | 11d56d5d0e8e3ccb7798cd3aac4ade4c2e066a1c (diff) | |
download | eom-23748971577ddff3731eab86de92f367c598cb70.tar.bz2 eom-23748971577ddff3731eab86de92f367c598cb70.tar.xz |
Use GLib's new g_clear_signal_handler() function to simplify code
Diffstat (limited to 'src/eom-scroll-view.c')
-rw-r--r-- | src/eom-scroll-view.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/src/eom-scroll-view.c b/src/eom-scroll-view.c index 24a1f0f..3fc64d4 100644 --- a/src/eom-scroll-view.c +++ b/src/eom-scroll-view.c @@ -87,8 +87,8 @@ struct _EomScrollViewPrivate { /* actual image */ EomImage *image; - guint image_changed_id; - guint frame_changed_id; + gulong image_changed_id; + gulong frame_changed_id; GdkPixbuf *pixbuf; cairo_surface_t *surface; @@ -188,15 +188,20 @@ free_image_resources (EomScrollView *view) priv = view->priv; - if (priv->image_changed_id > 0) { +#if GLIB_CHECK_VERSION(2,62,0) + g_clear_signal_handler (&priv->image_changed_id, priv->image); + g_clear_signal_handler (&priv->frame_changed_id, priv->image); +#else + if (priv->image_changed_id != 0) { g_signal_handler_disconnect (priv->image, priv->image_changed_id); priv->image_changed_id = 0; } - if (priv->frame_changed_id > 0) { + if (priv->frame_changed_id != 0) { g_signal_handler_disconnect (priv->image, priv->frame_changed_id); priv->frame_changed_id = 0; } +#endif if (priv->image != NULL) { eom_image_data_unref (priv->image); |