callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use canonical names

Browse Source 
Use canonical names for both signals and properties.
This commit is contained in:
Matthias Clasen
2011-07-17 18:47:19 -04:00
parent dc2ae6c0a5
commit e756b2e50d
16 changed files with 62 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gtk/a11y/gtkbuttonaccessible.c
View File

@ -215,7 +215,7 @@ gtk_button_accessible_notify_gtk (GObject *obj,
if (atk_obj->name == NULL) if (atk_obj->name == NULL)
g_object_notify (G_OBJECT (atk_obj), "accessible-name"); g_object_notify (G_OBJECT (atk_obj), "accessible-name");
g_signal_emit_by_name (atk_obj, "visible_data_changed"); g_signal_emit_by_name (atk_obj, "visible-data-changed");
} }
else else
GTK_WIDGET_ACCESSIBLE_CLASS (_gtk_button_accessible_parent_class)->notify_gtk (obj, pspec); GTK_WIDGET_ACCESSIBLE_CLASS (_gtk_button_accessible_parent_class)->notify_gtk (obj, pspec);

4
gtk/a11y/gtkcellaccessible.c
View File

@ -182,7 +182,7 @@ _gtk_cell_accessible_add_state (GtkCellAccessible *cell,
atk_object_notify_state_change (ATK_OBJECT (cell), state_type, TRUE); atk_object_notify_state_change (ATK_OBJECT (cell), state_type, TRUE);
/* If state_type is ATK_STATE_VISIBLE, additional notification */ /* If state_type is ATK_STATE_VISIBLE, additional notification */
if (state_type == ATK_STATE_VISIBLE) if (state_type == ATK_STATE_VISIBLE)
g_signal_emit_by_name (cell, "visible_data_changed"); g_signal_emit_by_name (cell, "visible-data-changed");
} }
/* If the parent is a flyweight container cell, propagate the state /* If the parent is a flyweight container cell, propagate the state
@ -219,7 +219,7 @@ _gtk_cell_accessible_remove_state (GtkCellAccessible *cell,
atk_object_notify_state_change (ATK_OBJECT (cell), state_type, FALSE); atk_object_notify_state_change (ATK_OBJECT (cell), state_type, FALSE);
/* If state_type is ATK_STATE_VISIBLE, additional notification */ /* If state_type is ATK_STATE_VISIBLE, additional notification */
if (state_type == ATK_STATE_VISIBLE) if (state_type == ATK_STATE_VISIBLE)
g_signal_emit_by_name (cell, "visible_data_changed"); g_signal_emit_by_name (cell, "visible-data-changed");
} }
/* If the parent is a flyweight container cell, propagate the state /* If the parent is a flyweight container cell, propagate the state

2
gtk/a11y/gtkcomboboxaccessible.c
View File

@ -47,7 +47,7 @@ changed_cb (GtkWidget *widget)
{ {
accessible->old_selection = index; accessible->old_selection = index;
g_object_notify (G_OBJECT (obj), "accessible-name"); g_object_notify (G_OBJECT (obj), "accessible-name");
g_signal_emit_by_name (obj, "selection_changed"); g_signal_emit_by_name (obj, "selection-changed");
} }
} }

8
gtk/a11y/gtkcontaineraccessible.c
View File

@ -116,11 +116,11 @@ gtk_container_accessible_real_add_gtk (GtkContainer *container,
atk_child = gtk_widget_get_accessible (widget); atk_child = gtk_widget_get_accessible (widget);
accessible = GTK_CONTAINER_ACCESSIBLE (atk_parent); 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); g_list_free (accessible->children);
accessible->children = gtk_container_get_children (container); accessible->children = gtk_container_get_children (container);
index = g_list_index (accessible->children, widget); 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; return 1;
} }
@ -141,12 +141,12 @@ gtk_container_accessible_real_remove_gtk (GtkContainer *container,
return 1; return 1;
accessible = GTK_CONTAINER_ACCESSIBLE (atk_parent); 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); index = g_list_index (accessible->children, widget);
g_list_free (accessible->children); g_list_free (accessible->children);
accessible->children = gtk_container_get_children (container); accessible->children = gtk_container_get_children (container);
if (index >= 0 && index <= g_list_length (accessible->children)) 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; return 1;
} }

10
gtk/a11y/gtkentryaccessible.c
View File

@ -144,17 +144,17 @@ gtk_entry_accessible_notify_gtk (GObject *obj,
if (g_strcmp0 (pspec->name, "cursor-position") == 0) if (g_strcmp0 (pspec->name, "cursor-position") == 0)
{ {
if (check_for_selection_change (entry, gtk_entry)) if (check_for_selection_change (entry, gtk_entry))
g_signal_emit_by_name (atk_obj, "text_selection_changed"); g_signal_emit_by_name (atk_obj, "text-selection-changed");
/* /*
* The entry cursor position has moved so generate the signal. * The entry cursor position has moved so generate the signal.
*/ */
g_signal_emit_by_name (atk_obj, "text_caret_moved", g_signal_emit_by_name (atk_obj, "text-caret-moved",
entry->cursor_position); entry->cursor_position);
} }
else if (g_strcmp0 (pspec->name, "selection-bound") == 0) else if (g_strcmp0 (pspec->name, "selection-bound") == 0)
{ {
if (check_for_selection_change (entry, gtk_entry)) if (check_for_selection_change (entry, gtk_entry))
g_signal_emit_by_name (atk_obj, "text_selection_changed"); g_signal_emit_by_name (atk_obj, "text-selection-changed");
} }
else if (g_strcmp0 (pspec->name, "editable") == 0) else if (g_strcmp0 (pspec->name, "editable") == 0)
{ {
@ -906,7 +906,7 @@ changed_cb (GtkEditable *editable)
if (accessible->length_delete > 0) if (accessible->length_delete > 0)
{ {
g_signal_emit_by_name (accessible, g_signal_emit_by_name (accessible,
"text_changed::delete", "text-changed::delete",
accessible->position_delete, accessible->position_delete,
accessible->length_delete); accessible->length_delete);
accessible->length_delete = 0; accessible->length_delete = 0;
@ -914,7 +914,7 @@ changed_cb (GtkEditable *editable)
if (accessible->length_insert > 0) if (accessible->length_insert > 0)
{ {
g_signal_emit_by_name (accessible, g_signal_emit_by_name (accessible,
"text_changed::insert", "text-changed::insert",
accessible->position_insert, accessible->position_insert,
accessible->length_insert); accessible->length_insert);
accessible->length_insert = 0; accessible->length_insert = 0;

4
gtk/a11y/gtkexpanderaccessible.c
View File

@ -150,7 +150,7 @@ gtk_expander_accessible_notify_gtk (GObject *obj,
{ {
if (atk_obj->name == NULL) if (atk_obj->name == NULL)
g_object_notify (G_OBJECT (atk_obj), "accessible-name"); g_object_notify (G_OBJECT (atk_obj), "accessible-name");
g_signal_emit_by_name (atk_obj, "visible_data_changed"); g_signal_emit_by_name (atk_obj, "visible-data-changed");
} }
else if (g_strcmp0 (pspec->name, "expanded") == 0) else if (g_strcmp0 (pspec->name, "expanded") == 0)
{ {
@ -158,7 +158,7 @@ gtk_expander_accessible_notify_gtk (GObject *obj,
gtk_expander_get_expanded (expander)); gtk_expander_get_expanded (expander));
atk_object_notify_state_change (atk_obj, ATK_STATE_EXPANDED, atk_object_notify_state_change (atk_obj, ATK_STATE_EXPANDED,
gtk_expander_get_expanded (expander)); gtk_expander_get_expanded (expander));
g_signal_emit_by_name (atk_obj, "visible_data_changed"); g_signal_emit_by_name (atk_obj, "visible-data-changed");
} }
else else
GTK_WIDGET_ACCESSIBLE_CLASS (_gtk_expander_accessible_parent_class)->notify_gtk (obj, pspec); GTK_WIDGET_ACCESSIBLE_CLASS (_gtk_expander_accessible_parent_class)->notify_gtk (obj, pspec);

6
gtk/a11y/gtkmenuitemaccessible.c
View File

@ -215,7 +215,7 @@ gtk_menu_item_accessible_notify_gtk (GObject *obj,
{ {
if (atk_obj->name == NULL) if (atk_obj->name == NULL)
g_object_notify (G_OBJECT (atk_obj), "accessible-name"); g_object_notify (G_OBJECT (atk_obj), "accessible-name");
g_signal_emit_by_name (atk_obj, "visible_data_changed"); g_signal_emit_by_name (atk_obj, "visible-data-changed");
} }
else else
GTK_WIDGET_ACCESSIBLE_CLASS (_gtk_menu_item_accessible_parent_class)->notify_gtk (obj, pspec); GTK_WIDGET_ACCESSIBLE_CLASS (_gtk_menu_item_accessible_parent_class)->notify_gtk (obj, pspec);
@ -372,7 +372,7 @@ gtk_menu_item_accessible_do_action (AtkAction *action,
/* This is what is called when <Return> is pressed for a menu item. /* This is what is called when <Return> is pressed for a menu item.
* The last argument means 'force hide'. * The last argument means 'force hide'.
*/ */
g_signal_emit_by_name (item_parent, "activate_current", 1); g_signal_emit_by_name (item_parent, "activate-current", 1);
if (!item_mapped) if (!item_mapped)
ensure_menus_unposted (GTK_MENU_ITEM_ACCESSIBLE (action)); ensure_menus_unposted (GTK_MENU_ITEM_ACCESSIBLE (action));
@ -614,7 +614,7 @@ menu_item_selection (GtkMenuItem *item,
g_object_unref (child); g_object_unref (child);
} }
parent = atk_object_get_parent (obj); parent = atk_object_get_parent (obj);
g_signal_emit_by_name (parent, "selection_changed"); g_signal_emit_by_name (parent, "selection-changed");
} }
static void static void

8
gtk/a11y/gtknotebookaccessible.c
View File

@ -95,7 +95,7 @@ create_notebook_page_accessible (GtkNotebookAccessible *accessible,
obj = _gtk_notebook_page_accessible_new (accessible, child); obj = _gtk_notebook_page_accessible_new (accessible, child);
g_hash_table_insert (accessible->pages, child, obj); g_hash_table_insert (accessible->pages, child, obj);
atk_object_set_parent (obj, ATK_OBJECT (accessible)); atk_object_set_parent (obj, ATK_OBJECT (accessible));
g_signal_emit_by_name (accessible, "children_changed::add", page_num, obj, NULL); g_signal_emit_by_name (accessible, "children-changed::add", page_num, obj, NULL);
} }
static void static void
@ -125,7 +125,7 @@ page_removed_cb (GtkNotebook *notebook,
obj = g_hash_table_lookup (accessible->pages, widget); obj = g_hash_table_lookup (accessible->pages, widget);
g_return_if_fail (obj); g_return_if_fail (obj);
g_signal_emit_by_name (accessible, "children_changed::remove", g_signal_emit_by_name (accessible, "children-changed::remove",
page_num, obj, NULL); page_num, obj, NULL);
_gtk_notebook_page_accessible_invalidate (GTK_NOTEBOOK_PAGE_ACCESSIBLE (obj)); _gtk_notebook_page_accessible_invalidate (GTK_NOTEBOOK_PAGE_ACCESSIBLE (obj));
g_hash_table_remove (accessible->pages, widget); g_hash_table_remove (accessible->pages, widget);
@ -268,8 +268,8 @@ gtk_notebook_accessible_notify_gtk (GObject *obj,
* Notebook does not have tabs. * Notebook does not have tabs.
*/ */
} }
g_signal_emit_by_name (atk_obj, "selection_changed"); g_signal_emit_by_name (atk_obj, "selection-changed");
g_signal_emit_by_name (atk_obj, "visible_data_changed"); g_signal_emit_by_name (atk_obj, "visible-data-changed");
} }
if (gtk_notebook_get_show_tabs (notebook) && if (gtk_notebook_get_show_tabs (notebook) &&
(focus_page_num != old_focus_page_num)) (focus_page_num != old_focus_page_num))

2
gtk/a11y/gtkpanedaccessible.c
View File

@ -43,7 +43,7 @@ gtk_paned_accessible_initialize (AtkObject *obj,
{ {
ATK_OBJECT_CLASS (_gtk_paned_accessible_parent_class)->initialize (obj, data); ATK_OBJECT_CLASS (_gtk_paned_accessible_parent_class)->initialize (obj, data);
g_signal_connect (data, "size_allocate", g_signal_connect (data, "size-allocate",
G_CALLBACK (gtk_paned_accessible_size_allocate_gtk), NULL); G_CALLBACK (gtk_paned_accessible_size_allocate_gtk), NULL);
obj->role = ATK_ROLE_SPLIT_PANE; obj->role = ATK_ROLE_SPLIT_PANE;

4
gtk/a11y/gtkscrolledwindowaccessible.c
View File

@ -77,9 +77,9 @@ visibility_changed (GObject *object,
} }
if (child_added) if (child_added)
g_signal_emit_by_name (accessible, "children_changed::add", index, child, NULL); g_signal_emit_by_name (accessible, "children-changed::add", index, child, NULL);
else else
g_signal_emit_by_name (accessible, "children_changed::remove", index, child, NULL); g_signal_emit_by_name (accessible, "children-changed::remove", index, child, NULL);
} }
} }

