… | |
… | |
99 | if (bg_flags & BG_IS_TRANSPARENT) |
99 | if (bg_flags & BG_IS_TRANSPARENT) |
100 | return true; |
100 | return true; |
101 | # endif |
101 | # endif |
102 | |
102 | |
103 | # ifdef BG_IMAGE_FROM_FILE |
103 | # ifdef BG_IMAGE_FROM_FILE |
104 | if (have_image) |
104 | if (bg_flags & BG_IS_FROM_FILE) |
105 | { |
105 | { |
106 | if (bg_flags & BG_IS_SIZE_SENSITIVE) |
106 | if (bg_flags & BG_IS_SIZE_SENSITIVE) |
107 | return true; |
107 | return true; |
108 | } |
108 | } |
109 | # endif |
109 | # endif |
… | |
… | |
118 | if (bg_flags & BG_IS_TRANSPARENT) |
118 | if (bg_flags & BG_IS_TRANSPARENT) |
119 | return true; |
119 | return true; |
120 | # endif |
120 | # endif |
121 | |
121 | |
122 | # ifdef BG_IMAGE_FROM_FILE |
122 | # ifdef BG_IMAGE_FROM_FILE |
123 | if (have_image) |
123 | if (bg_flags & BG_IS_FROM_FILE) |
124 | { |
124 | { |
125 | if (bg_flags & BG_ROOT_ALIGN) |
125 | if (bg_flags & BG_ROOT_ALIGN) |
126 | return true; |
126 | return true; |
127 | } |
127 | } |
128 | # endif |
128 | # endif |
… | |
… | |
868 | if (image) |
868 | if (image) |
869 | { |
869 | { |
870 | if (original_asim) |
870 | if (original_asim) |
871 | safe_asimage_destroy (original_asim); |
871 | safe_asimage_destroy (original_asim); |
872 | original_asim = image; |
872 | original_asim = image; |
873 | bg_flags |= BG_CLIENT_RENDER; |
873 | bg_flags |= BG_IS_FROM_FILE | BG_CLIENT_RENDER; |
874 | have_image = true; |
|
|
875 | return true; |
874 | return true; |
876 | } |
875 | } |
877 | # endif |
876 | # endif |
878 | |
877 | |
879 | # ifdef HAVE_PIXBUF |
878 | # ifdef HAVE_PIXBUF |
… | |
… | |
881 | if (image) |
880 | if (image) |
882 | { |
881 | { |
883 | if (pixbuf) |
882 | if (pixbuf) |
884 | g_object_unref (pixbuf); |
883 | g_object_unref (pixbuf); |
885 | pixbuf = image; |
884 | pixbuf = image; |
886 | have_image = true; |
885 | bg_flags |= BG_IS_FROM_FILE; |
887 | return true; |
886 | return true; |
888 | } |
887 | } |
889 | # endif |
888 | # endif |
890 | |
889 | |
891 | return false; |
890 | return false; |
… | |
… | |
1350 | bg_flags |= BG_IS_VALID; |
1349 | bg_flags |= BG_IS_VALID; |
1351 | } |
1350 | } |
1352 | # endif |
1351 | # endif |
1353 | |
1352 | |
1354 | # ifdef BG_IMAGE_FROM_FILE |
1353 | # ifdef BG_IMAGE_FROM_FILE |
1355 | if (have_image |
1354 | if ((bg_flags & BG_IS_FROM_FILE) |
1356 | || (tr_flags & BG_EFFECTS_FLAGS)) |
1355 | || (tr_flags & BG_EFFECTS_FLAGS)) |
1357 | { |
1356 | { |
1358 | if (render_image (tr_flags)) |
1357 | if (render_image (tr_flags)) |
1359 | bg_flags |= BG_IS_VALID; |
1358 | bg_flags |= BG_IS_VALID; |
1360 | } |
1359 | } |