| … | |
… | |
| 644 | if (image) |
644 | if (image) |
| 645 | { |
645 | { |
| 646 | if (pixbuf) |
646 | if (pixbuf) |
| 647 | g_object_unref (pixbuf); |
647 | g_object_unref (pixbuf); |
| 648 | pixbuf = image; |
648 | pixbuf = image; |
| 649 | flags |= IM_IS_SET; |
|
|
| 650 | ret = true; |
649 | ret = true; |
| 651 | } |
650 | } |
| 652 | # endif |
651 | # endif |
| 653 | |
652 | |
| 654 | if (ret) |
653 | if (ret) |
| 655 | { |
654 | { |
|
|
655 | flags = IM_IS_SET | IM_IS_SIZE_SENSITIVE; |
|
|
656 | h_scale = v_scale = defaultScale; |
|
|
657 | h_align = v_align = defaultAlign; |
|
|
658 | |
| 656 | if (p) |
659 | if (p) |
| 657 | set_geometry (p + 1); |
660 | set_geometry (p + 1); |
| 658 | else |
|
|
| 659 | set_default_geometry (); |
|
|
| 660 | } |
661 | } |
| 661 | |
662 | |
| 662 | return ret; |
663 | return ret; |
| 663 | } |
664 | } |
| 664 | |
665 | |