4
gtk/a11y/gtksubmenuitemaccessible.c
View File

@ -267,7 +267,7 @@ menu_item_add_gtk (GtkContainer *container,
g_list_free (container_accessible->children); g_list_free (container_accessible->children);
container_accessible->children = gtk_container_get_children (container); container_accessible->children = gtk_container_get_children (container);
index = g_list_index (container_accessible->children, widget); index = g_list_index (container_accessible->children, widget);
g_signal_emit_by_name (atk_parent, "children_changed::add", g_signal_emit_by_name (atk_parent, "children-changed::add",
index, atk_child, NULL); index, atk_child, NULL);
} }
return 1; return 1;
@ -300,7 +300,7 @@ menu_item_remove_gtk (GtkContainer *container,
g_list_free (container_accessible->children); g_list_free (container_accessible->children);
container_accessible->children = gtk_container_get_children (container); container_accessible->children = gtk_container_get_children (container);
if (index >= 0 && index <= list_length) if (index >= 0 && index <= list_length)
g_signal_emit_by_name (atk_parent, "children_changed::remove", g_signal_emit_by_name (atk_parent, "children-changed::remove",
index, atk_child, NULL); index, atk_child, NULL);
} }
return 1; return 1;

8
gtk/a11y/gtktextcellaccessible.c
View File

