Mercurial > geeqie
diff src/print.c @ 1011:616b14da08c2
do not access image_loader directly
author | nadvornik |
---|---|
date | Fri, 29 Aug 2008 12:35:13 +0000 |
parents | 4fe8f9656107 |
children | fe82830ab8fd |
line wrap: on
line diff
--- a/src/print.c Fri Aug 29 09:59:20 2008 +0000 +++ b/src/print.c Fri Aug 29 12:35:13 2008 +0000 @@ -2033,7 +2033,7 @@ if (pw->text_fields == 0) return TRUE; string = g_string_new(""); - path = pw->job_loader->fd->path; + path = image_loader_get_fd(pw->job_loader)->path; if (pw->text_fields & TEXT_INFO_FILENAME) { @@ -2062,7 +2062,7 @@ { if (newline) g_string_append(string, "\n"); if (space) g_string_append(string, " - "); - g_string_append(string, text_from_time(filetime(pw->job_loader->fd->path))); + g_string_append(string, text_from_time(filetime(image_loader_get_fd(pw->job_loader)->path))); newline = proof; space = !proof; } @@ -2072,7 +2072,7 @@ if (newline) g_string_append(string, "\n"); if (space) g_string_append(string, " - "); - size = text_from_size_abrev(filesize(pw->job_loader->fd->path)); + size = text_from_size_abrev(filesize(image_loader_get_fd(pw->job_loader)->path)); g_string_append(string, size); g_free(size); } @@ -2153,7 +2153,7 @@ y = y + h + PRINT_TEXT_PADDING; success = (success && - print_job_text_image(pw, pw->job_loader->fd->path, x, y, dw, sw, sh, FALSE)); + print_job_text_image(pw, image_loader_get_fd(pw->job_loader)->path, x, y, dw, sw, sh, FALSE)); } image_loader_free(pw->job_loader); @@ -2274,7 +2274,7 @@ y = y + icon_h + (pw->proof_height - icon_h) / 2 + PRINT_TEXT_PADDING; success = (success && - print_job_text_image(pw, pw->job_loader->fd->path, x, y, icon_w + PRINT_PROOF_MARGIN * 2, w, h, TRUE)); + print_job_text_image(pw, image_loader_get_fd(pw->job_loader)->path, x, y, icon_w + PRINT_PROOF_MARGIN * 2, w, h, TRUE)); if (!success) {