summaryrefslogtreecommitdiff
path: root/libnautilus-extensions/nautilus-icon-private.h
diff options
context:
space:
mode:
authorDarin Adler <darin@src.gnome.org>2000-06-27 00:52:50 +0000
committerDarin Adler <darin@src.gnome.org>2000-06-27 00:52:50 +0000
commita93b99aba5d5028106aeed47f6edddd2e7dce61f (patch)
treebbe4421ee1f3b1205c280733a773f8ce527dd7c4 /libnautilus-extensions/nautilus-icon-private.h
parent2fb0ca4d8cbdd0302f5c51f979da8e4d33acd465 (diff)
downloadnautilus-a93b99aba5d5028106aeed47f6edddd2e7dce61f.tar.gz
Removed a bunch of incorrect calls to bonobo_object_unref. An error in the
* components/hardware/nautilus-hardware-view.c: (nautilus_hardware_view_destroy): * components/loser/content/nautilus-content-loser.c: (nautilus_content_loser_destroy): * components/loser/sidebar/nautilus-sidebar-loser.c: (nautilus_sidebar_loser_destroy): * components/mozilla/nautilus-mozilla-content-view.c: (nautilus_mozilla_content_view_destroy): * components/music/nautilus-music-view.c: (nautilus_music_view_destroy): * components/rpmview/nautilus-rpm-view.c: (nautilus_rpm_view_destroy): * components/sample/nautilus-sample-content-view.c: (nautilus_sample_content_view_destroy): * components/services/time/nautilus-view/trilobite-eazel-time-view.c: (trilobite_eazel_time_view_destroy): * components/tree/nautilus-tree-view.c: (nautilus_tree_view_destroy): Removed a bunch of incorrect calls to bonobo_object_unref. An error in the sample can be an insidious thing. * components/tree/main.c: (tree_object_destroyed), (tree_make_object), (main): Removed some stray debugging stuff. * libnautilus-extensions/Makefile.am: Got rid of the grid * libnautilus-extensions/nautilus-icon-private.h: Got rid of the grid. * libnautilus-extensions/nautilus-icon-container.c: (keyboard_icon_reveal_timeout_callback): Took out unneeded use of thread locking macros. Maybe someday I'll regret this, but we can add them back then. (get_all_icon_bounds): Added shared function. (update_scroll_region): Renamed set_scroll_region and made it use the shared function. Also got rid of grid code. (resort): Got rid of grid code. (lay_down_icons): Got rid of grid code. (relayout): Made it lay down new icons before doing any layout work. Also made sure it doesn't do the resort while stretching. (reload_icon_positions): Got rid of grid code. (rubberband_select): Got rid of grid code. This was the one place that it might have made things a little faster but probably not due to the complexity of what it was doing. (rubberband_timeout_callback): Took out unneeded use of thread locking macros. Maybe someday I'll regret this, but we can add them back then. (destroy): Got rid of grid code. (world_width_changed): Got rid of grid code. (nautilus_icon_container_initialize): Got rid of grid code and an extra idle cycle that wasn't needed. (nautilus_icon_container_clear): Got rid of grid code and added code to update the scroll region on clear. (icon_destroy): Got rid of grid code. (assign_icon_position), (finish_adding_icon), (finish_adding_new_icons), (finish_adding_new_icons_callback), (nautilus_icon_container_add): Replaced old idle code with something specific to adding new icons. This does the proper layout for manual as well as automatic layout cases. * libnautilus-extensions/nautilus-background.h: * libnautilus-extensions/nautilus-background.c: (nautilus_background_initialize_class): Made two signals instead of one. One for when the background's settings change and another for when the appearance changes. (nautilus_background_set_color): Emit both signals. (load_image_callback): Emit only the appearance change signal. (nautilus_background_set_tile_image_uri): Emit both signals. (nautilus_get_widget_background): Connect to the appearance_changed signal. * libnautilus-extensions/nautilus-directory-background.c: (nautilus_connect_background_to_directory_metadata): Connect to the settings_changed signal. * src/file-manager/fm-directory-view.c: (fm_directory_view_real_merge_menus): Connect to the settings_changed signal. * src/nautilus-sidebar.c: (nautilus_sidebar_update_info): Connect to the appearance_changed signal. * components/music/nautilus-music-view.c: (nautilus_music_view_set_up_background): Connect to the settings_changed signal. * HACKING: Gratuitious reformatting. * RENAMING: Added notes about how we do renaming, at the request of one of the hackers. * nautilus-clean.sh: Added nautilus-tree-view to the things that are killed, and made gratuitous changes to the script.
Diffstat (limited to 'libnautilus-extensions/nautilus-icon-private.h')
-rw-r--r--libnautilus-extensions/nautilus-icon-private.h8
1 files changed, 0 insertions, 8 deletions
diff --git a/libnautilus-extensions/nautilus-icon-private.h b/libnautilus-extensions/nautilus-icon-private.h
index 185184483..d5f1112a3 100644
--- a/libnautilus-extensions/nautilus-icon-private.h
+++ b/libnautilus-extensions/nautilus-icon-private.h
@@ -52,9 +52,6 @@ typedef struct {
/* Whether this item was selected before rubberbanding. */
nautilus_boolean_bit was_selected_before_rubberband : 1;
-
- /* Grid space occupied by this icon. */
- ArtIRect grid_rectangle;
} NautilusIcon;
@@ -99,16 +96,11 @@ typedef struct {
guint64 last_typeselect_time;
} TypeSelectState;
-typedef struct NautilusIconGrid NautilusIconGrid;
-
struct NautilusIconContainerDetails {
/* List of icons. */
GList *icons;
GList *new_icons;
- /* The grid. */
- NautilusIconGrid *grid;
-
/* Current icon for keyboard navigation. */
NautilusIcon *keyboard_focus;