Correctly check for comics option.

[evince.git] / djvu / djvu-document.c

diff --git a/djvu/djvu-document.c b/djvu/djvu-document.c
index 19452499df704b0f4ad47d659034c75612ea84df..3814787545a3a5b5ed283365dcb204e22147c709 100644 (file)
--- a/djvu/djvu-document.c
+++ b/djvu/djvu-document.c
@@ -25,6 +25,11 @@
 #include <gtk/gtk.h>
 #include <gdk-pixbuf/gdk-pixbuf-core.h>
 
+#include <libgnomevfs/gnome-vfs-uri.h>
+#include <libgnomevfs/gnome-vfs-utils.h>
+#include <libgnomevfs/gnome-vfs-ops.h>
+#include <libgnomevfs/gnome-vfs-xfer.h>
+
 #define SCALE_FACTOR 0.2
 
 enum {
@@ -44,6 +49,8 @@ struct _DjvuDocument
        ddjvu_context_t  *d_context;
        ddjvu_document_t *d_document;
        ddjvu_format_t   *d_format;
+       
+       gchar *uri;
 };
 
 typedef struct _DjvuDocumentClass DjvuDocumentClass;
@@ -85,6 +92,8 @@ djvu_document_load (EvDocument  *document,
                    ddjvu_message_wait (djvu_document->d_context);
                    ddjvu_message_pop (djvu_document->d_context);       
        }
+       g_free (djvu_document->uri);
+       djvu_document->uri = g_strdup (uri);
 
        return TRUE;
 }
@@ -95,8 +104,32 @@ djvu_document_save (EvDocument  *document,
                      const char  *uri,
                      GError     **error)
 {
-       g_warning ("djvu_document_save not implemented"); /* FIXME */
-       return TRUE;
+       DjvuDocument *djvu_document = DJVU_DOCUMENT (document);
+       GnomeVFSResult result;
+       GnomeVFSURI *source_uri;
+       GnomeVFSURI *target_uri;
+       
+       if (!djvu_document->uri)
+               return FALSE;
+       
+       source_uri = gnome_vfs_uri_new (djvu_document->uri);
+       target_uri = gnome_vfs_uri_new (uri);
+
+       result = gnome_vfs_xfer_uri (source_uri, target_uri, 
+                                    GNOME_VFS_XFER_DEFAULT | GNOME_VFS_XFER_FOLLOW_LINKS,
+                                    GNOME_VFS_XFER_ERROR_MODE_ABORT,
+                                    GNOME_VFS_XFER_OVERWRITE_MODE_REPLACE,
+                                    NULL,
+                                    NULL);
+       gnome_vfs_uri_unref (target_uri);
+       gnome_vfs_uri_unref (source_uri);
+    
+       if (result != GNOME_VFS_OK)
+               g_set_error (error,
+                            EV_DOCUMENT_ERROR,
+                            0,
+                            gnome_vfs_result_to_string (result));                      
+       return (result == GNOME_VFS_OK);
 }
 
 static int
@@ -166,7 +199,7 @@ djvu_document_render_pixbuf (EvDocument  *document,
                          gdk_pixbuf_get_rowstride (pixbuf),
                           (gchar *)gdk_pixbuf_get_pixels (pixbuf));
        
-       rotated_pixbuf = gdk_pixbuf_rotate_simple (pixbuf, rc->rotation);
+       rotated_pixbuf = gdk_pixbuf_rotate_simple (pixbuf, 360 - rc->rotation);
        g_object_unref (pixbuf);
        
        return rotated_pixbuf;
@@ -182,6 +215,7 @@ djvu_document_finalize (GObject *object)
 
        ddjvu_context_release (djvu_document->d_context);
        ddjvu_format_release (djvu_document->d_format);
+       g_free (djvu_document->uri);
        
        G_OBJECT_CLASS (djvu_document_parent_class)->finalize (object);
 }
@@ -259,15 +293,10 @@ djvu_document_thumbnails_get_thumbnail (EvDocumentThumbnails   *document,
        
        djvu_document_thumbnails_get_dimensions (document, page, width, &thumb_width, &thumb_height);
        
-       if (border) {
-               pixbuf = ev_document_misc_get_thumbnail_frame (thumb_width, thumb_height, NULL);
-               pixels = gdk_pixbuf_get_pixels (pixbuf) + gdk_pixbuf_get_rowstride (pixbuf) + 4;
-       } else {
-               pixbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB, TRUE, 8,
-                                        thumb_width, thumb_height);
-               gdk_pixbuf_fill (pixbuf, 0xffffffff);
-               pixels = gdk_pixbuf_get_pixels (pixbuf);
-       }
+       pixbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB, TRUE, 8,
+                                thumb_width, thumb_height);
+       gdk_pixbuf_fill (pixbuf, 0xffffffff);
+       pixels = gdk_pixbuf_get_pixels (pixbuf);
        
        while (ddjvu_thumbnail_status (djvu_document->d_document, page, 1) < DDJVU_JOB_OK) {
                    ddjvu_message_wait (djvu_document->d_context);
@@ -280,8 +309,14 @@ djvu_document_thumbnails_get_thumbnail (EvDocumentThumbnails   *document,
                                gdk_pixbuf_get_rowstride (pixbuf), 
                                (gchar *)pixels);
 
-       rotated_pixbuf = gdk_pixbuf_rotate_simple (pixbuf, rotation);
+       rotated_pixbuf = gdk_pixbuf_rotate_simple (pixbuf, 360 - rotation);
        g_object_unref (pixbuf);
+
+        if (border) {
+             GdkPixbuf *tmp_pixbuf = rotated_pixbuf;
+             rotated_pixbuf = ev_document_misc_get_thumbnail_frame (-1, -1, 0, tmp_pixbuf);
+             g_object_unref (tmp_pixbuf);
+       }
        
        return rotated_pixbuf;
 }