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;
}
(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)
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);
}
gtk_widget_ref(notebook);
- gtk_signal_connect(GTK_OBJECT(load_button), "released",
- GTK_SIGNAL_FUNC(load_cb), imageviewer);
- gtk_signal_connect(GTK_OBJECT(scrolledwin), "button-press-event",
- GTK_SIGNAL_FUNC(scrolledwin_button_cb), imageviewer);
- gtk_signal_connect(GTK_OBJECT(scrolledwin), "size-allocate",
- GTK_SIGNAL_FUNC(scrolledwin_resize_cb), imageviewer);
+ g_signal_connect(G_OBJECT(load_button), "released",
+ G_CALLBACK(load_cb), imageviewer);
+ g_signal_connect(G_OBJECT(scrolledwin), "button-press-event",
+ G_CALLBACK(scrolledwin_button_cb), imageviewer);
+ g_signal_connect(G_OBJECT(scrolledwin), "size-allocate",
+ G_CALLBACK(scrolledwin_resize_cb), imageviewer);
image_viewer_set_notebook_page((MimeViewer *)imageviewer);