Properly disconnect signal handlers added with e_signal_connect_notify*()

This is a follow-up for the previous commit, where e_signal_connect_notify*()
functions had been added. Due to a different callback and user data being
attached to the 'notify' signal, the g_signal_handlers_*() functions do not
work properly, thus these e_signal_connect_notify*() functions need
a different way for a signal handler disconnect.

A side-change was done in e-settings-web-view-gtkhtml.c, checking for a real
key change from GSettings.

1 files changed, 4 insertions, 2 deletions

diff --git a/plugins/publish-calendar/publish-calendar.c b/plugins/publish-calendar/publish-calendar.c
index 1eceaa0dd2..f48f1af10e 100644
--- a/plugins/publish-calendar/publish-calendar.c
+++ b/plugins/publish-calendar/publish-calendar.c
@@ -1006,10 +1006,12 @@ e_plugin_lib_enable (EPlugin *ep,
 	EShell *shell = e_shell_get_default ();
 
 	if (shell) {
-		g_signal_handlers_disconnect_by_func (shell, G_CALLBACK (online_state_changed), NULL);
+		static gulong notify_online_id = 0;
+
+		e_signal_disconnect_notify_handler (shell, &notify_online_id);
 		if (enable) {
 			online = e_shell_get_online (shell);
-			e_signal_connect_notify (
+			notify_online_id = e_signal_connect_notify (
 				shell, "notify::online",
 				G_CALLBACK (online_state_changed), NULL);
 		}