[gtk/gtk-3-22] Merge branch 'gtkplacesview-finalization-fixes-master' into 'master'

[Marco Trevisan <marcotrevi src gnome org>]

commit 1945c7a1a8fcc0134a4ccfdbc39394916c983628
Author: Emmanuele Bassi <ebassi gmail com>
Date:   Thu Apr 19 08:24:49 2018 +0000

    Merge branch 'gtkplacesview-finalization-fixes-master' into 'master'
    
    Gtkplacesview finalization fixes
    
    See merge request GNOME/gtk!119
    
    (cherry picked from commit e30176a5228228f28f914d87120b9a650d0073b8)
    
    f9452957 gtkplacesview: unset entry_pulse_timeout_id before removing it
    4900c3eb gtkplacesview: disconnect from server list monitor changes on destroy

 gtk/gtkplacesview.c | 4 ++++
 1 file changed, 4 insertions(+)
---
diff --git a/gtk/gtkplacesview.c b/gtk/gtkplacesview.c
index 2a79add475..7401245da3 100644
--- a/gtk/gtkplacesview.c
+++ b/gtk/gtkplacesview.c
@@ -402,6 +402,9 @@ gtk_places_view_destroy (GtkWidget *widget)
   if (priv->network_monitor)
     g_signal_handlers_disconnect_by_func (priv->network_monitor, update_places, widget);
 
+  if (priv->server_list_monitor)
+    g_signal_handlers_disconnect_by_func (priv->server_list_monitor, server_file_changed_cb, widget);
+
   g_cancellable_cancel (priv->cancellable);
   g_cancellable_cancel (priv->networks_fetching_cancellable);
 
@@ -1405,6 +1408,7 @@ pulse_entry_cb (gpointer user_data)
     {
       gtk_entry_set_progress_pulse_step (GTK_ENTRY (priv->address_entry), 0.0);
       gtk_entry_set_progress_fraction (GTK_ENTRY (priv->address_entry), 0.0);
+      priv->entry_pulse_timeout_id = 0;
 
       return G_SOURCE_REMOVE;
     }