general: Clean up signal handler disconnection

Make use of GLib's new g_clear_signal_handler() function to simplify nautilus'
signal handler disconnection and reduce unneccessary code.

Fixes: #1522

2 files changed, 2 insertions, 6 deletions

diff --git a/eel/eel-canvas.c b/eel/eel-canvas.c
index e3ccfbd5d..de3902f6b 100644
--- a/eel/eel-canvas.c
+++ b/eel/eel-canvas.c
@@ -2248,11 +2248,7 @@ eel_canvas_destroy (GtkWidget *object)
 
     canvas = EEL_CANVAS (object);
 
-    if (canvas->root_destroy_id)
-    {
-        g_signal_handler_disconnect (G_OBJECT (canvas->root), canvas->root_destroy_id);
-        canvas->root_destroy_id = 0;
-    }
+    g_clear_signal_handler (&canvas->root_destroy_id, G_OBJECT (canvas->root));
     if (canvas->root)
     {
         EelCanvasItem *root = canvas->root;
diff --git a/eel/eel-canvas.h b/eel/eel-canvas.h
index 62e50a857..f406ca0a4 100644
--- a/eel/eel-canvas.h
+++ b/eel/eel-canvas.h
@@ -355,7 +355,7 @@ struct _EelCanvas {
 	guint idle_id;
 
 	/* Signal handler ID for destruction of the root item */
-	guint root_destroy_id;
+	gulong root_destroy_id;
 
 	/* Internal pixel offsets when zoomed out */
 	int zoom_xofs, zoom_yofs;