[dia/dia-0-97] Fix 'UML - Classicon' property 'type' flags (especially being optional)

[Hans Breuer <hans src gnome org>]

commit 31b75636685ac9e44d10ab61983bc9175caff516
Author: Hans Breuer <hans breuer org>
Date:   Tue Nov 1 12:42:17 2011 +0100

    Fix 'UML - Classicon' property 'type' flags (especially being optional)
    
    The property flag initialization was wrongly using the logical OR operator,
    it was meant to be bitwise OR. Occurrence only in the master branch.
    
    (cherry picked from commit 1aaf9592cffbb03c199cddb85fcc63b06cad0f8e)

 objects/UML/classicon.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/objects/UML/classicon.c b/objects/UML/classicon.c
index 8d628ee..2e87d00 100644
--- a/objects/UML/classicon.c
+++ b/objects/UML/classicon.c
@@ -139,8 +139,8 @@ static PropDescription classicon_props[] = {
   /* how it used to be before 0.96+SVN */
   { "stereotype", PROP_TYPE_ENUM, PROP_FLAG_VISIBLE|PROP_FLAG_OPTIONAL, N_("Stereotype"), NULL,  
prop_classicon_type_data},
   /* one name, one type: but breaks forward-compatibiliy so kind of reverted */
-  { "type", PROP_TYPE_ENUM, PROP_FLAG_NO_DEFAULTS|PROP_FLAG_LOAD_ONLY||PROP_FLAG_OPTIONAL, N_("Stereotype"), 
NULL,  prop_classicon_type_data},
-  
+  { "type", PROP_TYPE_ENUM, PROP_FLAG_NO_DEFAULTS|PROP_FLAG_LOAD_ONLY|PROP_FLAG_OPTIONAL, N_("Stereotype"), 
NULL,  prop_classicon_type_data},
+
   { "is_object", PROP_TYPE_BOOL, PROP_FLAG_VISIBLE,
   N_("Is object"), NULL, NULL },
   PROP_STD_TEXT_FONT,