Remove leftover from commit 7264a996fe6bb4a21f6c8453b1acd4dc1a2daf79

[~andy/gtk] / gtk / a11y / gtkcontaineraccessible.c

diff --git a/gtk/a11y/gtkcontaineraccessible.c b/gtk/a11y/gtkcontaineraccessible.c
index c76f8f391048a3ed6e240b9f6cf821b7bdf5c8c1..423cdf43edb341ce8b96fba19b54364cc7b70db4 100644 (file)
--- a/gtk/a11y/gtkcontaineraccessible.c
+++ b/gtk/a11y/gtkcontaineraccessible.c
@@ -12,9 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "config.h"
@@ -116,11 +114,11 @@ gtk_container_accessible_real_add_gtk (GtkContainer *container,
   atk_child = gtk_widget_get_accessible (widget);
   accessible = GTK_CONTAINER_ACCESSIBLE (atk_parent);
 
-  g_object_notify (G_OBJECT (atk_child), "accessible_parent");
+  g_object_notify (G_OBJECT (atk_child), "accessible-parent");
   g_list_free (accessible->children);
   accessible->children = gtk_container_get_children (container);
   index = g_list_index (accessible->children, widget);
-  g_signal_emit_by_name (atk_parent, "children_changed::add", index, atk_child, NULL);
+  g_signal_emit_by_name (atk_parent, "children-changed::add", index, atk_child, NULL);
 
   return 1;
 }
@@ -141,12 +139,12 @@ gtk_container_accessible_real_remove_gtk (GtkContainer *container,
     return 1;
   accessible = GTK_CONTAINER_ACCESSIBLE (atk_parent);
 
-  g_object_notify (G_OBJECT (atk_child), "accessible_parent");
+  g_object_notify (G_OBJECT (atk_child), "accessible-parent");
   index = g_list_index (accessible->children, widget);
   g_list_free (accessible->children);
   accessible->children = gtk_container_get_children (container);
   if (index >= 0 && index <= g_list_length (accessible->children))
-    g_signal_emit_by_name (atk_parent, "children_changed::remove", index, atk_child, NULL);
+    g_signal_emit_by_name (atk_parent, "children-changed::remove", index, atk_child, NULL);
 
   return 1;
 }
@@ -164,12 +162,7 @@ gtk_container_accessible_real_initialize (AtkObject *obj,
   g_signal_connect (data, "add", G_CALLBACK (gtk_container_accessible_add_gtk), obj);
   g_signal_connect (data, "remove", G_CALLBACK (gtk_container_accessible_remove_gtk), obj);
 
-  if (GTK_IS_TOOLBAR (data))
-    obj->role = ATK_ROLE_TOOL_BAR;
-  else if (GTK_IS_VIEWPORT (data))
-    obj->role = ATK_ROLE_VIEWPORT;
-  else
-    obj->role = ATK_ROLE_PANEL;
+  obj->role = ATK_ROLE_PANEL;
 }
 
 static void