atk r1295 - in trunk: . atk

[liyuan svn gnome org]

Author: liyuan
Date: Fri Nov  7 09:26:49 2008
New Revision: 1295
URL: http://svn.gnome.org/viewvc/atk?rev=1295&view=rev

Log:
2008-11-07  Li Yuan  <li yuan sun com>

        * atk/atkrelationset.c: (atk_relation_set_add):
        Bug #478583. Do not add the relation if it is already
        in the relationset.


Modified:
   trunk/ChangeLog
   trunk/atk/atkrelationset.c

Modified: trunk/atk/atkrelationset.c
==============================================================================
--- trunk/atk/atkrelationset.c	(original)
+++ trunk/atk/atkrelationset.c	Fri Nov  7 09:26:49 2008
@@ -151,6 +151,8 @@
 atk_relation_set_add (AtkRelationSet *set,
                       AtkRelation    *relation)
 {
+  AtkRelationType relationship;
+
   g_return_if_fail (ATK_IS_RELATION_SET (set));
   g_return_if_fail (relation != NULL);
 
@@ -158,7 +160,11 @@
   {
     set->relations = g_ptr_array_new ();
   }
-  g_ptr_array_add (set->relations, relation);
+  relationship = atk_relation_get_relation_type (relation);
+  if (!atk_relation_set_contains (set, relationship))
+  {
+    g_ptr_array_add (set->relations, relation);
+  }
   g_object_ref (relation);
 }