@ -85,7 +85,7 @@ static gboolean gtk_text_cell_accessible_update_cache (GtkRendererCe
static gchar *property_list[] = { static gchar *property_list[] = {
/* Set font_desc first since it resets other values if it is NULL */ /* Set font_desc first since it resets other values if it is NULL */
"font_desc", "font-desc",
"attributes", "attributes",
"background-gdk", "background-gdk",
"editable", "editable",
@ -169,7 +169,7 @@ gtk_text_cell_accessible_update_cache (GtkRendererCellAccessible *cell,
text_cell->cell_length = 0; text_cell->cell_length = 0;
if (emit_change_signal) if (emit_change_signal)
{ {
g_signal_emit_by_name (cell, "text_changed::delete", 0, temp_length); g_signal_emit_by_name (cell, "text-changed::delete", 0, temp_length);
if (obj->name == NULL) if (obj->name == NULL)
g_object_notify (G_OBJECT (obj), "accessible-name"); g_object_notify (G_OBJECT (obj), "accessible-name");
} }
@ -200,7 +200,7 @@ gtk_text_cell_accessible_update_cache (GtkRendererCellAccessible *cell,
{ {
if (emit_change_signal) if (emit_change_signal)
{ {
g_signal_emit_by_name (cell, "text_changed::insert", g_signal_emit_by_name (cell, "text-changed::insert",
0, text_cell->cell_length); 0, text_cell->cell_length);
if (obj->name == NULL) if (obj->name == NULL)
@ -355,7 +355,7 @@ gtk_text_cell_accessible_set_caret_offset (AtkText *text,
text_cell->caret_pos = offset; text_cell->caret_pos = offset;
/* emit the signal */ /* emit the signal */
g_signal_emit_by_name (text, "text_caret_moved", offset); g_signal_emit_by_name (text, "text-caret-moved", offset);
return TRUE; return TRUE;
} }
else else

20
gtk/a11y/gtktextviewaccessible.c
View File

@ -1261,22 +1261,22 @@ gtk_text_view_accessible_set_run_attributes (AtkEditableText *text,
value = at->value; value = at->value;
if (!strcmp (name, atk_text_attribute_get_name (ATK_TEXT_ATTR_LEFT_MARGIN))) if (!strcmp (name, atk_text_attribute_get_name (ATK_TEXT_ATTR_LEFT_MARGIN)))
g_object_set (G_OBJECT (tag), "left_margin", atoi (value), NULL); g_object_set (G_OBJECT (tag), "left-margin", atoi (value), NULL);
else if (!strcmp (name, atk_text_attribute_get_name (ATK_TEXT_ATTR_RIGHT_MARGIN))) else if (!strcmp (name, atk_text_attribute_get_name (ATK_TEXT_ATTR_RIGHT_MARGIN)))
g_object_set (G_OBJECT (tag), "right_margin", atoi (value), NULL); g_object_set (G_OBJECT (tag), "right-margin", atoi (value), NULL);
else if (!strcmp (name, atk_text_attribute_get_name (ATK_TEXT_ATTR_INDENT))) else if (!strcmp (name, atk_text_attribute_get_name (ATK_TEXT_ATTR_INDENT)))
g_object_set (G_OBJECT (tag), "indent", atoi (value), NULL); g_object_set (G_OBJECT (tag), "indent", atoi (value), NULL);
else if (!strcmp (name, atk_text_attribute_get_name (ATK_TEXT_ATTR_PIXELS_ABOVE_LINES))) else if (!strcmp (name, atk_text_attribute_get_name (ATK_TEXT_ATTR_PIXELS_ABOVE_LINES)))
g_object_set (G_OBJECT (tag), "pixels_above_lines", atoi (value), NULL); g_object_set (G_OBJECT (tag), "pixels-above-lines", atoi (value), NULL);
else if (!strcmp(name, atk_text_attribute_get_name (ATK_TEXT_ATTR_PIXELS_BELOW_LINES))) else if (!strcmp(name, atk_text_attribute_get_name (ATK_TEXT_ATTR_PIXELS_BELOW_LINES)))
g_object_set (G_OBJECT (tag), "pixels_below_lines", atoi (value), NULL); g_object_set (G_OBJECT (tag), "pixels-below-lines", atoi (value), NULL);
else if (!strcmp (name, atk_text_attribute_get_name (ATK_TEXT_ATTR_PIXELS_INSIDE_WRAP))) else if (!strcmp (name, atk_text_attribute_get_name (ATK_TEXT_ATTR_PIXELS_INSIDE_WRAP)))
g_object_set (G_OBJECT (tag), "pixels_inside_wrap", atoi (value), NULL); g_object_set (G_OBJECT (tag), "pixels-inside-wrap", atoi (value), NULL);
else if (!strcmp (name, atk_text_attribute_get_name (ATK_TEXT_ATTR_SIZE))) else if (!strcmp (name, atk_text_attribute_get_name (ATK_TEXT_ATTR_SIZE)))
g_object_set (G_OBJECT (tag), "size", atoi (value), NULL); g_object_set (G_OBJECT (tag), "size", atoi (value), NULL);
@ -1289,7 +1289,7 @@ gtk_text_view_accessible_set_run_attributes (AtkEditableText *text,
else if (!strcmp (name, atk_text_attribute_get_name (ATK_TEXT_ATTR_BG_FULL_HEIGHT))) else if (!strcmp (name, atk_text_attribute_get_name (ATK_TEXT_ATTR_BG_FULL_HEIGHT)))
{ {
g_object_set (G_OBJECT (tag), "bg_full_height", g_object_set (G_OBJECT (tag), "bg-full-height",
(strcmp (value, atk_text_attribute_get_value (ATK_TEXT_ATTR_BG_FULL_HEIGHT, 0))), (strcmp (value, atk_text_attribute_get_value (ATK_TEXT_ATTR_BG_FULL_HEIGHT, 0))),
NULL); NULL);
} }
@ -1340,7 +1340,7 @@ gtk_text_view_accessible_set_run_attributes (AtkEditableText *text,
color->red = atoi (RGB_vals[0]); color->red = atoi (RGB_vals[0]);
color->green = atoi (RGB_vals[1]); color->green = atoi (RGB_vals[1]);
color->blue = atoi (RGB_vals[2]); color->blue = atoi (RGB_vals[2]);
g_object_set (G_OBJECT (tag), "background_gdk", color, NULL); g_object_set (G_OBJECT (tag), "background-gdk", color, NULL);
} }
else if (!strcmp (name, atk_text_attribute_get_name (ATK_TEXT_ATTR_FG_COLOR))) else if (!strcmp (name, atk_text_attribute_get_name (ATK_TEXT_ATTR_FG_COLOR)))
@ -1350,7 +1350,7 @@ gtk_text_view_accessible_set_run_attributes (AtkEditableText *text,
color->red = atoi (RGB_vals[0]); color->red = atoi (RGB_vals[0]);
color->green = atoi (RGB_vals[1]); color->green = atoi (RGB_vals[1]);
color->blue = atoi (RGB_vals[2]); color->blue = atoi (RGB_vals[2]);
g_object_set (G_OBJECT (tag), "foreground_gdk", color, NULL); g_object_set (G_OBJECT (tag), "foreground-gdk", color, NULL);
} }
else if (!strcmp (name, atk_text_attribute_get_name (ATK_TEXT_ATTR_STRETCH))) else if (!strcmp (name, atk_text_attribute_get_name (ATK_TEXT_ATTR_STRETCH)))
@ -1407,7 +1407,7 @@ gtk_text_view_accessible_set_run_attributes (AtkEditableText *text,
{ {
if (!strcmp (value, atk_text_attribute_get_value (ATK_TEXT_ATTR_WRAP_MODE, j))) if (!strcmp (value, atk_text_attribute_get_value (ATK_TEXT_ATTR_WRAP_MODE, j)))
{ {
g_object_set (G_OBJECT (tag), "wrap_mode", j, NULL); g_object_set (G_OBJECT (tag), "wrap-mode", j, NULL);
break; break;
} }
} }
@ -1688,7 +1688,7 @@ delete_range_cb (GtkTextBuffer *buffer,
length = gtk_text_iter_get_offset (end) - offset; length = gtk_text_iter_get_offset (end) - offset;
g_signal_emit_by_name (accessible, g_signal_emit_by_name (accessible,
"text_changed::delete", "text-changed::delete",
offset, offset,
length); length);

34
gtk/a11y/gtktreeviewaccessible.c
View File

@ -370,8 +370,8 @@ gtk_tree_view_accessible_notify_gtk (GObject *obj,
} }
atk_object_set_role (ATK_OBJECT (accessible), role); atk_object_set_role (ATK_OBJECT (accessible), role);
g_object_freeze_notify (G_OBJECT (accessible)); g_object_freeze_notify (G_OBJECT (accessible));
g_signal_emit_by_name (accessible, "model_changed"); g_signal_emit_by_name (accessible, "model-changed");
g_signal_emit_by_name (accessible, "visible_data_changed"); g_signal_emit_by_name (accessible, "visible-data-changed");
g_object_thaw_notify (G_OBJECT (accessible)); g_object_thaw_notify (G_OBJECT (accessible));
} }
else if (g_strcmp0 (pspec->name, "hadjustment") == 0) else if (g_strcmp0 (pspec->name, "hadjustment") == 0)
@ -1369,7 +1369,7 @@ gtk_tree_view_accessible_get_cell_area (GtkCellAccessibleParent *parent,
{ {
gint expander_size; gint expander_size;
gtk_widget_style_get (widget, gtk_widget_style_get (widget,
"expander_size", &expander_size, "expander-size", &expander_size,
NULL); NULL);
cell_rect->x += expander_size + EXTRA_EXPANDER_PADDING; cell_rect->x += expander_size + EXTRA_EXPANDER_PADDING;
cell_rect->width -= expander_size + EXTRA_EXPANDER_PADDING; cell_rect->width -= expander_size + EXTRA_EXPANDER_PADDING;
@ -1602,7 +1602,7 @@ idle_expand_row (gpointer data)
/* Must add 1 because the "added rows" are below the row being expanded */ /* Must add 1 because the "added rows" are below the row being expanded */
row += 1; row += 1;
g_signal_emit_by_name (accessible, "row_inserted", row, n_inserted); g_signal_emit_by_name (accessible, "row-inserted", row, n_inserted);
accessible->idle_expand_path = NULL; accessible->idle_expand_path = NULL;
@ -1661,7 +1661,7 @@ row_collapsed_cb (GtkTreeView *tree_view,
row = get_row_from_tree_path (tree_view, path); row = get_row_from_tree_path (tree_view, path);
if (row == -1) if (row == -1)
return FALSE; return FALSE;
g_signal_emit_by_name (atk_obj, "row_deleted", row, g_signal_emit_by_name (atk_obj, "row-deleted", row,
accessible->n_children_deleted); accessible->n_children_deleted);
accessible->n_children_deleted = 0; accessible->n_children_deleted = 0;
return FALSE; return FALSE;
@ -1720,7 +1720,7 @@ selection_changed_cb (GtkTreeSelection *selection,
} }
} }
if (gtk_widget_get_realized (widget)) if (gtk_widget_get_realized (widget))
g_signal_emit_by_name (accessible, "selection_changed"); g_signal_emit_by_name (accessible, "selection-changed");
} }
static void static void
@ -1770,7 +1770,7 @@ columns_changed (GtkTreeView *tree_view)
} }
/* Just emit one column reordered signal when a move happens */ /* Just emit one column reordered signal when a move happens */
g_signal_emit_by_name (atk_obj, "column_reordered"); g_signal_emit_by_name (atk_obj, "column-reordered");
move_found = TRUE; move_found = TRUE;
} }
@ -1793,13 +1793,13 @@ columns_changed (GtkTreeView *tree_view)
} }
/* Generate column-inserted signal */ /* Generate column-inserted signal */
g_signal_emit_by_name (atk_obj, "column_inserted", column_count, 1); g_signal_emit_by_name (atk_obj, "column-inserted", column_count, 1);
/* Generate children-changed signals */ /* Generate children-changed signals */
for (row = 0; row < accessible->n_rows; row++) for (row = 0; row < accessible->n_rows; row++)
{ {
/* Pass NULL as the child object, i.e. 4th argument */ /* Pass NULL as the child object, i.e. 4th argument */
g_signal_emit_by_name (atk_obj, "children_changed::add", g_signal_emit_by_name (atk_obj, "children-changed::add",
((row * accessible->n_cols) + column_count), NULL, NULL); ((row * accessible->n_cols) + column_count), NULL, NULL);
} }
} }
@ -1842,13 +1842,13 @@ columns_changed (GtkTreeView *tree_view)
} }
/* Generate column-deleted signal */ /* Generate column-deleted signal */
g_signal_emit_by_name (atk_obj, "column_deleted", i, 1); g_signal_emit_by_name (atk_obj, "column-deleted", i, 1);
/* Generate children-changed signals */ /* Generate children-changed signals */
for (row = 0; row < accessible->n_rows; row++) for (row = 0; row < accessible->n_rows; row++)
{ {
/* Pass NULL as the child object, 4th argument */ /* Pass NULL as the child object, 4th argument */
g_signal_emit_by_name (atk_obj, "children_changed::remove", g_signal_emit_by_name (atk_obj, "children-changed::remove",
((row * accessible->n_cols) + column_count), NULL, NULL); ((row * accessible->n_cols) + column_count), NULL, NULL);
} }
} }
@ -2029,7 +2029,7 @@ column_visibility_changed (GObject *object,
accessible = GTK_TREE_VIEW_ACCESSIBLE (gtk_widget_get_accessible (GTK_WIDGET (tree_view)) accessible = GTK_TREE_VIEW_ACCESSIBLE (gtk_widget_get_accessible (GTK_WIDGET (tree_view))
); );
g_signal_emit_by_name (accessible, "model_changed"); g_signal_emit_by_name (accessible, "model-changed");
g_hash_table_iter_init (&iter, accessible->cell_info_by_index); g_hash_table_iter_init (&iter, accessible->cell_info_by_index);
while (g_hash_table_iter_next (&iter, NULL, (gpointer *)&cell_info)) while (g_hash_table_iter_next (&iter, NULL, (gpointer *)&cell_info))
@ -2127,7 +2127,7 @@ model_row_inserted (GtkTreeModel *tree_model,
traverse_cells (accessible, path, TRUE, TRUE); traverse_cells (accessible, path, TRUE, TRUE);
/* Generate row-inserted signal */ /* Generate row-inserted signal */
g_signal_emit_by_name (atk_obj, "row_inserted", row, n_inserted); g_signal_emit_by_name (atk_obj, "row-inserted", row, n_inserted);
/* Generate children-changed signals */ /* Generate children-changed signals */
n_cols = gtk_tree_view_accessible_get_n_columns (ATK_TABLE (atk_obj)); n_cols = gtk_tree_view_accessible_get_n_columns (ATK_TABLE (atk_obj));
@ -2136,7 +2136,7 @@ model_row_inserted (GtkTreeModel *tree_model,
for (col = 0; col < n_cols; col++) for (col = 0; col < n_cols; col++)
{ {
/* Pass NULL as the child object, i.e. 4th argument */ /* Pass NULL as the child object, i.e. 4th argument */
g_signal_emit_by_name (atk_obj, "children_changed::add", g_signal_emit_by_name (atk_obj, "children-changed::add",
((row * n_cols) + col), NULL, NULL); ((row * n_cols) + col), NULL, NULL);
} }
} }
@ -2200,7 +2200,7 @@ model_row_deleted (GtkTreeModel *tree_model,
* a collapsed row then row will be -1 * a collapsed row then row will be -1
*/ */
if (row > 0) if (row > 0)
g_signal_emit_by_name (atk_obj, "row_deleted", row, g_signal_emit_by_name (atk_obj, "row-deleted", row,
accessible->n_children_deleted + 1); accessible->n_children_deleted + 1);
accessible->n_children_deleted = 0; accessible->n_children_deleted = 0;
@ -2208,7 +2208,7 @@ model_row_deleted (GtkTreeModel *tree_model,
for (col = 0; col < accessible->n_cols; col++) for (col = 0; col < accessible->n_cols; col++)
{ {
/* Pass NULL as the child object, 4th argument */ /* Pass NULL as the child object, 4th argument */
g_signal_emit_by_name (atk_obj, "children_changed::remove", g_signal_emit_by_name (atk_obj, "children-changed::remove",
((row * accessible->n_cols) + col), NULL, NULL); ((row * accessible->n_cols) + col), NULL, NULL);
} }
} }
@ -2262,7 +2262,7 @@ model_rows_reordered (GtkTreeModel *tree_model,
} }
traverse_cells (accessible, NULL, TRUE, FALSE); traverse_cells (accessible, NULL, TRUE, FALSE);
g_signal_emit_by_name (atk_obj, "row_reordered"); g_signal_emit_by_name (atk_obj, "row-reordered");
} }
static void static void

