Fixes bug #542924. Makes enums static to fix Solaris build.

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

diff --git a/backend/dvi/dvi-document.c b/backend/dvi/dvi-document.c
index 56a0d9231d3f214f1c40cc2c9dfc13a5044458bd..876d577092b026153984732fb65f25a0e6094108 100644 (file)
--- a/backend/dvi/dvi-document.c
+++ b/backend/dvi/dvi-document.c
@@ -19,6 +19,7 @@
 
 #include "config.h"
 
 
 #include "config.h"
 

+#include <config.h>

 #include "dvi-document.h"
 #include "ev-document-thumbnails.h"
 #include "ev-document-misc.h"
 #include "dvi-document.h"
 #include "ev-document-thumbnails.h"
 #include "ev-document-misc.h"


@@ -66,10 +67,6 @@ typedef struct _DviDocumentClass DviDocumentClass;
 static void dvi_document_document_iface_init            (EvDocumentIface           *iface);
 static void dvi_document_document_thumbnails_iface_init (EvDocumentThumbnailsIface *iface);
 static void dvi_document_file_exporter_iface_init      (EvFileExporterIface       *iface);
 static void dvi_document_document_iface_init            (EvDocumentIface           *iface);
 static void dvi_document_document_thumbnails_iface_init (EvDocumentThumbnailsIface *iface);
 static void dvi_document_file_exporter_iface_init      (EvFileExporterIface       *iface);

-static void dvi_document_get_page_size                         (EvDocument                *document,
-                                                        int                        page,
-                                                        double                    *width,
-                                                        double                    *height);

 static void dvi_document_do_color_special               (DviContext                *dvi,
                                                         const char                *prefix,
                                                         const char                *arg);
 static void dvi_document_do_color_special               (DviContext                *dvi,
                                                         const char                *prefix,
                                                         const char                *arg);


@@ -149,7 +146,7 @@ dvi_document_get_n_pages (EvDocument *document)
 
 static void
 dvi_document_get_page_size (EvDocument *document,
 
 static void
 dvi_document_get_page_size (EvDocument *document,

-                           int         page,
+                           EvPage     *page,

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


@@ -176,7 +173,7 @@ dvi_document_render (EvDocument      *document,
         */
        g_mutex_lock (dvi_context_mutex);
        
         */
        g_mutex_lock (dvi_context_mutex);
        

-       mdvi_setpage (dvi_document->context, rc->page);
+       mdvi_setpage (dvi_document->context, rc->page->index);

        
        mdvi_set_shrink (dvi_document->context, 
                         (int)((dvi_document->params->hshrink - 1) / rc->scale) + 1,
        
        mdvi_set_shrink (dvi_document->context, 
                         (int)((dvi_document->params->hshrink - 1) / rc->scale) + 1,


@@ -273,8 +270,8 @@ dvi_document_document_iface_init (EvDocumentIface *iface)
 static void
 dvi_document_thumbnails_get_dimensions (EvDocumentThumbnails *document,
                                        EvRenderContext      *rc, 
 static void
 dvi_document_thumbnails_get_dimensions (EvDocumentThumbnails *document,
                                        EvRenderContext      *rc, 

-                                       gint                  *width,
-                                       gint                  *height)
+                                       gint                 *width,
+                                       gint                 *height)

 {      
        DviDocument *dvi_document = DVI_DOCUMENT (document);
        gdouble page_width = dvi_document->base_width;
 {      
        DviDocument *dvi_document = DVI_DOCUMENT (document);
        gdouble page_width = dvi_document->base_width;


@@ -306,7 +303,7 @@ dvi_document_thumbnails_get_thumbnail (EvDocumentThumbnails *document,
 
        g_mutex_lock (dvi_context_mutex);
        
 
        g_mutex_lock (dvi_context_mutex);
        

-       mdvi_setpage (dvi_document->context, rc->page);
+       mdvi_setpage (dvi_document->context, rc->page->index);

 
        mdvi_set_shrink (dvi_document->context, 
                          (int)dvi_document->base_width * dvi_document->params->hshrink / thumb_width,
 
        mdvi_set_shrink (dvi_document->context, 
                          (int)dvi_document->base_width * dvi_document->params->hshrink / thumb_width,


@@ -362,7 +359,7 @@ dvi_document_file_exporter_begin (EvFileExporter        *exporter,
        
        if (dvi_document->exporter_filename)
                g_free (dvi_document->exporter_filename);       
        
        if (dvi_document->exporter_filename)
                g_free (dvi_document->exporter_filename);       

-       dvi_document->exporter_filename = g_strdup(fc->filename);
+       dvi_document->exporter_filename = g_strdup (fc->filename);

        
        if (dvi_document->exporter_opts) {
                g_string_free (dvi_document->exporter_opts, TRUE);
        
        if (dvi_document->exporter_opts) {
                g_string_free (dvi_document->exporter_opts, TRUE);


@@ -376,7 +373,7 @@ dvi_document_file_exporter_do_page (EvFileExporter  *exporter,
 {
        DviDocument *dvi_document = DVI_DOCUMENT(exporter);
 
 {
        DviDocument *dvi_document = DVI_DOCUMENT(exporter);
 

-       g_string_append_printf(dvi_document->exporter_opts, "%d,", (rc->page)+1);
+       g_string_append_printf (dvi_document->exporter_opts, "%d,", (rc->page->index) + 1);

 }
 
 static void
 }
 
 static void


@@ -389,7 +386,7 @@ dvi_document_file_exporter_end (EvFileExporter *exporter)
        
        DviDocument *dvi_document = DVI_DOCUMENT(exporter);
        
        
        DviDocument *dvi_document = DVI_DOCUMENT(exporter);
        

-       command_line = g_strdup_printf ("dvipdfm %s -o %s %s", /* dvipdfm -s 1,2,.., -o exporter_filename dvi_filename */
+       command_line = g_strdup_printf ("dvipdfm %s -o %s \"%s\"", /* dvipdfm -s 1,2,.., -o exporter_filename dvi_filename */

                                        dvi_document->exporter_opts->str,
                                        dvi_document->exporter_filename,
                                        dvi_document->context->filename);
                                        dvi_document->exporter_opts->str,
                                        dvi_document->exporter_filename,
                                        dvi_document->context->filename);


@@ -400,7 +397,7 @@ dvi_document_file_exporter_end (EvFileExporter *exporter)
                                             &exit_stat,
                                             &err);
 
                                             &exit_stat,
                                             &err);
 

-       g_free(command_line);
+       g_free (command_line);

 
        if (success == FALSE) {
                g_warning ("Error: %s", err->message);
 
        if (success == FALSE) {
                g_warning ("Error: %s", err->message);


@@ -409,7 +406,7 @@ dvi_document_file_exporter_end (EvFileExporter *exporter)
        }
 
        if (err)
        }
 
        if (err)

-               g_error_free(err);
+               g_error_free (err);

 }
 
 static EvFileExporterCapabilities
 }
 
 static EvFileExporterCapabilities