2004-09-20 [colin] 0.9.12cvs102.2

[claws.git] / src / plugins / image_viewer / viewer.c

diff --git a/src/plugins/image_viewer/viewer.c b/src/plugins/image_viewer/viewer.c
index b6f5cda081495ba56366561f1c790904a74d9532..03267a8eba400401680ddcb802bacec31e671d1f 100644 (file)
--- a/src/plugins/image_viewer/viewer.c
+++ b/src/plugins/image_viewer/viewer.c
@@ -110,7 +110,7 @@ static void image_viewer_load_file(ImageViewer *imageviewer, const gchar *imgfil
 
                pixbuf_scaled = gdk_pixbuf_scale_simple
                        (pixbuf, new_width, new_height, GDK_INTERP_BILINEAR);
-               gdk_pixbuf_unref(pixbuf);
+               g_object_unref(pixbuf);
                pixbuf = pixbuf_scaled;
        }
 
@@ -123,63 +123,12 @@ static void image_viewer_load_file(ImageViewer *imageviewer, const gchar *imgfil
                        (GTK_SCROLLED_WINDOW(imageviewer->scrolledwin),
                         imageviewer->image);
        } else
-               gtk_pixmap_set(GTK_PIXMAP(imageviewer->image), pixmap, mask);
+               gtk_pixmap_set(imageviewer->image, pixmap, mask);
 
        gtk_widget_show(imageviewer->image);
 
-       gdk_pixbuf_unref(pixbuf);
+       g_object_unref(pixbuf);
 }
-#else
-#if HAVE_GDK_IMLIB
-static void image_viewer_load_file(ImageViewer *imageviewer, const gchar *imgfile)
-{
-       GdkImlibImage *im;
-       gint avail_width;
-       gint avail_height;
-       gint new_width;
-       gint new_height;
-
-       debug_print("image_viewer_show_mimepart\n");
-
-       im = gdk_imlib_load_image(imgfile);
-       if (!im) {
-               g_warning("Can't load the image.");     
-               return;
-       }
-
-       if (imageviewer->resize_img) {
-               avail_width = imageviewer->notebook->parent->allocation.width;
-               avail_height = imageviewer->notebook->parent->allocation.height;
-               if (avail_width > 8) avail_width -= 8;
-               if (avail_height > 8) avail_height -= 8;
-
-               image_viewer_get_resized_size(im->rgb_width, im->rgb_height,
-                                avail_width, avail_height,
-                                &new_width, &new_height);
-       } else {
-               new_width = im->rgb_width;
-               new_height = im->rgb_height;
-       }
-
-       gdk_imlib_render(im, new_width, new_height);
-
-       if (!imageviewer->image) {
-               imageviewer->image = gtk_pixmap_new(gdk_imlib_move_image(im),
-                                                   gdk_imlib_move_mask(im));
-
-               gtk_scrolled_window_add_with_viewport
-                       (GTK_SCROLLED_WINDOW(imageviewer->scrolledwin),
-                        imageviewer->image);
-       } else
-               gtk_pixmap_set(GTK_PIXMAP(imageviewer->image),
-                              gdk_imlib_move_image(im),
-                              gdk_imlib_move_mask(im));      
-
-       gtk_widget_show(imageviewer->image);
-
-       gdk_imlib_destroy_image(im);
-}
-#endif /* HAVE_GDK_IMLIB */
 #endif /* HAVE_GDK_PIXBUF */
 
 static void image_viewer_set_notebook_page(MimeViewer *_mimeviewer)
@@ -260,7 +209,7 @@ static void image_viewer_destroy_viewer(MimeViewer *_mimeviewer)
        debug_print("image_viewer_destroy_viewer\n");
 
        image_viewer_clear_viewer(_mimeviewer);
-       gtk_widget_unref(imageviewer->notebook);
+       g_object_unref(imageviewer->notebook);
        g_free(imageviewer);
 }