4
gtk/a11y/gtkwidgetaccessible.c
View File

@ -82,7 +82,7 @@ size_allocate_cb (GtkWidget *widget,
rect.y = allocation->y; rect.y = allocation->y;
rect.width = allocation->width; rect.width = allocation->width;
rect.height = allocation->height; rect.height = allocation->height;
g_signal_emit_by_name (accessible, "bounds_changed", &rect); g_signal_emit_by_name (accessible, "bounds-changed", &rect);
} }
} }
@ -527,7 +527,7 @@ gtk_widget_accessible_focus_gtk (GtkWidget *widget,
accessible = gtk_widget_get_accessible (widget); accessible = gtk_widget_get_accessible (widget);
g_signal_emit_by_name (accessible, "focus_event", event->in, &return_val); g_signal_emit_by_name (accessible, "focus-event", event->in, &return_val);
return FALSE; return FALSE;
} }

4
gtk/a11y/gtkwindowaccessible.c
View File

@ -80,7 +80,7 @@ gtk_window_accessible_notify_gtk (GObject *obj,
if (g_strcmp0 (pspec->name, "title") == 0) if (g_strcmp0 (pspec->name, "title") == 0)
{ {
g_object_notify (G_OBJECT (atk_obj), "accessible-name"); g_object_notify (G_OBJECT (atk_obj), "accessible-name");
g_signal_emit_by_name (atk_obj, "visible_data_changed"); g_signal_emit_by_name (atk_obj, "visible-data-changed");
} }
else else
GTK_WIDGET_ACCESSIBLE_CLASS (_gtk_window_accessible_parent_class)->notify_gtk (obj, pspec); GTK_WIDGET_ACCESSIBLE_CLASS (_gtk_window_accessible_parent_class)->notify_gtk (obj, pspec);
@ -111,7 +111,7 @@ gtk_window_accessible_initialize (AtkObject *obj,
ATK_OBJECT_CLASS (_gtk_window_accessible_parent_class)->initialize (obj, data); ATK_OBJECT_CLASS (_gtk_window_accessible_parent_class)->initialize (obj, data);
g_signal_connect (data, "window_state_event", G_CALLBACK (window_state_event_cb), NULL); g_signal_connect (data, "window-state-event", G_CALLBACK (window_state_event_cb), NULL);
_gtk_widget_accessible_set_layer (GTK_WIDGET_ACCESSIBLE (obj), ATK_LAYER_WINDOW); _gtk_widget_accessible_set_layer (GTK_WIDGET_ACCESSIBLE (obj), ATK_LAYER_WINDOW);
if (GTK_IS_FILE_CHOOSER_DIALOG (widget)) if (GTK_IS_FILE_CHOOSER_DIALOG (widget))