2008-08-25 [iwkse] 3.5.0cvs72

	* src/image_viewer.c
		Add animated gif support to the
		message preview.

diff --git a/ChangeLog b/ChangeLog
index 31e37a049cbde8e98d0c4e5afcd4164190c9b1cc..1935fb81cafb8a7134e8e020d4dca7b1f8a75cb3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-08-25 [iwkse]     3.5.0cvs72
+
+       * src/image_viewer.c
+               Add animated gif support to the
+               message preview.
+
 2008-08-25 [colin]     3.5.0cvs71
 
        * src/gtk/gtkcmctree.c

diff --git a/PATCHSETS b/PATCHSETS
index 59277be97ae9816ff1e274e5cffbe74bdd603873..cc15b7e247f6c22be3c060381a840004425fd09c 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -3483,3 +3483,4 @@
 ( cvs diff -u -r 1.1.2.14 -r 1.1.2.15 src/printing.c;  ) > 3.5.0cvs69.patchset
 ( cvs diff -u -r 1.9.2.31 -r 1.9.2.32 src/common/ssl.c;  ) > 3.5.0cvs70.patchset
 ( cvs diff -u -r 1.1.2.3 -r 1.1.2.4 src/gtk/gtkcmctree.c;  ) > 3.5.0cvs71.patchset
+( cvs diff -u -r 1.1.2.23 -r 1.1.2.24 src/image_viewer.c;  ) > 3.5.0cvs72.patchset

diff --git a/configure.ac b/configure.ac
index 56ce2eeadd28ef8b49f2c7d8d52ac26e2a8137d5..d0ce63799b841821ede90aef91b1a465e32ebf26 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=5
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=71
+EXTRA_VERSION=72
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/image_viewer.c b/src/image_viewer.c
index 9ec3e1c3f6d6739841350a6dde39a67b0425c0a2..e78295ec2664a5d2ce53d52f65c3fd58df86636b 100644 (file)
--- a/src/image_viewer.c
+++ b/src/image_viewer.c
@@ -56,6 +56,7 @@ struct _ImageViewer
        GtkWidget *error_lbl;
        GtkWidget *error_msg;
        GtkWidget *content_type;
+       GtkWidget *load_button;
 };
 
 static GtkWidget *image_viewer_get_widget(MimeViewer *_mimeviewer)
@@ -97,6 +98,7 @@ static void image_viewer_load_file(ImageViewer *imageviewer, const gchar *imgfil
                gtk_label_set_text(GTK_LABEL(imageviewer->error_lbl), _("Error:"));
                gtk_label_set_text(GTK_LABEL(imageviewer->error_msg), error->message);
                gtk_notebook_set_current_page(GTK_NOTEBOOK(imageviewer->notebook), 0);
+               gtk_widget_hide(imageviewer->load_button);
                g_error_free(error);
        }
        if (!pixbuf) {
@@ -104,9 +106,16 @@ static void image_viewer_load_file(ImageViewer *imageviewer, const gchar *imgfil
                return;
        }
 
-       if (!imageviewer->image) {
+       if (!imageviewer->image && !imageviewer->resize_img) {
                imageviewer->image = gtk_image_new();
 
+               gtk_scrolled_window_add_with_viewport
+                       (GTK_SCROLLED_WINDOW(imageviewer->scrolledwin),
+                        imageviewer->image);
+               gtk_image_set_from_pixbuf(GTK_IMAGE(imageviewer->image), pixbuf);
+       }
+       else {
+               imageviewer->image = gtk_image_new_from_file(imgfile);
                gtk_scrolled_window_add_with_viewport
                        (GTK_SCROLLED_WINDOW(imageviewer->scrolledwin),
                         imageviewer->image);
@@ -115,7 +124,6 @@ static void image_viewer_load_file(ImageViewer *imageviewer, const gchar *imgfil
        g_signal_handlers_block_by_func(G_OBJECT(imageviewer->scrolledwin), 
                         G_CALLBACK(scrolledwin_resize_cb), imageviewer);
 
-       gtk_image_set_from_pixbuf(GTK_IMAGE(imageviewer->image), pixbuf);
 
        gtk_widget_show(imageviewer->image);
        GTK_EVENTS_FLUSH();
@@ -390,6 +398,7 @@ static MimeViewer *image_viewer_create(void)
        imageviewer->content_type = content_type;
        imageviewer->error_msg    = error_msg;
        imageviewer->error_lbl    = error_lbl;
+       imageviewer->load_button = load_button;
 
        g_object_ref(notebook);