X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;f=backend%2Fimpress%2Fimpress-document.c;h=72eb8c1fe3cc5c8d1ae932ae2c1e35dc8b29f503;hb=206bc8045e1d217e09f0e640d14791f2669a92ac;hp=74d335a6614fc67c99f35cc3e881311d3562457b;hpb=982600bbceb76a22d5c7b3e0cbe6e20421105ad6;p=evince.git

diff --git a/backend/impress/impress-document.c b/backend/impress/impress-document.c
index 74d335a6..72eb8c1f 100644
--- a/backend/impress/impress-document.c
+++ b/backend/impress/impress-document.c
@@ -18,14 +18,18 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#include <gtk/gtk.h>
-#include <glib/gi18n.h>
+#include "config.h"
+
 #include <string.h>
 
+#include <glib/gi18n-lib.h>
+#include <gtk/gtk.h>
+
 #include "imposter.h"
 #include "impress-document.h"
-#include "ev-document-thumbnails.h"
+
 #include "ev-document-misc.h"
+#include "ev-document-thumbnails.h"
 
 struct _ImpressDocumentClass
 {
@@ -58,11 +62,10 @@ typedef struct _ImpressDocumentClass ImpressDocumentClass;
 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 */
@@ -287,23 +290,17 @@ impress_document_load (EvDocument  *document,
   /* FIXME: Could we actually load uris ? */
   filename = g_filename_from_uri (uri, NULL, error);
   if (!filename)
-    {
-      g_set_error (error,
-	           EV_DOCUMENT_ERROR,
-		   EV_DOCUMENT_ERROR_INVALID,
-		   _("Remote files aren't supported"));
-      return FALSE;
-    }
+    return FALSE;
 
   imp = imp_open (filename, &err);
+  g_free (filename);
 
   if (!imp)
     {
-      g_set_error (error,
-	           EV_DOCUMENT_ERROR,
-		   EV_DOCUMENT_ERROR_INVALID,
-		   _("Invalid document"));
-      g_free (filename);
+      g_set_error_literal (error,
+                           EV_DOCUMENT_ERROR,
+                           EV_DOCUMENT_ERROR_INVALID,
+                           _("Invalid document"));
       return FALSE;
     }
   impress_document->imp = imp;
@@ -313,9 +310,13 @@ impress_document_load (EvDocument  *document,
 
 static gboolean
 impress_document_save (EvDocument  *document,
-		      const char  *uri,
-		      GError     **error)
+                       const char  *uri,
+                       GError     **error)
 {
+        g_set_error_literal (error,
+                             EV_DOCUMENT_ERROR,
+                             EV_DOCUMENT_ERROR_INVALID,
+                             "Not supported");
 	return FALSE;
 }
 
@@ -332,9 +333,9 @@ impress_document_get_n_pages (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);
 
@@ -381,7 +382,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);
   
-  impress_document->pagenum = rc->page;
+  impress_document->pagenum = rc->page->index;
 
   g_mutex_lock (impress_document->mutex);
   impress_document->cond = g_cond_new ();
@@ -487,7 +488,6 @@ impress_document_thumbnails_get_thumbnail (EvDocumentThumbnails *document,
 {
   GdkPixbuf *pixbuf;
   GdkPixbuf *scaled_pixbuf;
-  gdouble w, h;
 
   pixbuf = impress_document_render_pixbuf (EV_DOCUMENT (document), rc);
   scaled_pixbuf = gdk_pixbuf_scale_simple (pixbuf,