AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

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

Browse Source 
Gtkplacesview finalization fixes

See merge request GNOME/gtk!119

(cherry picked from commit e30176a522)

f9452957 gtkplacesview: unset entry_pulse_timeout_id before removing it
4900c3eb gtkplacesview: disconnect from server list monitor changes on destroy
This commit is contained in:
Emmanuele Bassi 2018-04-19 08:24:49 +00:00 committed by Marco Trevisan
parent cfbbcf5fc4
commit 1945c7a1a8
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gtk/gtkplacesview.c
View File

@ -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;
}