Commit 1945c7a1 authored by Emmanuele Bassi's avatar Emmanuele Bassi 👣 Committed by Marco Trevisan

Merge branch 'gtkplacesview-finalization-fixes-master' into 'master'

Gtkplacesview finalization fixes

See merge request !119

(cherry picked from commit e30176a5)

f9452957 gtkplacesview: unset entry_pulse_timeout_id before removing it
4900c3eb gtkplacesview: disconnect from server list monitor changes on destroy
parent cfbbcf5f
Pipeline #9223 passed with stage
in 29 minutes and 51 seconds
......@@ -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;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment