From 15e71965fcba437eecdb0a3c9be1d2667717cfd2 Mon Sep 17 00:00:00 2001 From: Martin Wehner Date: Mon, 30 Jul 2007 21:54:13 +0000 Subject: Dont't try to remove extra_viewer_radio_action from a group that may 2007-07-30 Martin Wehner * src/nautilus-window.c: (real_load_view_as_menu): Dont't try to remove extra_viewer_radio_action from a group that may already have been finalized. (#461789) Patch from Christian Persch svn path=/trunk/; revision=13035 --- ChangeLog | 7 +++++++ src/nautilus-window.c | 16 ++++++---------- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index 58b2f939b..cfa9b264b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2007-07-30 Martin Wehner + + * src/nautilus-window.c: (real_load_view_as_menu): + Dont't try to remove extra_viewer_radio_action from a group + that may already have been finalized. (#461789) + Patch from Christian Persch + 2007-07-30 Martin Wehner * libnautilus-private/nautilus-search-engine-simple.c: diff --git a/src/nautilus-window.c b/src/nautilus-window.c index 2e6230d4d..e2bc9bbf1 100644 --- a/src/nautilus-window.c +++ b/src/nautilus-window.c @@ -1031,22 +1031,18 @@ real_load_view_as_menu (NautilusWindow *window) window->details->short_list_merge_id); window->details->short_list_merge_id = 0; } - if (window->details->view_as_action_group != NULL) { - gtk_ui_manager_remove_action_group (window->details->ui_manager, - window->details->view_as_action_group); - window->details->view_as_action_group = NULL; - } - if (window->details->extra_viewer_merge_id != 0) { gtk_ui_manager_remove_ui (window->details->ui_manager, window->details->extra_viewer_merge_id); window->details->extra_viewer_merge_id = 0; - } - if (window->details->extra_viewer_radio_action != NULL) { - gtk_action_group_remove_action (window->details->view_as_action_group, - GTK_ACTION (window->details->extra_viewer_radio_action)); window->details->extra_viewer_radio_action = NULL; } + if (window->details->view_as_action_group != NULL) { + gtk_ui_manager_remove_action_group (window->details->ui_manager, + window->details->view_as_action_group); + window->details->view_as_action_group = NULL; + } + g_free (window->details->extra_viewer); window->details->extra_viewer = NULL; -- cgit v1.2.1