[dia] [embedded image] pixbuf property needs PROP_FLAG_DONT_MERGE

[Hans Breuer <hans src gnome org>]

commit 9b7d2db6c4d4745d9949437a8b5142bd1b5e0538
Author: Hans Breuer <hans breuer org>
Date:   Sun Sep 12 13:23:27 2010 +0200

    [embedded image] pixbuf property needs PROP_FLAG_DONT_MERGE

 objects/standard/image.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)
---
diff --git a/objects/standard/image.c b/objects/standard/image.c
index 33c76fa..f43cb02 100644
--- a/objects/standard/image.c
+++ b/objects/standard/image.c
@@ -142,7 +142,7 @@ static PropDescription image_props[] = {
   ELEMENT_COMMON_PROPERTIES,
   { "image_file", PROP_TYPE_FILE, PROP_FLAG_VISIBLE,
     N_("Image file"), NULL, NULL},
-  { "inline_data", PROP_TYPE_BOOL, PROP_FLAG_VISIBLE|PROP_FLAG_OPTIONAL,
+  { "inline_data", PROP_TYPE_BOOL, PROP_FLAG_DONT_MERGE|PROP_FLAG_VISIBLE|PROP_FLAG_OPTIONAL,
     N_("Inline data"), N_("Store image data in diagram"), NULL },
   { "pixbuf", PROP_TYPE_PIXBUF, PROP_FLAG_OPTIONAL,
     N_("Pixbuf"), N_("The Pixbuf reference"), NULL },
@@ -210,7 +210,8 @@ image_set_props(Image *image, GPtrArray *props)
       if (pixbuf)
 	g_object_unref (pixbuf);
     } else {
-      message_warning ("FIXME: handle pixbuf change!");
+      if (image->pixbuf)
+        message_warning ("FIXME: handle pixbuf change!");
     }
   }