Fix several compile warnings in the dvi backend.

[evince.git] / backend / comics / comics-document.c

diff --git a/backend/comics/comics-document.c b/backend/comics/comics-document.c
index b0d99ca64069cc74eeb75858c389edf35a2ed297..b2f7b7ac728ff838e5cd1fd263f5dc752adf5411 100644 (file)
--- a/backend/comics/comics-document.c
+++ b/backend/comics/comics-document.c
@@ -64,8 +64,8 @@ static char**     extract_argv                   (EvDocument *document,
 
 EV_BACKEND_REGISTER_WITH_CODE (ComicsDocument, comics_document,
        {
 
 EV_BACKEND_REGISTER_WITH_CODE (ComicsDocument, comics_document,
        {

-               G_IMPLEMENT_INTERFACE (EV_TYPE_DOCUMENT_THUMBNAILS,
-                                      comics_document_document_thumbnails_iface_init);
+               EV_BACKEND_IMPLEMENT_INTERFACE (EV_TYPE_DOCUMENT_THUMBNAILS,
+                                               comics_document_document_thumbnails_iface_init);

        } );
 
 static char *
        } );
 
 static char *


@@ -144,6 +144,12 @@ comics_document_load (EvDocument *document,
                list_files_command = 
                        g_strdup_printf ("zipinfo -1 -- %s", quoted_file);
                comics_document->regex_arg = TRUE;
                list_files_command = 
                        g_strdup_printf ("zipinfo -1 -- %s", quoted_file);
                comics_document->regex_arg = TRUE;

+       } else if (!strcmp (mime_type, "application/x-cb7")) {
+               comics_document->extract_command =
+                       g_strdup ("7zr x -so");
+               list_files_command = 
+                       g_strdup_printf ("7zr l -- %s", quoted_file);
+               comics_document->regex_arg = TRUE;

        }
 
        g_object_unref (file_info);
        }
 
        g_object_unref (file_info);


@@ -221,7 +227,7 @@ comics_document_get_n_pages (EvDocument *document)
 
 static void
 comics_document_get_page_size (EvDocument *document,
 
 static void
 comics_document_get_page_size (EvDocument *document,

-                              int         page,
+                              EvPage     *page,

                               double     *width,
                               double     *height)
 {
                               double     *width,
                               double     *height)
 {


@@ -232,7 +238,7 @@ comics_document_get_page_size (EvDocument *document,
        gint outpipe = -1;
        GPid child_pid = -1;
 
        gint outpipe = -1;
        GPid child_pid = -1;
 

-       argv = extract_argv (document, page);
+       argv = extract_argv (document, page->index);

        success = g_spawn_async_with_pipes (NULL, argv, NULL,
                                            G_SPAWN_SEARCH_PATH | G_SPAWN_STDERR_TO_DEV_NULL,
                                            NULL, NULL,
        success = g_spawn_async_with_pipes (NULL, argv, NULL,
                                            G_SPAWN_SEARCH_PATH | G_SPAWN_STDERR_TO_DEV_NULL,
                                            NULL, NULL,


@@ -290,7 +296,7 @@ comics_document_render_pixbuf (EvDocument      *document,
        gint outpipe = -1;
        GPid child_pid = -1;
 
        gint outpipe = -1;
        GPid child_pid = -1;
 

-       argv = extract_argv (document, rc->page);
+       argv = extract_argv (document, rc->page->index);

        success = g_spawn_async_with_pipes (NULL, argv, NULL,
                                            G_SPAWN_SEARCH_PATH
                                            | G_SPAWN_STDERR_TO_DEV_NULL,
        success = g_spawn_async_with_pipes (NULL, argv, NULL,
                                            G_SPAWN_SEARCH_PATH
                                            | G_SPAWN_STDERR_TO_DEV_NULL,