Mercurial > geeqie.yaz
comparison src/view_file_icon.c @ 562:544958ddd70e
Rename thumbs_fd to thumbs_filedata in ViewFileIcon struct to match
the name used in ViewFileList.
| author | zas_ |
|---|---|
| date | Sat, 03 May 2008 15:13:15 +0000 |
| parents | 977b9bbd0e9b |
| children | 2996f1bbc305 |
comparison
equal
deleted
inserted
replaced
| 561:977b9bbd0e9b | 562:544958ddd70e |
|---|---|
| 1889 vfi->thumbs_running = FALSE; | 1889 vfi->thumbs_running = FALSE; |
| 1890 | 1890 |
| 1891 thumb_loader_free(vfi->thumbs_loader); | 1891 thumb_loader_free(vfi->thumbs_loader); |
| 1892 vfi->thumbs_loader = NULL; | 1892 vfi->thumbs_loader = NULL; |
| 1893 | 1893 |
| 1894 vfi->thumbs_fd = NULL; | 1894 vfi->thumbs_filedata = NULL; |
| 1895 } | 1895 } |
| 1896 | 1896 |
| 1897 static void vficon_thumb_stop(ViewFileIcon *vfi) | 1897 static void vficon_thumb_stop(ViewFileIcon *vfi) |
| 1898 { | 1898 { |
| 1899 if (vfi->thumbs_running) vficon_thumb_cleanup(vfi); | 1899 if (vfi->thumbs_running) vficon_thumb_cleanup(vfi); |
| 1914 | 1914 |
| 1915 static void vficon_thumb_error_cb(ThumbLoader *tl, gpointer data) | 1915 static void vficon_thumb_error_cb(ThumbLoader *tl, gpointer data) |
| 1916 { | 1916 { |
| 1917 ViewFileIcon *vfi = data; | 1917 ViewFileIcon *vfi = data; |
| 1918 | 1918 |
| 1919 if (vfi->thumbs_fd && vfi->thumbs_loader == tl) | 1919 if (vfi->thumbs_filedata && vfi->thumbs_loader == tl) |
| 1920 { | 1920 { |
| 1921 vficon_thumb_do(vfi, tl, vfi->thumbs_fd); | 1921 vficon_thumb_do(vfi, tl, vfi->thumbs_filedata); |
| 1922 } | 1922 } |
| 1923 | 1923 |
| 1924 while (vficon_thumb_next(vfi)); | 1924 while (vficon_thumb_next(vfi)); |
| 1925 } | 1925 } |
| 1926 | 1926 |
| 1927 static void vficon_thumb_done_cb(ThumbLoader *tl, gpointer data) | 1927 static void vficon_thumb_done_cb(ThumbLoader *tl, gpointer data) |
| 1928 { | 1928 { |
| 1929 ViewFileIcon *vfi = data; | 1929 ViewFileIcon *vfi = data; |
| 1930 | 1930 |
| 1931 if (vfi->thumbs_fd && vfi->thumbs_loader == tl) | 1931 if (vfi->thumbs_filedata && vfi->thumbs_loader == tl) |
| 1932 { | 1932 { |
| 1933 vficon_thumb_do(vfi, tl, vfi->thumbs_fd); | 1933 vficon_thumb_do(vfi, tl, vfi->thumbs_filedata); |
| 1934 } | 1934 } |
| 1935 | 1935 |
| 1936 while (vficon_thumb_next(vfi)); | 1936 while (vficon_thumb_next(vfi)); |
| 1937 } | 1937 } |
| 1938 | 1938 |
| 1996 return FALSE; | 1996 return FALSE; |
| 1997 } | 1997 } |
| 1998 | 1998 |
| 1999 vfi->thumbs_count++; | 1999 vfi->thumbs_count++; |
| 2000 | 2000 |
| 2001 vfi->thumbs_fd = fd; | 2001 vfi->thumbs_filedata = fd; |
| 2002 | 2002 |
| 2003 thumb_loader_free(vfi->thumbs_loader); | 2003 thumb_loader_free(vfi->thumbs_loader); |
| 2004 | 2004 |
| 2005 vfi->thumbs_loader = thumb_loader_new(options->thumbnails.max_width, options->thumbnails.max_height); | 2005 vfi->thumbs_loader = thumb_loader_new(options->thumbnails.max_width, options->thumbnails.max_height); |
| 2006 thumb_loader_set_callbacks(vfi->thumbs_loader, | 2006 thumb_loader_set_callbacks(vfi->thumbs_loader, |
| 2695 vficon_send_layout_select(vfi, idn); | 2695 vficon_send_layout_select(vfi, idn); |
| 2696 } | 2696 } |
| 2697 } | 2697 } |
| 2698 | 2698 |
| 2699 /* Thumb loader check */ | 2699 /* Thumb loader check */ |
| 2700 if (fd == vfi->thumbs_fd) vfi->thumbs_fd = NULL; | 2700 if (fd == vfi->thumbs_filedata) vfi->thumbs_filedata = NULL; |
| 2701 if (vfi->thumbs_count > 0) vfi->thumbs_count--; | 2701 if (vfi->thumbs_count > 0) vfi->thumbs_count--; |
| 2702 | 2702 |
| 2703 if (vfi->prev_selection == id) vfi->prev_selection = NULL; | 2703 if (vfi->prev_selection == id) vfi->prev_selection = NULL; |
| 2704 if (vfi->click_id == id) vfi->click_id = NULL; | 2704 if (vfi->click_id == id) vfi->click_id = NULL; |
| 2705 | 2705 |