Skip to content

Commit bc192b6

Browse files
committed
actions: Cancel action update idle callbacks during dispose for
non-NemoView types.
1 parent 7eb062a commit bc192b6

File tree

3 files changed

+6
-0
lines changed

3 files changed

+6
-0
lines changed

src/nemo-blank-desktop-window.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -237,6 +237,8 @@ nemo_blank_desktop_window_dispose (GObject *obj)
237237
{
238238
NemoBlankDesktopWindow *window = NEMO_BLANK_DESKTOP_WINDOW (obj);
239239

240+
g_clear_handle_id (&window->details->actions_changed_idle_id, g_source_remove);
241+
240242
if (window->details->actions_changed_id > 0) {
241243
g_signal_handler_disconnect (nemo_desktop_manager_get_action_manager (),
242244
window->details->actions_changed_id);

src/nemo-places-sidebar.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4398,6 +4398,8 @@ nemo_places_sidebar_dispose (GObject *object)
43984398

43994399
free_drag_data (sidebar);
44004400

4401+
g_clear_handle_id (&sidebar->actions_changed_idle_id, g_source_remove);
4402+
44014403
if (sidebar->bookmarks_changed_id != 0) {
44024404
g_signal_handler_disconnect (sidebar->bookmarks,
44034405
sidebar->bookmarks_changed_id);

src/nemo-tree-sidebar.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1754,6 +1754,8 @@ fm_tree_view_dispose (GObject *object)
17541754

17551755
view = FM_TREE_VIEW (object);
17561756

1757+
g_clear_handle_id (&view->details->actions_changed_idle_id, g_source_remove);
1758+
17571759
if (view->details->selection_changed_timer) {
17581760
g_source_remove (view->details->selection_changed_timer);
17591761
view->details->selection_changed_timer = 0;

0 commit comments

Comments
 (0)