Commit 67fdde6a authored by Cosimo Cecchi's avatar Cosimo Cecchi

icon-info: remove code for unused .icon file functionality

GTK+ deprecated the functionality from GtkIconInfo, and will now always
return empty data. We can then just remove all the code related to that
feature.
parent 2450c146
......@@ -105,14 +105,6 @@
#define SNAP_SIZE_X 78
#define SNAP_SIZE_Y 20
#define MINIMUM_EMBEDDED_TEXT_RECT_WIDTH 20
#define MINIMUM_EMBEDDED_TEXT_RECT_HEIGHT 20
/* If icon size is bigger than this, request large embedded text.
* Its selected so that the non-large text should fit in "normal" icon sizes
*/
#define ICON_SIZE_FOR_LARGE_EMBEDDED_TEXT 55
#define SNAP_HORIZONTAL(func,x) ((func ((double)((x) - DESKTOP_PAD_HORIZONTAL) / SNAP_SIZE_X) * SNAP_SIZE_X) + DESKTOP_PAD_HORIZONTAL)
#define SNAP_VERTICAL(func, y) ((func ((double)((y) - DESKTOP_PAD_VERTICAL) / SNAP_SIZE_Y) * SNAP_SIZE_Y) + DESKTOP_PAD_VERTICAL)
......@@ -167,13 +159,6 @@ static inline void icon_get_bounding_box (NautilusCan
static gboolean is_renaming (NautilusCanvasContainer *container);
static gboolean is_renaming_pending (NautilusCanvasContainer *container);
static void process_pending_icon_to_rename (NautilusCanvasContainer *container);
static void nautilus_canvas_container_stop_monitor_top_left (NautilusCanvasContainer *container,
NautilusCanvasIconData *data,
gconstpointer client);
static void nautilus_canvas_container_start_monitor_top_left (NautilusCanvasContainer *container,
NautilusCanvasIconData *data,
gconstpointer client,
gboolean large_text);
static void handle_hadjustment_changed (GtkAdjustment *adjustment,
NautilusCanvasContainer *container);
static void handle_vadjustment_changed (GtkAdjustment *adjustment,
......@@ -5492,7 +5477,6 @@ void
nautilus_canvas_container_clear (NautilusCanvasContainer *container)
{
NautilusCanvasContainerDetails *details;
NautilusCanvasIcon *icon;
GList *p;
g_return_if_fail (NAUTILUS_IS_CANVAS_CONTAINER (container));
......@@ -5515,12 +5499,6 @@ nautilus_canvas_container_clear (NautilusCanvasContainer *container)
details->drop_target = NULL;
for (p = details->icons; p != NULL; p = p->next) {
icon = p->data;
if (icon->is_monitored) {
nautilus_canvas_container_stop_monitor_top_left (container,
icon->data,
icon);
}
icon_free (p->data);
}
g_list_free (details->icons);
......@@ -5763,11 +5741,6 @@ icon_destroy (NautilusCanvasContainer *container,
details->stretch_icon = NULL;
}
if (icon->is_monitored) {
nautilus_canvas_container_stop_monitor_top_left (container,
icon->data,
icon);
}
icon_free (icon);
if (was_selected) {
......@@ -5867,10 +5840,7 @@ static NautilusIconInfo *
nautilus_canvas_container_get_icon_images (NautilusCanvasContainer *container,
NautilusCanvasIconData *data,
int size,
char **embedded_text,
gboolean for_drag_accept,
gboolean need_large_embeddded_text,
gboolean *embedded_text_needs_loading,
gboolean *has_open_window)
{
NautilusCanvasContainerClass *klass;
......@@ -5878,7 +5848,7 @@ nautilus_canvas_container_get_icon_images (NautilusCanvasContainer *container,
klass = NAUTILUS_CANVAS_CONTAINER_GET_CLASS (container);
g_assert (klass->get_icon_images != NULL);
return klass->get_icon_images (container, data, size, embedded_text, for_drag_accept, need_large_embeddded_text, embedded_text_needs_loading, has_open_window);
return klass->get_icon_images (container, data, size, for_drag_accept, has_open_window);
}
static void
......@@ -5903,34 +5873,6 @@ nautilus_canvas_container_unfreeze_updates (NautilusCanvasContainer *container)
klass->unfreeze_updates (container);
}
static void
nautilus_canvas_container_start_monitor_top_left (NautilusCanvasContainer *container,
NautilusCanvasIconData *data,
gconstpointer client,
gboolean large_text)
{
NautilusCanvasContainerClass *klass;
klass = NAUTILUS_CANVAS_CONTAINER_GET_CLASS (container);
g_assert (klass->start_monitor_top_left != NULL);
klass->start_monitor_top_left (container, data, client, large_text);
}
static void
nautilus_canvas_container_stop_monitor_top_left (NautilusCanvasContainer *container,
NautilusCanvasIconData *data,
gconstpointer client)
{
NautilusCanvasContainerClass *klass;
klass = NAUTILUS_CANVAS_CONTAINER_GET_CLASS (container);
g_return_if_fail (klass->stop_monitor_top_left != NULL);
klass->stop_monitor_top_left (container, data, client);
}
static void
nautilus_canvas_container_prioritize_thumbnailing (NautilusCanvasContainer *container,
NautilusCanvasIcon *icon)
......@@ -6033,15 +5975,8 @@ nautilus_canvas_container_update_icon (NautilusCanvasContainer *container,
guint icon_size;
guint min_image_size, max_image_size;
NautilusIconInfo *icon_info;
GdkPoint *attach_points;
int n_attach_points;
gboolean has_embedded_text_rect;
GdkPixbuf *pixbuf;
char *editable_text, *additional_text;
char *embedded_text;
GdkRectangle embedded_text_rect;
gboolean large_embedded_text;
gboolean embedded_text_needs_loading;
gboolean has_open_window;
if (icon == NULL) {
......@@ -6063,27 +5998,13 @@ nautilus_canvas_container_update_icon (NautilusCanvasContainer *container,
DEBUG ("Icon size, getting for size %d", icon_size);
/* Get the icons. */
embedded_text = NULL;
large_embedded_text = icon_size > ICON_SIZE_FOR_LARGE_EMBEDDED_TEXT;
icon_info = nautilus_canvas_container_get_icon_images (container, icon->data, icon_size,
&embedded_text,
icon == details->drop_target,
large_embedded_text, &embedded_text_needs_loading,
&has_open_window);
pixbuf = nautilus_icon_info_get_pixbuf (icon_info);
nautilus_icon_info_get_attach_points (icon_info, &attach_points, &n_attach_points);
has_embedded_text_rect = nautilus_icon_info_get_embedded_rect (icon_info,
&embedded_text_rect);
g_object_unref (icon_info);
if (has_embedded_text_rect && embedded_text_needs_loading) {
icon->is_monitored = TRUE;
nautilus_canvas_container_start_monitor_top_left (container, icon->data, icon, large_embedded_text);
}
nautilus_canvas_container_get_icon_text (container,
icon->data,
&editable_text,
......@@ -6108,9 +6029,6 @@ nautilus_canvas_container_update_icon (NautilusCanvasContainer *container,
NULL);
nautilus_canvas_item_set_image (icon->item, pixbuf);
nautilus_canvas_item_set_attach_points (icon->item, attach_points, n_attach_points);
nautilus_canvas_item_set_embedded_text_rect (icon->item, &embedded_text_rect);
nautilus_canvas_item_set_embedded_text (icon->item, embedded_text);
/* Let the pixbufs go. */
g_object_unref (pixbuf);
......
......@@ -137,10 +137,7 @@ typedef struct {
NautilusIconInfo *(* get_icon_images) (NautilusCanvasContainer *container,
NautilusCanvasIconData *data,
int canvas_size,
char **embedded_text,
gboolean for_drag_accept,
gboolean need_large_embeddded_text,
gboolean *embedded_text_needs_loading,
gboolean *has_window_open);
void (* get_icon_text) (NautilusCanvasContainer *container,
NautilusCanvasIconData *data,
......@@ -157,13 +154,6 @@ typedef struct {
NautilusCanvasIconData *canvas_b);
void (* freeze_updates) (NautilusCanvasContainer *container);
void (* unfreeze_updates) (NautilusCanvasContainer *container);
void (* start_monitor_top_left) (NautilusCanvasContainer *container,
NautilusCanvasIconData *data,
gconstpointer client,
gboolean large_text);
void (* stop_monitor_top_left) (NautilusCanvasContainer *container,
NautilusCanvasIconData *data,
gconstpointer client);
void (* prioritize_thumbnailing) (NautilusCanvasContainer *container,
NautilusCanvasIconData *data);
......
......@@ -75,8 +75,6 @@ struct NautilusCanvasItemDetails {
cairo_surface_t *rendered_surface;
char *editable_text; /* Text that can be modified by a renaming function */
char *additional_text; /* Text that cannot be modifed, such as file size, etc. */
GdkPoint *attach_points;
int n_attach_points;
/* Size of the text at current font. */
int text_dx;
......@@ -116,13 +114,9 @@ struct NautilusCanvasItemDetails {
guint is_visible : 1;
GdkRectangle embedded_text_rect;
char *embedded_text;
/* Cached PangoLayouts. Only used if the icon is visible */
PangoLayout *editable_text_layout;
PangoLayout *additional_text_layout;
PangoLayout *embedded_text_layout;
/* Cached rectangle in canvas coordinates */
EelIRect icon_rect;
......@@ -212,7 +206,6 @@ nautilus_canvas_item_finalize (GObject *object)
g_free (details->editable_text);
g_free (details->additional_text);
g_free (details->attach_points);
if (details->rendered_surface != NULL) {
cairo_surface_destroy (details->rendered_surface);
......@@ -226,12 +219,6 @@ nautilus_canvas_item_finalize (GObject *object)
g_object_unref (details->additional_text_layout);
}
if (details->embedded_text_layout != NULL) {
g_object_unref (details->embedded_text_layout);
}
g_free (details->embedded_text);
G_OBJECT_CLASS (nautilus_canvas_item_parent_class)->finalize (object);
}
......@@ -266,9 +253,6 @@ nautilus_canvas_item_invalidate_label_size (NautilusCanvasItem *item)
if (item->details->additional_text_layout != NULL) {
pango_layout_context_changed (item->details->additional_text_layout);
}
if (item->details->embedded_text_layout != NULL) {
pango_layout_context_changed (item->details->embedded_text_layout);
}
nautilus_canvas_item_invalidate_bounds_cache (item);
item->details->text_width = -1;
item->details->text_height = -1;
......@@ -471,52 +455,6 @@ nautilus_canvas_item_set_image (NautilusCanvasItem *item,
eel_canvas_item_request_update (EEL_CANVAS_ITEM (item));
}
void
nautilus_canvas_item_set_attach_points (NautilusCanvasItem *item,
GdkPoint *attach_points,
int n_attach_points)
{
g_free (item->details->attach_points);
item->details->attach_points = NULL;
item->details->n_attach_points = 0;
if (attach_points != NULL && n_attach_points != 0) {
item->details->attach_points = g_memdup (attach_points, n_attach_points * sizeof (GdkPoint));
item->details->n_attach_points = n_attach_points;
}
nautilus_canvas_item_invalidate_bounds_cache (item);
}
void
nautilus_canvas_item_set_embedded_text_rect (NautilusCanvasItem *item,
const GdkRectangle *text_rect)
{
item->details->embedded_text_rect = *text_rect;
nautilus_canvas_item_invalidate_bounds_cache (item);
eel_canvas_item_request_update (EEL_CANVAS_ITEM (item));
}
void
nautilus_canvas_item_set_embedded_text (NautilusCanvasItem *item,
const char *text)
{
g_free (item->details->embedded_text);
item->details->embedded_text = g_strdup (text);
if (item->details->embedded_text_layout != NULL) {
if (text != NULL) {
pango_layout_set_text (item->details->embedded_text_layout, text, -1);
} else {
pango_layout_set_text (item->details->embedded_text_layout, "", -1);
}
}
eel_canvas_item_request_update (EEL_CANVAS_ITEM (item));
}
/* Recomputes the bounding box of a canvas item.
* This is a generic implementation that could be used for any canvas item
* class, it has no assumptions about how the item is used.
......@@ -1103,14 +1041,8 @@ nautilus_canvas_item_invalidate_label (NautilusCanvasItem *item)
g_object_unref (item->details->additional_text_layout);
item->details->additional_text_layout = NULL;
}
if (item->details->embedded_text_layout) {
g_object_unref (item->details->embedded_text_layout);
item->details->embedded_text_layout = NULL;
}
}
static GdkPixbuf *
get_knob_pixbuf (void)
{
......@@ -1260,63 +1192,6 @@ map_surface (NautilusCanvasItem *canvas_item)
return canvas_item->details->rendered_surface;
}
static void
draw_embedded_text (NautilusCanvasItem *item,
cairo_t *cr,
int x, int y)
{
PangoLayout *layout;
PangoContext *context;
PangoFontDescription *desc;
GtkWidget *widget;
GtkStyleContext *style_context;
if (item->details->embedded_text == NULL ||
item->details->embedded_text_rect.width == 0 ||
item->details->embedded_text_rect.height == 0) {
return;
}
widget = GTK_WIDGET (EEL_CANVAS_ITEM (item)->canvas);
if (item->details->embedded_text_layout != NULL) {
layout = g_object_ref (item->details->embedded_text_layout);
} else {
context = gtk_widget_get_pango_context (widget);
layout = pango_layout_new (context);
pango_layout_set_text (layout, item->details->embedded_text, -1);
desc = pango_font_description_from_string ("monospace 6");
pango_layout_set_font_description (layout, desc);
pango_font_description_free (desc);
if (item->details->is_visible) {
item->details->embedded_text_layout = g_object_ref (layout);
}
}
style_context = gtk_widget_get_style_context (widget);
gtk_style_context_save (style_context);
gtk_style_context_add_class (style_context, "icon-embedded-text");
cairo_save (cr);
cairo_rectangle (cr,
x + item->details->embedded_text_rect.x,
y + item->details->embedded_text_rect.y,
item->details->embedded_text_rect.width,
item->details->embedded_text_rect.height);
cairo_clip (cr);
gtk_render_layout (style_context, cr,
x + item->details->embedded_text_rect.x,
y + item->details->embedded_text_rect.y,
layout);
gtk_style_context_restore (style_context);
cairo_restore (cr);
}
cairo_surface_t *
nautilus_canvas_item_get_drag_surface (NautilusCanvasItem *item)
{
......@@ -1371,8 +1246,6 @@ nautilus_canvas_item_get_drag_surface (NautilusCanvasItem *item)
icon_rect.x1 = item_offset_x + pix_width;
icon_rect.y1 = item_offset_y + pix_height;
draw_embedded_text (item, cr,
item_offset_x, item_offset_y);
draw_label_text (item, cr, icon_rect);
cairo_destroy (cr);
......@@ -1415,8 +1288,6 @@ nautilus_canvas_item_draw (EelCanvasItem *item,
icon_rect.x0, icon_rect.y0);
cairo_surface_destroy (temp_surface);
draw_embedded_text (canvas_item, cr, icon_rect.x0, icon_rect.y0);
/* Draw stretching handles (if necessary). */
draw_stretch_handles (canvas_item, cr, &icon_rect);
......
......@@ -72,13 +72,6 @@ void nautilus_canvas_item_set_emblems (NautilusCanvasItem
GList *emblem_pixbufs);
void nautilus_canvas_item_set_show_stretch_handles (NautilusCanvasItem *item,
gboolean show_stretch_handles);
void nautilus_canvas_item_set_attach_points (NautilusCanvasItem *item,
GdkPoint *attach_points,
int n_attach_points);
void nautilus_canvas_item_set_embedded_text_rect (NautilusCanvasItem *item,
const GdkRectangle *text_rect);
void nautilus_canvas_item_set_embedded_text (NautilusCanvasItem *item,
const char *text);
double nautilus_canvas_item_get_max_text_width (NautilusCanvasItem *item);
const char *nautilus_canvas_item_get_editable_text (NautilusCanvasItem *canvas_item);
void nautilus_canvas_item_set_renaming (NautilusCanvasItem *canvas_item,
......
......@@ -61,9 +61,6 @@ typedef struct {
/* Whether this item is visible in the view. */
eel_boolean_bit is_visible : 1;
/* Whether a monitor was set on this icon. */
eel_boolean_bit is_monitored : 1;
eel_boolean_bit has_lazy_position : 1;
} NautilusCanvasIcon;
......
......@@ -507,18 +507,6 @@ mime_list_cancel (NautilusDirectory *directory)
}
}
static void
top_left_cancel (NautilusDirectory *directory)
{
if (directory->details->top_left_read_state != NULL) {
g_cancellable_cancel (directory->details->top_left_read_state->cancellable);
directory->details->top_left_read_state->directory = NULL;
directory->details->top_left_read_state = NULL;
async_job_end (directory, "top left");
}
}
static void
link_info_cancel (NautilusDirectory *directory)
{
......@@ -675,16 +663,6 @@ nautilus_directory_set_up_request (NautilusFileAttributes file_attributes)
REQUEST_SET_TYPE (request, REQUEST_FILE_INFO);
REQUEST_SET_TYPE (request, REQUEST_LINK_INFO);
}
if (file_attributes & NAUTILUS_FILE_ATTRIBUTE_TOP_LEFT_TEXT) {
REQUEST_SET_TYPE (request, REQUEST_TOP_LEFT_TEXT);
REQUEST_SET_TYPE (request, REQUEST_FILE_INFO);
}
if (file_attributes & NAUTILUS_FILE_ATTRIBUTE_LARGE_TOP_LEFT_TEXT) {
REQUEST_SET_TYPE (request, REQUEST_LARGE_TOP_LEFT_TEXT);
REQUEST_SET_TYPE (request, REQUEST_FILE_INFO);
}
if ((file_attributes & NAUTILUS_FILE_ATTRIBUTE_EXTENSION_INFO) != 0) {
REQUEST_SET_TYPE (request, REQUEST_EXTENSION_INFO);
......@@ -1576,11 +1554,6 @@ nautilus_async_destroying_file (NautilusFile *file)
directory->details->get_info_file = NULL;
changed = TRUE;
}
if (directory->details->top_left_read_state != NULL
&& directory->details->top_left_read_state->file == file) {
directory->details->top_left_read_state->file = NULL;
changed = TRUE;
}
if (directory->details->link_info_read_state != NULL &&
directory->details->link_info_read_state->file == file) {
directory->details->link_info_read_state->file = NULL;
......@@ -1629,22 +1602,6 @@ should_get_directory_count_now (NautilusFile *file)
&& !file->details->loading_directory;
}
static gboolean
lacks_top_left (NautilusFile *file)
{
return file->details->file_info_is_up_to_date &&
!file->details->top_left_text_is_up_to_date
&& nautilus_file_should_get_top_left_text (file);
}
static gboolean
lacks_large_top_left (NautilusFile *file)
{
return file->details->file_info_is_up_to_date &&
(!file->details->top_left_text_is_up_to_date ||
file->details->got_large_top_left_text != file->details->got_top_left_text)
&& nautilus_file_should_get_top_left_text (file);
}
static gboolean
lacks_info (NautilusFile *file)
{
......@@ -1773,18 +1730,6 @@ request_is_satisfied (NautilusDirectory *directory,
}
}
if (REQUEST_WANTS_TYPE (request, REQUEST_TOP_LEFT_TEXT)) {
if (has_problem (directory, file, lacks_top_left)) {
return FALSE;
}
}
if (REQUEST_WANTS_TYPE (request, REQUEST_LARGE_TOP_LEFT_TEXT)) {
if (has_problem (directory, file, lacks_large_top_left)) {
return FALSE;
}
}
if (REQUEST_WANTS_TYPE (request, REQUEST_DEEP_COUNT)) {
if (has_problem (directory, file, lacks_deep_count)) {
return FALSE;
......@@ -3143,185 +3088,6 @@ mime_list_start (NautilusDirectory *directory,
g_object_unref (location);
}
static void
top_left_stop (NautilusDirectory *directory)
{
NautilusFile *file;
if (directory->details->top_left_read_state != NULL) {
file = directory->details->top_left_read_state->file;
if (file != NULL) {
g_assert (NAUTILUS_IS_FILE (file));
g_assert (file->details->directory == directory);
if (is_needy (file,
lacks_top_left,
REQUEST_TOP_LEFT_TEXT) ||
is_needy (file,
lacks_large_top_left,
REQUEST_LARGE_TOP_LEFT_TEXT)) {
return;
}
}
/* The top left is not wanted, so stop it. */
top_left_cancel (directory);
}
}
static void
top_left_read_state_free (TopLeftTextReadState *state)
{
g_object_unref (state->cancellable);
g_free (state);
}
static void
top_left_read_callback (GObject *source_object,
GAsyncResult *res,
gpointer callback_data)
{
TopLeftTextReadState *state;
NautilusDirectory *directory;
NautilusFileDetails *file_details;
gsize file_size;
char *file_contents;
state = callback_data;
if (state->directory == NULL) {
/* Operation was cancelled. Bail out */
top_left_read_state_free (state);
return;
}
directory = nautilus_directory_ref (state->directory);
file_details = state->file->details;
file_details->top_left_text_is_up_to_date = TRUE;
g_free (file_details->top_left_text);
if (g_file_load_partial_contents_finish (G_FILE (source_object),
res,
&file_contents, &file_size,
NULL, NULL)) {
file_details->top_left_text = nautilus_extract_top_left_text (file_contents, state->large, file_size);
file_details->got_top_left_text = TRUE;
file_details->got_large_top_left_text = state->large;
g_free (file_contents);
} else {
file_details->top_left_text = NULL;
file_details->got_top_left_text = FALSE;
file_details->got_large_top_left_text = FALSE;
}
nautilus_file_changed (state->file);
directory->details->top_left_read_state = NULL;
async_job_end (directory, "top left");
top_left_read_state_free (state);
nautilus_directory_async_state_changed (directory);
nautilus_directory_unref (directory);
}
static int
count_lines (const char *text, int length)
{
int count, i;
count = 0;
for (i = 0; i < length; i++) {
count += *text++ == '\n';
}
return count;
}
static gboolean
top_left_read_more_callback (const char *file_contents,
goffset bytes_read,
gpointer callback_data)
{
TopLeftTextReadState *state;
state = callback_data;
/* Stop reading when we have enough. */
if (state->large) {
return bytes_read < NAUTILUS_FILE_LARGE_TOP_LEFT_TEXT_MAXIMUM_BYTES &&
count_lines (file_contents, bytes_read) <= NAUTILUS_FILE_LARGE_TOP_LEFT_TEXT_MAXIMUM_LINES;
} else {
return bytes_read < NAUTILUS_FILE_TOP_LEFT_TEXT_MAXIMUM_BYTES &&
count_lines (file_contents, bytes_read) <= NAUTILUS_FILE_TOP_LEFT_TEXT_MAXIMUM_LINES;
}
}
static void
top_left_start (NautilusDirectory *directory,
NautilusFile *file,
gboolean *doing_io)
{
GFile *location;
gboolean needs_large;
TopLeftTextReadState *state;
if (directory->details->top_left_read_state != NULL) {
*doing_io = TRUE;
return;
}
needs_large = FALSE;
if (is_needy (file,
lacks_large_top_left,
REQUEST_LARGE_TOP_LEFT_TEXT)) {
needs_large = TRUE;
}
/* Figure out which file to read the top left for. */
if (!(needs_large ||
is_needy (file,
lacks_top_left,
REQUEST_TOP_LEFT_TEXT))) {
return;
}
*doing_io = TRUE;
if (!nautilus_file_contains_text (file)) {
g_free (file->details->top_left_text);
file->details->top_left_text = NULL;
file->details->got_top_left_text = FALSE;
file->details->got_large_top_left_text = FALSE;
file->details->top_left_text_is_up_to_date = TRUE;
nautilus_directory_async_state_changed (directory);
return;
}
if (!async_job_start (directory, "top left")) {
return;
}
/* Start reading. */
state = g_new0 (TopLeftTextReadState, 1);
state->directory = directory;
state->cancellable = g_cancellable_new ();
state->large = needs_large;
state->file = file;
directory->details->top_left_read_state = state;
location = nautilus_file_get_location (file);
g_file_load_partial_contents_async (location,
state->cancellable,
top_left_read_more_callback,
top_left_read_callback,
state);
g_object_unref (location);
}
static void
get_info_state_free (GetInfoState *state)
{
......@@ -4446,7 +4212,6 @@ start_or_stop_io (NautilusDirectory *directory)
directory_count_stop (directory);
deep_count_stop (directory);
mime_list_stop (directory);
top_left_stop (directory);
link_info_stop (directory);
extension_info_stop (directory);
mount_stop (directory);
......@@ -4478,7 +4243,6 @@ start_or_stop_io (NautilusDirectory *directory)
directory_count_start (directory, file, &doing_io);
deep_count_start (directory, file, &doing_io);
mime_list_start (directory, file, &doing_io);
top_left_start (directory, file, &doing_io);
thumbnail_start (directory, file, &doing_io);
filesystem_info_start (directory, file, &doing_io);
......@@ -4548,7 +4312,6 @@ nautilus_directory_cancel (NautilusDirectory *directory)
link_info_cancel (directory);
mime_list_cancel (directory);
new_files_cancel (directory);
top_left_cancel (directory);
extension_info_cancel (directory);
thumbnail_cancel (directory);
mount_cancel (directory);
......@@ -4592,16 +4355,6 @@ cancel_mime_list_for_file (NautilusDirectory *directory,
}