dia r4184 - in trunk: . lib

[hans svn gnome org]

Author: hans
Date: Fri Jan  9 22:46:02 2009
New Revision: 4184
URL: http://svn.gnome.org/viewvc/dia?rev=4184&view=rev

Log:
2009-01-09  Hans Breuer  <hans breuer org>

	* lib/propobject.c(object_list_get_propdescriptions) : for single 
	object in the list use the "intersection" because otherwise props
	with PROP_FLAG_DONT_MERGE would not be accessible anymore, e.g. 
	for "Standard - Outline" there was no way to change the text anymore
	(hopefully final regression introduced by fixing bug #60331)



Modified:
   trunk/ChangeLog
   trunk/lib/propobject.c

Modified: trunk/lib/propobject.c
==============================================================================
--- trunk/lib/propobject.c	(original)
+++ trunk/lib/propobject.c	Fri Jan  9 22:46:02 2009
@@ -65,7 +65,9 @@
     if (desc) descs = g_list_append(descs, (gpointer)desc);
   }
 
-  if (option == PROP_UNION)
+  /* use intersection for single object's list because it is more
+   * complete than union. The latter does not include PROP_FLAG_DONT_MERGE */
+  if (option == PROP_UNION && g_list_length(objects)!=1)
     pdesc = prop_desc_lists_union(descs);
   else
     pdesc = prop_desc_lists_intersection(descs);