From 4a65867e3811ce7aa26a72e971b7ad585d5d2637 Mon Sep 17 00:00:00 2001

From: Michael Catanzaro <mcatanzaro@igalia.com>

Date: Wed, 3 Jul 2019 16:14:26 -0500

Subject: [PATCH] GcalWindow should properly disconnect from its GcalManager

Fixes #392 for the gnome-3-32 branch

---

 src/gcal-window.c | 15 ++++++++++-----

 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/gcal-window.c b/src/gcal-window.c

index 46ee5301..ae96b1e2 100644

--- a/src/gcal-window.c

+++ b/src/gcal-window.c

@@ -1268,8 +1268,13 @@ gcal_window_set_property (GObject      *object,

       break;

     case PROP_MANAGER:

-      if (g_set_object (&self->manager, g_value_get_object (value)))

+      if (self->manager != g_value_get_object (value))

         {

+          if (self->manager != NULL)

+            g_signal_handlers_disconnect_by_data (self->manager, object);

+

+          g_set_object (&self->manager, g_value_get_object (value));

+

           g_settings_bind (gcal_manager_get_settings (self->manager),

                            "active-view",

                            self,

@@ -1288,10 +1293,10 @@ gcal_window_set_property (GObject      *object,

               g_list_free (sources);

             }

-          g_signal_connect (self->manager, "source-added", G_CALLBACK (add_source), object);

-          g_signal_connect (self->manager, "source-removed", G_CALLBACK (remove_source), object);

-          g_signal_connect_swapped (self->manager, "source-enabled", G_CALLBACK (source_enabled), object);

-          g_signal_connect_swapped (self->manager, "source-changed", G_CALLBACK (source_changed), object);

+          g_signal_connect_object (self->manager, "source-added", G_CALLBACK (add_source), object, 0);

+          g_signal_connect_object (self->manager, "source-removed", G_CALLBACK (remove_source), object, 0);

+          g_signal_connect_object (self->manager, "source-enabled", G_CALLBACK (source_enabled), object, G_CONNECT_SWAPPED);

+          g_signal_connect_object (self->manager, "source-changed", G_CALLBACK (source_changed), object, G_CONNECT_SWAPPED);

           gcal_search_popover_connect (GCAL_SEARCH_POPOVER (self->search_popover), self->manager);

-- 

2.21.0