diff options
| author | Darin Adler <darin@src.gnome.org> | 2000-10-30 19:22:43 +0000 |
|---|---|---|
| committer | Darin Adler <darin@src.gnome.org> | 2000-10-30 19:22:43 +0000 |
| commit | d8d5d7bddc8f5da945cc3d0e900229285fa4efb4 (patch) | |
| tree | f12872ba71d695a9d895a9fb13b5d43044198971 /libnautilus-private/nautilus-icon-container.c | |
| parent | 234699b8d35d0e6bff50495a25fc08270fe34b85 (diff) | |
| download | nautilus-d8d5d7bddc8f5da945cc3d0e900229285fa4efb4.tar.gz | |
Fixed bug 4057 (clicking the back button while opening a huge
directory often crashes).
* libnautilus-extensions/nautilus-icon-container.c:
(nautilus_icon_container_for_each): The function was iterating
some icons twice. All the icons on the new_icons list are also on
the icons list.
(icon_destroy): Also be sure to remove the icon from the new_icons
list if it happens to be destroyed while still on that list.
* configure.in:
* Makefile.shared:
Got rid of the shared part of the code to generate .xml.h
files. It's no longer needed since the po directory takes care of
everything itself.
* components/loser/content/Makefile.am:
* components/loser/sidebar/Makefile.am:
* components/mozilla/Makefile.am:
* components/sample/Makefile.am:
* components/services/summary/nautilus-view/Makefile.am:
* libnautilus/Makefile.am:
* src/Makefile.am:
* src/file-manager/Makefile.am:
Got rid of the per-directory part of the code to generate .xml.h
files.
* components/loser/content/nautilus-content-loser-ui.xml.h:
* components/loser/sidebar/nautilus-sidebar-loser-ui.xml.h:
* components/mozilla/nautilus-mozilla-ui.xml.h:
* components/sample/nautilus-sample-content-view-ui.xml.h:
* components/services/summary/nautilus-view/nautilus-summary-view-ui.xml.h:
* libnautilus/nautilus-clipboard-ui.xml.h:
* src/file-manager/nautilus-directory-view-ui.xml.h:
* src/file-manager/nautilus-icon-view-ui.xml.h:
* src/file-manager/nautilus-search-list-view-ui.xml.h:
* src/nautilus-service-ui.xml.h:
* src/nautilus-shell-ui.xml.h:
Got rid of the checked-in copies of the .xml.h files. The worst
part!
Diffstat (limited to 'libnautilus-private/nautilus-icon-container.c')
| -rw-r--r-- | libnautilus-private/nautilus-icon-container.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/libnautilus-private/nautilus-icon-container.c b/libnautilus-private/nautilus-icon-container.c index 5137691cd..b56fb2f95 100644 --- a/libnautilus-private/nautilus-icon-container.c +++ b/libnautilus-private/nautilus-icon-container.c @@ -3364,8 +3364,6 @@ nautilus_icon_container_for_each (NautilusIconContainer *container, g_list_foreach (container->details->icons, call_icon_callback, &callback_and_data); - g_list_foreach (container->details->new_icons, - call_icon_callback, &callback_and_data); } /* utility routine to remove a single icon from the container */ @@ -3380,6 +3378,7 @@ icon_destroy (NautilusIconContainer *container, details = container->details; details->icons = g_list_remove (details->icons, icon); + details->new_icons = g_list_remove (details->new_icons, icon); was_selected = icon->is_selected; |