diff options
| author | Martin Wehner <martin.wehner@gmail.com> | 2007-07-30 21:54:13 +0000 |
|---|---|---|
| committer | Martin Wehner <mwehner@src.gnome.org> | 2007-07-30 21:54:13 +0000 |
| commit | 15e71965fcba437eecdb0a3c9be1d2667717cfd2 (patch) | |
| tree | 130fdd055e0c56edf09efb390a21777801c892a4 | |
| parent | 388169d0d00935088da72b907778172451e3eb35 (diff) | |
| download | nautilus-15e71965fcba437eecdb0a3c9be1d2667717cfd2.tar.gz | |
Dont't try to remove extra_viewer_radio_action from a group that may
2007-07-30 Martin Wehner <martin.wehner@gmail.com>
* 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 <chpe@gnome.org>
svn path=/trunk/; revision=13035
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | src/nautilus-window.c | 16 |
2 files changed, 13 insertions, 10 deletions
@@ -1,5 +1,12 @@ 2007-07-30 Martin Wehner <martin.wehner@gmail.com> + * 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 <chpe@gnome.org> + +2007-07-30 Martin Wehner <martin.wehner@gmail.com> + * libnautilus-private/nautilus-search-engine-simple.c: (search_visit_func): Don't try to lowercase non-unicode filenames with g_utf8_strdown. Fixes #454799. 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; |