atk r1300 - in trunk: . atk

[liyuan svn gnome org]

Author: liyuan
Date: Tue Nov 18 02:53:29 2008
New Revision: 1300
URL: http://svn.gnome.org/viewvc/atk?rev=1300&view=rev

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

        * atk/atkobject.c:
        Bug #361757. Add ATK_ROLE_LINK and ATK_ROLE_INPUT_METHOD_WINDOW
        to role_items so their name can be got.
        * atk/atkrelation.c: (atk_relation_set_property):
        Bug #478620. Fix memory when atk_relation_set_property.


Modified:
   trunk/ChangeLog
   trunk/atk/atkobject.c
   trunk/atk/atkrelation.c

Modified: trunk/atk/atkobject.c
==============================================================================
--- trunk/atk/atkobject.c	(original)
+++ trunk/atk/atkobject.c	Tue Nov 18 02:53:29 2008
@@ -164,7 +164,9 @@
   { ATK_ROLE_PAGE, N_("page")},
   { ATK_ROLE_SECTION, N_("section")},
   { ATK_ROLE_REDUNDANT_OBJECT, N_("redundant object")},
-  { ATK_ROLE_FORM, N_("form")}
+  { ATK_ROLE_FORM, N_("form")},
+  { ATK_ROLE_LINK, N_("link")},
+  { ATK_ROLE_INPUT_METHOD_WINDOW, N_("input method window")}
 };
 
 static void            atk_object_class_init        (AtkObjectClass  *klass);

Modified: trunk/atk/atkrelation.c
==============================================================================
--- trunk/atk/atkrelation.c	(original)
+++ trunk/atk/atkrelation.c	Tue Nov 18 02:53:29 2008
@@ -404,6 +404,18 @@
       relation->relationship = g_value_get_enum (value);
       break; 
     case PROP_TARGET:
+      if (relation->target)
+      {
+        gint i;
+
+        for (i = 0; i < relation->target->len; i++)
+        {
+          g_object_weak_unref (G_OBJECT (g_ptr_array_index (relation->target, i)),
+                               (GWeakNotify) delete_object_while_in_relation,
+                               relation->target);
+        }
+        g_ptr_array_free (relation->target, TRUE);
+      }
       boxed = g_value_get_boxed (value);
       relation->target = atk_relation_get_ptr_array_from_value_array ( (GValueArray *) boxed);
       break;