root/patches/use-gtkimageview-in-eog2.patch

src/eog-image.h

@@ -148 +148 @@
-
-GdkPixbuf*        eog_image_get_pixbuf               (EogImage   *img);
-
+GdkPixbufAnimation *eog_image_get_anim               (EogImage   *img);
+
-GdkPixbuf*        eog_image_get_thumbnail            (EogImage   *img);
-
-void              eog_image_get_size                 (EogImage   *img, 

src/eog-image-private.h

@@ -1 @@
-Eye Of Gnome - Image Private Data 
+-*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8; coding: utf-8 -*-
- *
+ * Eye Of Gnome - Image Private Data 
+ *
- * Copyright (C) 2007 The Free Software Foundation
- *
- * Author: Lucas Rocha <lucasr@gnome.org>
@@ -31 +33 @@
-
-        EogImageStatus    status;
-
-
+
+
-        GdkPixbuf        *thumbnail;
-        
-        gint              width;

src/eog-image-jpeg.c

@@ -329 +329 @@
-        struct error_handler_data jerr;
-        
-        g_return_val_if_fail (EOG_IS_IMAGE (image), FALSE);
-image
+anim
-        
-        priv = image->priv;
-       pixbuf = priv->image
+        pixbuf = gdk_pixbuf_animation_get_static_image (priv->anim)
-        
-        outfile = fopen (file, "wb");
-        if (outfile == NULL) {

src/eog-window.c

@@ -1 @@
-Eye Of Gnome - Main Window 
+-*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8; coding: utf-8 -*-
- *
+ * Eye Of Gnome - Main Window 
+ *
- * Copyright (C) 2000-2006 The Free Software Foundation
- *
- * Author: Lucas Rocha <lucasr@gnome.org>
@@ -32 +34 @@
-#include <math.h>
-
-#include "eog-window.h"
-#include "eog-scroll-view.h"
-#include "eog-debug.h"
-#include "eog-file-chooser.h"
-#include "eog-thumb-view.h"
@@ -62 +63 @@
-#include <glib-object.h>
-#include <glib/gi18n.h>
-#include <gdk/gdkkeysyms.h>
+#include <gtkimageview/gtkanimview.h>
+#include <gtkimageview/gtkimageview.h>
+#include <gtkimageview/gtkimagescrollwin.h>
+#include <gtkimageview/gtkzooms.h>
-#ifdef GDK_WINDOWING_X11
-#include <gdk/gdkx.h>
-#endif
@@ -135 +140 @@
-        GtkWidget           *box;
-        GtkWidget           *layout;
-        GtkWidget           *cbox;
+        GtkWidget           *scroll_win;
-        GtkWidget           *view;
-        GtkWidget           *sidebar;
-        GtkWidget           *thumbview;
@@ -220 +226 @@
-        eog_debug (DEBUG_PREFERENCES);
-
-        g_return_if_fail (EOG_IS_WINDOW (user_data));
-
+
-        priv = EOG_WINDOW (user_data)->priv;
-
-EOG_IS_SCROLL
+GTK_IMAGE
-
-        if (entry->value != NULL && entry->value->type == GCONF_VALUE_BOOL) {
-                interpolate = gconf_value_get_bool (entry->value);
-        }
-
-
-
+
+
+
+
+
+
-}
-
-static void
@@ -239 +249 @@
-                                         GConfEntry  *entry,
-                                         gpointer    user_data)
-{
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-}
-
-static void
@@ -264 +258 @@
-                                       GConfEntry  *entry,
-                                       gpointer    user_data)
-{
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-}
-
-static void
@@ -298 +276 @@
-
-        priv = EOG_WINDOW (user_data)->priv;
-
-EOG_IS_SCROLL
+GTK_IMAGE
-
-        if (entry->value != NULL && entry->value->type == GCONF_VALUE_STRING) {
-                value = gconf_value_get_string (entry->value);
@@ -313 +291 @@
-                color_str = gconf_client_get_string (priv->client,
-                                                     EOG_CONF_VIEW_TRANS_COLOR, NULL);
-                if (gdk_color_parse (color_str, &color)) {
-
-
+
+
+
+
+
+
+
-                }
-                g_free (color_str);
-        } else if (g_ascii_strcasecmp (value, "CHECK_PATTERN") == 0) {
-eog_scroll_view_set_transparency (EOG_SCROLL
-         EOG_TRANSP_CHECKE
+gtk_image_view_set_transp (GTK_IMAGE
+   GTK_IMAGE_TRANSP_GRI
-        } else {
-eog_scroll_view_set_transparency (EOG_SCROLL
-         EOG
+gtk_image_view_set_transp (GTK_IMAGE
+   GTK_IMAGE
-        }
-}
-
@@ -343 +326 @@
-
-        priv = EOG_WINDOW (user_data)->priv;
-
-EOG_IS_SCROLL
+GTK_IS_IMAGE
-
-        value = gconf_client_get_string (priv->client, 
-                                         EOG_CONF_VIEW_TRANSPARENCY, 
@@ -358 +341 @@
-                color_str = gconf_value_get_string (entry->value);
-
-                if (gdk_color_parse (color_str, &color)) {
-
-
+
+
+
+
+
+
+
-                }
-        }
-        g_free (value);
@@ -380 +368 @@
-
-        priv = EOG_WINDOW (user_data)->priv;
-
-EOG_IS_SCROLL
+GTK_IS_IMAGE
-
-        if (entry->value != NULL && entry->value->type == GCONF_VALUE_BOOL) {
-                show_buttons = gconf_value_get_bool (entry->value);
@@ -586 +574 @@
-        EogWindowPrivate *priv;
-        char *str = NULL;
-
+        printf ("update_status_bar\n");
+
-        g_return_if_fail (EOG_IS_WINDOW (window));
-        
-        eog_debug (DEBUG_WINDOW);
@@ -597 +587 @@
-                int zoom, width, height;
-                GnomeVFSFileSize bytes = 0;
-
-eog_scroll_view_get_zoom (EOG_SCROLL
+gtk_image_view_get_zoom (GTK_IMAGE
-
-                eog_image_get_size (priv->image, &width, &height);
-
@@ -605 +595 @@
-                
-                if ((width > 0) && (height > 0)) {
-                        char *size_string;
-
+
-                        size_string = gnome_vfs_format_file_size_for_display (bytes);
-
-                        /* [image width] x [image height] pixels  [bytes]    [zoom in percent] */
@@ -629 +619 @@
-                            priv->image_info_message_cid, str ? str : "");
-
-        g_free (str);
+        printf ("update_status_bar:done\n");
-}
-
-static void
@@ -759 +750 @@
-                                        priv->mode != EOG_WINDOW_MODE_SLIDESHOW;
-
-                gtk_widget_show (priv->layout);
-view
+scroll_win
-
-                if (show_image_collection) 
-                        gtk_widget_show (priv->nav);
@@ -917 +908 @@
-        EogWindowPrivate *priv;
-        GnomeVFSURI *uri;
-
+        printf ("eog_window_display_image\n");
+
-        g_return_if_fail (EOG_IS_WINDOW (window));
-        g_return_if_fail (EOG_IS_IMAGE (image));
-
@@ -935 +928 @@
-                image_thumb_changed_cb (image, window);
-        }
-
-
+
+
-
-        gtk_window_set_title (GTK_WINDOW (window), eog_image_get_caption (image));
-
@@ -1247 +1241 @@
-        EogWindow *window;
-        EogWindowPrivate *priv;
-
+        printf ("eog_job_load_cb:start\n");
+
-        g_return_if_fail (EOG_IS_WINDOW (data));
-        
-        eog_debug (DEBUG_WINDOW);
@@ -1303 +1299 @@
-
-                update_status_bar (window);
-
-eog_scroll_view_set_image (EOG_SCROLL
+gtk_anim_view_set_anim (GTK_ANIM
-
-                if (window->priv->status == EOG_WINDOW_STATUS_INIT) {
-                        update_action_groups_state (window);
@@ -1326 +1322 @@
-        }
-
-        g_object_unref (job->image);
+        printf ("eog_job_load_cb:end\n");
-}
-
-static void
@@ -1349 +1346 @@
-eog_job_transform_cb (EogJobTransform *job, gpointer data)
-{
-        EogWindow *window;
+
+        printf ("eog_job_transform_cb\n");
-        
-        g_return_if_fail (EOG_IS_WINDOW (data));
-        
-        window = EOG_WINDOW (data);
-
-        eog_window_clear_transform_job (window);
+
+        gtk_anim_view_set_anim (GTK_ANIM_VIEW (window->priv->view),
+                                eog_image_get_anim (window->priv->image));
-}
-
-static void 
@@ -1449 +1451 @@
-}
-        
-static void
-double zoom, 
+
-{
-        EogWindow *window;
-        GtkAction *action_zoom_in;
-        GtkAction *action_zoom_out;
+        gdouble zoom;
-
-        g_return_if_fail (EOG_IS_WINDOW (user_data));
-
+
-        window = EOG_WINDOW (user_data);
-
-        update_status_bar (window);
@@ -1469 +1472 @@
-                gtk_action_group_get_action (window->priv->actions_image, 
-                                             "ViewZoomOut");
-
+        zoom = gtk_image_view_get_zoom (GTK_IMAGE_VIEW (window->priv->view));
-        gtk_action_set_sensitive (action_zoom_in,
-!eog_scroll_view_get_zoom_is_max (EOG_SCROLL_VIEW (window->priv->view)
+         zoom < gtk_zooms_get_max_zoom (
-        gtk_action_set_sensitive (action_zoom_out,
-!eog_scroll_view_get_zoom_is_min (EOG_SCROLL_VIEW (window->priv->view)
+         zoom > gtk_zooms_get_min_zoom (
-}
-
-static void
@@ -1604 +1608 @@
-
-        gtk_widget_hide_all (window->priv->fullscreen_popup);
-
-
+
+
-
-        fullscreen_clear_timeout (window);
-
@@ -1673 +1678 @@
-
-        window->priv->fullscreen_timeout_source = source;
-
-
+
+
-}
-
-static void
@@ -1900 +1906 @@
-{
-        EogWindowPrivate *priv;
-        GtkWidget *menubar;
-        gboolean upscale;
-
-        eog_debug (DEBUG_WINDOW);
-        
@@ -1922 +1927 @@
-        g_assert (GTK_IS_WIDGET (menubar));
-        gtk_widget_hide (menubar);
-
-view
+scroll_win
-                      "shadow-type", GTK_SHADOW_NONE,
-                      NULL);
-
@@ -1962 +1967 @@
-                slideshow_set_timeout (window);
-        }
-
-
-
-
+
-
-
-
+
-
-
-
-
+
-                              &(GTK_WIDGET (window)->style->black));
+        gtk_image_view_set_show_frame (GTK_IMAGE_VIEW (priv->view), FALSE);
-
-        {
+                /* Make the border of the frame the scroll_win is
+                   added to invisible. */
-                GtkStyle *style;
+                GtkWidget *frame;
-
-style = gtk_style_copy (gtk_widget_get_style (priv->view->parent))
+frame = priv->scroll_win->parent
-
+                style = gtk_style_copy (gtk_widget_get_style (frame));
-                style->xthickness = 0;
-                style->ythickness = 0;
-
-
-
+
-                g_object_unref (style);
-        }
-
@@ -2019 +2023 @@
-        if (slideshow) {
-                slideshow_clear_timeout (window);
-        }
-
-view
+
+scroll_win
-                      "shadow-type", GTK_SHADOW_IN,
-
+   
-
-        g_signal_handlers_disconnect_by_func (priv->view,
-                                              (gpointer) fullscreen_motion_notify_cb,
@@ -2045 +2049 @@
-        menubar = gtk_ui_manager_get_widget (priv->ui_mgr, "/MainMenu");
-        g_assert (GTK_IS_WIDGET (menubar));
-        gtk_widget_show (menubar);
-        
-        eog_scroll_view_set_zoom_upscale (EOG_SCROLL_VIEW (priv->view), FALSE);
-
-        gtk_widget_modify_bg (window->priv->view, GTK_STATE_NORMAL, NULL);
-        gtk_widget_set_style (window->priv->view->parent, NULL);
-        gtk_window_unfullscreen (GTK_WINDOW (window));
-
+        gtk_widget_modify_bg (window->priv->view, GTK_STATE_NORMAL, NULL);
+        gtk_image_view_set_show_frame (GTK_IMAGE_VIEW (priv->view), TRUE);
+        gtk_image_view_set_show_cursor (GTK_IMAGE_VIEW (priv->view), TRUE);
+
-        if (slideshow) {
-                eog_window_update_slideshow_action (window);
-        } else {
-                eog_window_update_fullscreen_action (window);
-        }
-
-        eog_scroll_view_show_cursor (EOG_SCROLL_VIEW (priv->view));
-
-        eog_application_screensaver_enable (EOG_APP);
-}
-
@@ -3072 +3073 @@
-        priv = EOG_WINDOW (user_data)->priv;
-
-        if (priv->view) {
-eog_scroll_view_zoom_in (EOG_SCROLL_VIEW (priv->view), FALSE
+gtk_image_view_zoom_in (GTK_IMAGE_VIEW (priv->view)
-        }
-}
-
@@ -3088 +3089 @@
-        priv = EOG_WINDOW (user_data)->priv;
-
-        if (priv->view) {
-eog_scroll_view_zoom_out (EOG_SCROLL_VIEW (priv->view), FALSE
+gtk_image_view_zoom_out (GTK_IMAGE_VIEW (priv->view)
-        }
-}
-
@@ -3104 +3105 @@
-        priv = EOG_WINDOW (user_data)->priv;
-
-        if (priv->view) {
-eog_scroll_view_set_zoom (EOG_SCROLL
+gtk_image_view_set_zoom (GTK_IMAGE
-        }
-}
-
@@ -3120 +3121 @@
-        priv = EOG_WINDOW (user_data)->priv;
-
-        if (priv->view) {
-eog_scroll_view_zoom_fit (EOG_SCROLL_VIEW (priv->view)
+gtk_image_view_set_fitting (GTK_IMAGE_VIEW (priv->view), TRUE
-        }
-}
-
@@ -3807 +3808 @@
-                                G_CALLBACK (eog_window_sidebar_page_removed),
-                                window);
-
-
-
+
+
+
+
-        g_signal_connect (G_OBJECT (priv->view),
-                          "zoom_changed",
-                          G_CALLBACK (view_zoom_changed_cb), 
@@ -3818 +3821 @@
-                                "shadow-type", GTK_SHADOW_IN, 
-                                NULL);
-
-view
+scroll_win
-
-        gtk_paned_pack1 (GTK_PANED (hpaned),
-                         priv->sidebar,
@@ -4195 +4198 @@
-                if (tbcontainer->focus_child != NULL)
-                        break;
-        case GDK_Page_Up:
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
+
+
+
-                
-                break;
-        case GDK_Down:
@@ -4211 +4215 @@
-                if (tbcontainer->focus_child != NULL)
-                        break;
-        case GDK_Page_Down:
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
+
+
+
-
-                break;
-        }

src/eog-image.c

@@ -1 @@
-Eye Of Gnome - Image 
+-*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8; coding: utf-8 -*-
- *
+ * Eye Of Gnome - Image 
+ *
- * Copyright (C) 2006 The Free Software Foundation
- *
- * Author: Lucas Rocha <lucasr@gnome.org>
@@ -23 +25 @@
-#include "config.h"
-#endif
-
+/* Define needed to get the gdk_pixbuf_non_anim_new() function. */
+#define GDK_PIXBUF_ENABLE_BACKEND
+
-#include "eog-image.h"
-#include "eog-image-private.h"
-#include "eog-debug.h"
@@ -41 +46 @@
-
-#include <unistd.h>
-
+
+
-#include <glib.h>
-#include <glib-object.h>
-#include <glib/gi18n.h>
-#include <gtk/gtk.h>
-#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gdk-pixbuf/gdk-pixbuf-animation.h>
-#include <libgnomevfs/gnome-vfs.h>
-#include <libgnomeui/gnome-thumbnail.h>
-
@@ -91 +99 @@
-        if (priv->status == EOG_IMAGE_STATUS_LOADING) {
-                eog_image_cancel_load (image);
-        } else {
-image
-image
-image
+anim
+anim
+anim
-                }
-                
-#ifdef HAVE_EXIF
@@ -231 +239 @@
-        img->priv = EOG_IMAGE_GET_PRIVATE (img);
-
-        img->priv->uri = NULL;
-image
+anim
-        img->priv->thumbnail = NULL;
-        img->priv->width = -1;
-        img->priv->height = -1;
@@ -342 +350 @@
-        GdkPixbuf *transformed;
-        gboolean modified = FALSE;
-
+        printf ("eog_image_real_transform\n");
+
-        g_return_if_fail (EOG_IS_IMAGE (img));
-        g_return_if_fail (EOG_IS_TRANSFORM (trans));
-
-        priv = img->priv;
-
-
-
+
+
+
+
+
-                
-
-
+
+
+
-
+                pixbuf = gdk_pixbuf_animation_get_static_image (priv->anim);
+                transformed = eog_transform_apply (trans, pixbuf, job);
+                g_object_unref (priv->anim);
+
+                priv->anim = gdk_pixbuf_non_anim_new (transformed);
-                priv->width = gdk_pixbuf_get_width (transformed);
-                priv->height = gdk_pixbuf_get_height (transformed);
-       
-                modified = TRUE;
-        }
-
@@ -459 +477 @@
-                return TRUE;
-        }
-
-image
+anim
-                g_set_error (error, 
-                             EOG_IMAGE_ERROR, 
-                             EOG_IMAGE_ERROR_NOT_LOADED,
@@ -468 +486 @@
-                return FALSE;
-        }
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        }
-
-
-
-
-
-
-
-
+
-                g_set_error (error, 
-                             EOG_IMAGE_ERROR, 
-                             EOG_IMAGE_ERROR_GENERIC,
@@ -529 +554 @@
-        cmsHTRANSFORM transform;
-        gint row, width, rows, stride;
-        guchar *p;
+        GdkPixbuf *pixbuf;
-        
-        g_return_if_fail (img != NULL);
-
-        priv = img->priv;
-
-
+
+
+
+
-
-        transform = cmsCreateTransform (priv->profile, 
-                                        TYPE_RGB_8, 
@@ -542 +571 @@
-                                        TYPE_RGB_8, 
-                                        INTENT_PERCEPTUAL, 
-                                        0);
+
+        pixbuf = gdk_pixbuf_animation_get_static_image (priv->anim);
-        
-riv->image
-riv->image
-riv->image
-riv->image
+ixbuf
+ixbuf
+ixbuf
+ixbuf
-
-        for (row = 0; row < rows; ++row) {
-                cmsDoTransform(transform, p, p, width);
@@ -870 +901 @@
-
-        priv = img->priv;
-
-image
+anim
-
-        if (read_image_data && priv->file_type != NULL) {
-                g_free (priv->file_type);
@@ -1031 +1062 @@
-                }
-        } else {
-                if (read_image_data) {
-image
-image
+anim
+anim
-                        }
-
-image = gdk_pixbuf_loader_get_pixbuf
+anim = gdk_pixbuf_loader_get_animation
-
-image
+anim
-
-image
+anim
-
-
-
+
+
+
+
-
-                        format = gdk_pixbuf_loader_get_format (loader);
-
@@ -1084 +1117 @@
-        
-        if ((req_data & EOG_IMAGE_DATA_IMAGE) > 0) {
-                req_data = (req_data & !EOG_IMAGE_DATA_IMAGE);
-image
+anim
-        }
-
-        if ((req_data & EOG_IMAGE_DATA_DIMENSION) > 0 ) {
@@ -1198 +1231 @@
-        g_return_val_if_fail (EOG_IS_IMAGE (img), NULL);
-
-        g_mutex_lock (img->priv->status_mutex);
-img->priv->image
+gdk_pixbuf_animation_get_static_image (img->priv->anim)
-        g_mutex_unlock (img->priv->status_mutex);
-
-        if (image != NULL) {
@@ -1208 +1241 @@
-        return image;
-}
-
+GdkPixbufAnimation *
+eog_image_get_anim (EogImage *img)
+{
+        GdkPixbufAnimation *anim;
+        
+        g_return_val_if_fail (EOG_IS_IMAGE (img), NULL);
+
+        g_mutex_lock (img->priv->status_mutex);
+        anim = img->priv->anim;
+        g_mutex_unlock (img->priv->status_mutex);
+
+        if (anim != NULL) {
+                g_object_ref (anim);
+        }
+
+        return anim;
+}
+
-#ifdef HAVE_LCMS
-cmsHPROFILE
-eog_image_get_profile (EogImage *img)
@@ -1481 +1532 @@
-        }
-
-        /* fail if there is no image to save */
-image
+anim
-                g_set_error (error, EOG_IMAGE_ERROR,
-                             EOG_IMAGE_ERROR_NOT_LOADED,
-                             _("No image loaded."));
@@ -1507 +1558 @@
-#endif
-
-        if (!success && (*error == NULL)) {
-
+
+
+
+
+
+
-        }
-
-        if (success) {
@@ -1609 +1665 @@
-        priv = img->priv;
-
-        /* fail if there is no image to save */
-image
+anim
-                g_set_error (error, 
-                             EOG_IMAGE_ERROR,
-                             EOG_IMAGE_ERROR_NOT_LOADED,
@@ -1645 +1701 @@
-#endif
-
-        if (!success && (*error == NULL)) {
-
+
+
+
+
+
+
-        }
-
-        if (success && !direct_copy) { /* not required if we alredy copied the file directly */

configure.ac

@@ -76 +76 @@
-GNOME_ICON_THEME_REQUIRED=2.19.1
-SHARED_MIME_INFO_REQUIRED=0.20
-EXEMPI_REQUIRED=1.99.2
+GTKIMAGEVIEW_REQUIRED=1.4.0
-
-
-EOG_MODULES="gtk+-2.0 >= $GTK_REQUIRED \
@@ -89 +90 @@
-             gnome-desktop-2.0 >= $GNOME_DESKTOP_REQUIRED \
-             gtk+-unix-print-2.0 >= $GTK_PRINT_REQUIRED \
-             gnome-icon-theme >= $GNOME_ICON_THEME_REQUIRED \
-
+
+
-
-# ***************
-# EXIF (optional)