X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;f=backend%2Fcomics%2Fcomics-document.c;h=0481de864b586ce7e118820fddd422a4d0907c4d;hb=3128a9b34c8f2d7fd3894e2e478ed824418b1d27;hp=bed6e58180369a31a562c4e8a7a6651168c1c91a;hpb=6012520a4da52d2a6964f5e6ac08238bcf81490b;p=evince.git diff --git a/backend/comics/comics-document.c b/backend/comics/comics-document.c index bed6e581..0481de86 100644 --- a/backend/comics/comics-document.c +++ b/backend/comics/comics-document.c @@ -39,7 +39,6 @@ #include "comics-document.h" #include "ev-document-misc.h" -#include "ev-document-thumbnails.h" #include "ev-file-helpers.h" #ifdef G_OS_WIN32 @@ -123,8 +122,6 @@ static const ComicBookDecompressCommand command_usage_def[] = { {"%s -xOf" , "%s -tf %s" , NULL , FALSE, NO_OFFSET} }; -static void comics_document_document_thumbnails_iface_init (EvDocumentThumbnailsInterface *iface); - static GSList* get_supported_image_extensions (void); static void get_page_size_area_prepared_cb (GdkPixbufLoader *loader, gpointer data); @@ -136,11 +133,7 @@ static char** extract_argv (EvDocument *document, gint page); -EV_BACKEND_REGISTER_WITH_CODE (ComicsDocument, comics_document, - { - EV_BACKEND_IMPLEMENT_INTERFACE (EV_TYPE_DOCUMENT_THUMBNAILS, - comics_document_document_thumbnails_iface_init); - } ); +EV_BACKEND_REGISTER (ComicsDocument, comics_document) /** * comics_regex_quote: @@ -252,7 +245,7 @@ static gboolean comics_generate_command_lines (ComicsDocument *comics_document, GError **error) { - gchar *quoted_file; + gchar *quoted_file, *quoted_file_aux; gchar *quoted_command; ComicBookDecompressType type; @@ -261,10 +254,12 @@ comics_generate_command_lines (ComicsDocument *comics_document, quoted_command = g_shell_quote (comics_document->selected_command); if (comics_document->regex_arg) { quoted_file = comics_regex_quote (comics_document->archive); + quoted_file_aux = g_shell_quote (comics_document->archive); comics_document->list_command = g_strdup_printf (command_usage_def[type].list, comics_document->alternative_command, - comics_document->archive); + quoted_file_aux); + g_free (quoted_file_aux); } else { quoted_file = g_shell_quote (comics_document->archive); comics_document->list_command = @@ -849,52 +844,6 @@ get_supported_image_extensions() return extensions; } -static GdkPixbuf * -comics_document_thumbnails_get_thumbnail (EvDocumentThumbnails *document, - EvRenderContext *rc, - gboolean border) -{ - GdkPixbuf *thumbnail; - - thumbnail = comics_document_render_pixbuf (EV_DOCUMENT (document), rc); - - if (border) { - GdkPixbuf *tmp_pixbuf = thumbnail; - - thumbnail = ev_document_misc_get_thumbnail_frame (-1, -1, tmp_pixbuf); - g_object_unref (tmp_pixbuf); - } - - return thumbnail; -} - -static void -comics_document_thumbnails_get_dimensions (EvDocumentThumbnails *document, - EvRenderContext *rc, - gint *width, - gint *height) -{ - gdouble page_width, page_height; - - comics_document_get_page_size (EV_DOCUMENT (document), rc->page, - &page_width, &page_height); - - if (rc->rotation == 90 || rc->rotation == 270) { - *width = (gint) (page_height * rc->scale); - *height = (gint) (page_width * rc->scale); - } else { - *width = (gint) (page_width * rc->scale); - *height = (gint) (page_height * rc->scale); - } -} - -static void -comics_document_document_thumbnails_iface_init (EvDocumentThumbnailsInterface *iface) -{ - iface->get_thumbnail = comics_document_thumbnails_get_thumbnail; - iface->get_dimensions = comics_document_thumbnails_get_dimensions; -} - static char** extract_argv (EvDocument *document, gint page) {