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

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

diff --git a/backend/impress/impress-document.c b/backend/impress/impress-document.c
index 74d335a6614fc67c99f35cc3e881311d3562457b..2e3c39bedbc9e9d5b917b88e1e6fdc062b440a57 100644 (file)
--- a/backend/impress/impress-document.c
+++ b/backend/impress/impress-document.c
@@ -18,6 +18,9 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 

+#include "config.h"
+
+#include <config.h>

 #include <gtk/gtk.h>
 #include <glib/gi18n.h>
 #include <string.h>
 #include <gtk/gtk.h>
 #include <glib/gi18n.h>
 #include <string.h>


@@ -58,11 +61,10 @@ typedef struct _ImpressDocumentClass ImpressDocumentClass;
 static void impress_document_document_iface_init (EvDocumentIface *iface);
 static void impress_document_document_thumbnails_iface_init (EvDocumentThumbnailsIface *iface);
 
 static void impress_document_document_iface_init (EvDocumentIface *iface);
 static void impress_document_document_thumbnails_iface_init (EvDocumentThumbnailsIface *iface);
 

-G_DEFINE_TYPE_WITH_CODE (ImpressDocument, impress_document, G_TYPE_OBJECT,
-                         { G_IMPLEMENT_INTERFACE (EV_TYPE_DOCUMENT,
-                                                 impress_document_document_iface_init);
-                          G_IMPLEMENT_INTERFACE (EV_TYPE_DOCUMENT_THUMBNAILS,
-                                                 impress_document_document_thumbnails_iface_init);
+EV_BACKEND_REGISTER_WITH_CODE (ImpressDocument, impress_document,
+                        {
+                          EV_BACKEND_IMPLEMENT_INTERFACE (EV_TYPE_DOCUMENT_THUMBNAILS,
+                                                          impress_document_document_thumbnails_iface_init);

                         });
 
 /* Renderer */
                         });
 
 /* Renderer */


@@ -332,9 +334,9 @@ impress_document_get_n_pages (EvDocument  *document)
 
 static void
 impress_document_get_page_size (EvDocument   *document,
 
 static void
 impress_document_get_page_size (EvDocument   *document,

-                            int           page,
-                            double       *width,
-                            double       *height)
+                               EvPage       *page,
+                               double       *width,
+                               double       *height)

 {
   ImpressDocument *impress_document = IMPRESS_DOCUMENT (document);
 
 {
   ImpressDocument *impress_document = IMPRESS_DOCUMENT (document);
 


@@ -381,7 +383,7 @@ impress_document_render_pixbuf (EvDocument      *document,
   g_return_val_if_fail (IMPRESS_IS_DOCUMENT (document), NULL);
   g_return_val_if_fail (impress_document->imp != NULL, NULL);
   
   g_return_val_if_fail (IMPRESS_IS_DOCUMENT (document), NULL);
   g_return_val_if_fail (impress_document->imp != NULL, NULL);
   

-  impress_document->pagenum = rc->page;
+  impress_document->pagenum = rc->page->index;

 
   g_mutex_lock (impress_document->mutex);
   impress_document->cond = g_cond_new ();
 
   g_mutex_lock (impress_document->mutex);
   impress_document->cond = g_cond_new ();


@@ -487,7 +489,6 @@ impress_document_thumbnails_get_thumbnail (EvDocumentThumbnails *document,
 {
   GdkPixbuf *pixbuf;
   GdkPixbuf *scaled_pixbuf;
 {
   GdkPixbuf *pixbuf;
   GdkPixbuf *scaled_pixbuf;

-  gdouble w, h;

 
   pixbuf = impress_document_render_pixbuf (EV_DOCUMENT (document), rc);
   scaled_pixbuf = gdk_pixbuf_scale_simple (pixbuf,
 
   pixbuf = impress_document_render_pixbuf (EV_DOCUMENT (document), rc);
   scaled_pixbuf = gdk_pixbuf_scale_simple (pixbuf,