| … | |
… | |
| 58 | # endif |
58 | # endif |
| 59 | |
59 | |
| 60 | void |
60 | void |
| 61 | rxvt_term::bg_destroy () |
61 | rxvt_term::bg_destroy () |
| 62 | { |
62 | { |
|
|
63 | # ifdef BG_IMAGE_FROM_FILE |
|
|
64 | for (vector<rxvt_image>::iterator bg_image = image_vec.begin (); bg_image < image_vec.end (); bg_image++) |
|
|
65 | bg_image->destroy (); |
|
|
66 | # endif |
|
|
67 | |
| 63 | if (bg_pixmap) |
68 | if (bg_pixmap) |
| 64 | XFreePixmap (dpy, bg_pixmap); |
69 | XFreePixmap (dpy, bg_pixmap); |
| 65 | } |
70 | } |
| 66 | |
71 | |
| 67 | bool |
72 | bool |
| … | |
… | |
| 694 | v_scale = |
699 | v_scale = |
| 695 | h_align = |
700 | h_align = |
| 696 | v_align = 0; |
701 | v_align = 0; |
| 697 | |
702 | |
| 698 | # ifdef HAVE_PIXBUF |
703 | # ifdef HAVE_PIXBUF |
| 699 | pixbuf.reset (0); |
704 | pixbuf = 0; |
| 700 | # endif |
705 | # endif |
| 701 | } |
706 | } |
| 702 | |
707 | |
| 703 | bool |
708 | bool |
| 704 | rxvt_image::set_file_geometry (const char *file) |
709 | rxvt_image::set_file_geometry (const char *file) |
| … | |
… | |
| 733 | GdkPixbuf *image = gdk_pixbuf_new_from_file (file, NULL); |
738 | GdkPixbuf *image = gdk_pixbuf_new_from_file (file, NULL); |
| 734 | if (image) |
739 | if (image) |
| 735 | { |
740 | { |
| 736 | if (pixbuf) |
741 | if (pixbuf) |
| 737 | g_object_unref (pixbuf); |
742 | g_object_unref (pixbuf); |
| 738 | pixbuf.reset (image); |
743 | pixbuf = image; |
| 739 | ret = true; |
744 | ret = true; |
| 740 | } |
745 | } |
| 741 | # endif |
746 | # endif |
| 742 | |
747 | |
| 743 | if (ret) |
748 | if (ret) |
