Mercurial > geeqie
comparison src/search.c @ 845:06929cbcd796
renamed fd->pixbuf to fd->thumb_pixbuf
author | nadvornik |
---|---|
date | Sat, 21 Jun 2008 11:05:55 +0000 |
parents | 9bd49e725ad3 |
children | cb3b6238782a |
comparison
equal
deleted
inserted
replaced
844:efed9a1520d6 | 845:06929cbcd796 |
---|---|
493 store = GTK_LIST_STORE(gtk_tree_view_get_model(GTK_TREE_VIEW(sd->result_view))); | 493 store = GTK_LIST_STORE(gtk_tree_view_get_model(GTK_TREE_VIEW(sd->result_view))); |
494 gtk_list_store_append(store, &iter); | 494 gtk_list_store_append(store, &iter); |
495 gtk_list_store_set(store, &iter, | 495 gtk_list_store_set(store, &iter, |
496 SEARCH_COLUMN_POINTER, mfd, | 496 SEARCH_COLUMN_POINTER, mfd, |
497 SEARCH_COLUMN_RANK, mfd->rank, | 497 SEARCH_COLUMN_RANK, mfd->rank, |
498 SEARCH_COLUMN_THUMB, fd->pixbuf, | 498 SEARCH_COLUMN_THUMB, fd->thumb_pixbuf, |
499 SEARCH_COLUMN_NAME, fd->name, | 499 SEARCH_COLUMN_NAME, fd->name, |
500 SEARCH_COLUMN_SIZE, text_size, | 500 SEARCH_COLUMN_SIZE, text_size, |
501 SEARCH_COLUMN_DATE, text_from_time(fd->date), | 501 SEARCH_COLUMN_DATE, text_from_time(fd->date), |
502 SEARCH_COLUMN_DIMENSIONS, text_dim, | 502 SEARCH_COLUMN_DIMENSIONS, text_dim, |
503 SEARCH_COLUMN_PATH, fd->path, | 503 SEARCH_COLUMN_PATH, fd->path, |
708 if (!iter) | 708 if (!iter) |
709 { | 709 { |
710 if (search_result_find_row(sd, fd, &iter_n) >= 0) iter = &iter_n; | 710 if (search_result_find_row(sd, fd, &iter_n) >= 0) iter = &iter_n; |
711 } | 711 } |
712 | 712 |
713 if (iter) gtk_list_store_set(store, iter, SEARCH_COLUMN_THUMB, fd->pixbuf, -1); | 713 if (iter) gtk_list_store_set(store, iter, SEARCH_COLUMN_THUMB, fd->thumb_pixbuf, -1); |
714 } | 714 } |
715 | 715 |
716 static void search_result_thumb_do(SearchData *sd) | 716 static void search_result_thumb_do(SearchData *sd) |
717 { | 717 { |
718 FileData *fd; | 718 FileData *fd; |
756 { | 756 { |
757 GdkPixbuf *pixbuf; | 757 GdkPixbuf *pixbuf; |
758 | 758 |
759 length++; | 759 length++; |
760 gtk_tree_model_get(store, &iter, SEARCH_COLUMN_POINTER, &mfd, SEARCH_COLUMN_THUMB, &pixbuf, -1); | 760 gtk_tree_model_get(store, &iter, SEARCH_COLUMN_POINTER, &mfd, SEARCH_COLUMN_THUMB, &pixbuf, -1); |
761 if (pixbuf || mfd->fd->pixbuf) | 761 if (pixbuf || mfd->fd->thumb_pixbuf) |
762 { | 762 { |
763 if (!pixbuf) gtk_list_store_set(GTK_LIST_STORE(store), &iter, SEARCH_COLUMN_THUMB, mfd->fd->pixbuf, -1); | 763 if (!pixbuf) gtk_list_store_set(GTK_LIST_STORE(store), &iter, SEARCH_COLUMN_THUMB, mfd->fd->thumb_pixbuf, -1); |
764 row++; | 764 row++; |
765 mfd = NULL; | 765 mfd = NULL; |
766 } | 766 } |
767 valid = gtk_tree_model_iter_next(store, &iter); | 767 valid = gtk_tree_model_iter_next(store, &iter); |
768 } | 768 } |
1405 gtk_tree_path_free(tpath); | 1405 gtk_tree_path_free(tpath); |
1406 } | 1406 } |
1407 } | 1407 } |
1408 | 1408 |
1409 if (sd->thumb_enable && | 1409 if (sd->thumb_enable && |
1410 sd->click_fd && sd->click_fd->pixbuf) | 1410 sd->click_fd && sd->click_fd->thumb_pixbuf) |
1411 { | 1411 { |
1412 dnd_set_drag_icon(widget, context, sd->click_fd->pixbuf, search_result_selection_count(sd, NULL)); | 1412 dnd_set_drag_icon(widget, context, sd->click_fd->thumb_pixbuf, search_result_selection_count(sd, NULL)); |
1413 } | 1413 } |
1414 } | 1414 } |
1415 | 1415 |
1416 static void search_dnd_init(SearchData *sd) | 1416 static void search_dnd_init(SearchData *sd) |
1417 { | 1417 { |