Commit b2ce43ca authored by Darin Adler's avatar Darin Adler

Bend to the forces of practicality and mediocrity and turn of the trash

	* libnautilus-private/nautilus-file.c:
	(get_automatic_emblems_as_integer),
	(prepend_automatic_emblem_names): Bend to the forces of
	practicality and mediocrity and turn of the trash emblem until we
	can make the "in trash" check fast.

	* libnautilus-private/nautilus-icon-factory.c:
	Tweak formatting.
parent d668a75d
2001-10-08 Darin Adler <darin@bentspoon.com>
* libnautilus-private/nautilus-file.c:
(get_automatic_emblems_as_integer),
(prepend_automatic_emblem_names): Bend to the forces of
practicality and mediocrity and turn of the trash emblem until we
can make the "in trash" check fast.
* libnautilus-private/nautilus-icon-factory.c:
Tweak formatting.
2001-10-08 Darin Adler <darin@bentspoon.com>
Separate out the part of the code that locates icons.
......
......@@ -1572,7 +1572,9 @@ get_automatic_emblems_as_integer (NautilusFile *file)
integer <<= 1;
integer |= !nautilus_file_can_write (file);
integer <<= 1;
#if TRASH_IS_FAST_ENOUGH
integer |= nautilus_file_is_in_trash (file);
#endif
return integer;
}
......@@ -1583,10 +1585,12 @@ prepend_automatic_emblem_names (NautilusFile *file,
{
/* Prepend in reverse order. */
#if TRASH_IS_FAST_ENOUGH
if (nautilus_file_is_in_trash (file)) {
names = g_list_prepend
(names, g_strdup (NAUTILUS_FILE_EMBLEM_NAME_TRASH));
}
#endif
if (!nautilus_file_can_write (file)) {
names = g_list_prepend
(names, g_strdup (NAUTILUS_FILE_EMBLEM_NAME_CANT_WRITE));
......
......@@ -261,11 +261,11 @@ static void
destroy_icon_factory (void)
{
eel_preferences_remove_callback (NAUTILUS_PREFERENCES_THEME,
icon_theme_changed_callback,
NULL);
icon_theme_changed_callback,
NULL);
eel_preferences_remove_callback (NAUTILUS_PREFERENCES_IMAGE_FILE_THUMBNAIL_LIMIT,
thumbnail_limit_changed_callback,
NULL);
thumbnail_limit_changed_callback,
NULL);
gtk_object_unref (GTK_OBJECT (global_icon_factory));
}
......@@ -281,13 +281,13 @@ get_icon_factory (void)
icon_theme_changed_callback (NULL);
eel_preferences_add_callback (NAUTILUS_PREFERENCES_THEME,
icon_theme_changed_callback,
NULL);
icon_theme_changed_callback,
NULL);
thumbnail_limit_changed_callback (NULL);
eel_preferences_add_callback (NAUTILUS_PREFERENCES_IMAGE_FILE_THUMBNAIL_LIMIT,
thumbnail_limit_changed_callback,
NULL);
thumbnail_limit_changed_callback,
NULL);
gtk_signal_connect (GTK_OBJECT (gnome_vfs_mime_monitor_get ()),
"data_changed",
......@@ -1165,10 +1165,6 @@ nautilus_icon_factory_get_icon_for_file (NautilusFile *file, const char *modifie
/* also, dont make thumbnails for images in the thumbnails directory */
if (uri == NULL) {
file_size = nautilus_file_get_size (file);
/* FIXME: This has to be done later, when we know
* whether anti-aliasing is needed or not.
*/
if (eel_istr_has_prefix (mime_type, "image/")
&& is_supported_mime_type (mime_type)
&& should_display_image_file_as_itself (file, TRUE)) {
......@@ -1210,8 +1206,6 @@ nautilus_icon_factory_get_icon_for_file (NautilusFile *file, const char *modifie
return scalable_icon;
}
/**
* nautilus_icon_factory_get_basic_file_attributes
*
......@@ -1271,8 +1265,6 @@ nautilus_icon_factory_is_icon_ready_for_file (NautilusFile *file)
return result;
}
/**
* nautilus_icon_factory_is_basic_icon_ready_for_file
*
......@@ -1295,7 +1287,6 @@ nautilus_icon_factory_is_basic_icon_ready_for_file (NautilusFile *file)
return result;
}
NautilusScalableIcon *
nautilus_icon_factory_get_emblem_icon_by_name (const char *emblem_name)
{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment