Mercurial > geeqie

comparison src/filedata.c @ 845:06929cbcd796

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
renamed fd->pixbuf to fd->thumb_pixbuf
author nadvornik
date Sat, 21 Jun 2008 11:05:55 +0000
parents 8620e6934cfb
children 8911a4f0e56c
comparison
equal deleted inserted replaced
844:efed9a1520d6 845:06929cbcd796
228 if (fd->size != st->st_size || 228 if (fd->size != st->st_size ||
229 fd->date != st->st_mtime) 229 fd->date != st->st_mtime)
230 { 230 {
231 fd->size = st->st_size; 231 fd->size = st->st_size;
232 fd->date = st->st_mtime; 232 fd->date = st->st_mtime;
233 if (fd->pixbuf) g_object_unref(fd->pixbuf); 233 if (fd->thumb_pixbuf) g_object_unref(fd->thumb_pixbuf);
234 fd->pixbuf = NULL; 234 fd->thumb_pixbuf = NULL;
235 file_data_increment_version(fd); 235 file_data_increment_version(fd);
236 file_data_send_notification(fd, NOTIFY_TYPE_REREAD); 236 file_data_send_notification(fd, NOTIFY_TYPE_REREAD);
237 ret = TRUE; 237 ret = TRUE;
238 } 238 }
239 239
328 fd->collate_key_name_nocase = NULL; 328 fd->collate_key_name_nocase = NULL;
329 fd->original_path = NULL; 329 fd->original_path = NULL;
330 330
331 fd->size = st->st_size; 331 fd->size = st->st_size;
332 fd->date = st->st_mtime; 332 fd->date = st->st_mtime;
333 fd->pixbuf = NULL; 333 fd->thumb_pixbuf = NULL;
334 fd->sidecar_files = NULL; 334 fd->sidecar_files = NULL;
335 fd->ref = 1; 335 fd->ref = 1;
336 fd->magick = 0x12345678; 336 fd->magick = 0x12345678;
337 337
338 file_data_set_path(fd, path_utf8); /* set path, name, collate_key_*, original_path */ 338 file_data_set_path(fd, path_utf8); /* set path, name, collate_key_*, original_path */
463 463
464 g_free(fd->path); 464 g_free(fd->path);
465 g_free(fd->original_path); 465 g_free(fd->original_path);
466 g_free(fd->collate_key_name); 466 g_free(fd->collate_key_name);
467 g_free(fd->collate_key_name_nocase); 467 g_free(fd->collate_key_name_nocase);
468 if (fd->pixbuf) g_object_unref(fd->pixbuf); 468 if (fd->thumb_pixbuf) g_object_unref(fd->thumb_pixbuf);
469 469
470 g_assert(fd->sidecar_files == NULL); /* sidecar files must be freed before calling this */ 470 g_assert(fd->sidecar_files == NULL); /* sidecar files must be freed before calling this */
471 471
472 file_data_change_info_free(NULL, fd); 472 file_data_change_info_free(NULL, fd);
473 g_free(fd); 473 g_free(fd);