diff options
| -rw-r--r-- | embed/ephy-embed-container.c | 10 | ||||
| -rw-r--r-- | embed/ephy-embed-container.h | 8 | ||||
| -rw-r--r-- | src/ephy-tabs-menu.c | 2 | ||||
| -rw-r--r-- | src/ephy-window.c | 10 | ||||
| -rw-r--r-- | src/epiphany.defs | 4 |
5 files changed, 17 insertions, 17 deletions
diff --git a/embed/ephy-embed-container.c b/embed/ephy-embed-container.c index 6aee9a6fd..01e4c0520 100644 --- a/embed/ephy-embed-container.c +++ b/embed/ephy-embed-container.c @@ -87,18 +87,18 @@ ephy_embed_container_add_child (EphyEmbedContainer *container, } /** - * ephy_embed_container_jump_to_child: + * ephy_embed_container_set_active_child: * @container: an #EphyEmbedContainer * @child: an #EphyEmbed inside @container * - * Sets @child as @container's active child. + * Sets @child as @container's active child. **/ void -ephy_embed_container_jump_to_child (EphyEmbedContainer *container, - EphyEmbed *child) +ephy_embed_container_set_active_child (EphyEmbedContainer *container, + EphyEmbed *child) { EphyEmbedContainerIface *iface = EPHY_EMBED_CONTAINER_GET_IFACE (container); - iface->jump_to_child (container, child); + iface->set_active_child (container, child); } /** diff --git a/embed/ephy-embed-container.h b/embed/ephy-embed-container.h index 609fc08f6..948a0d77c 100644 --- a/embed/ephy-embed-container.h +++ b/embed/ephy-embed-container.h @@ -44,8 +44,8 @@ struct _EphyEmbedContainerIface gint position, gboolean jump_to); - void (* jump_to_child) (EphyEmbedContainer *container, - EphyEmbed *child); + void (* set_active_child) (EphyEmbedContainer *container, + EphyEmbed *child); void (* remove_child) (EphyEmbedContainer *container, EphyEmbed *child); @@ -66,8 +66,8 @@ void ephy_embed_container_add_child (EphyEmbedContainer *container, gint position, gboolean jump_to); -void ephy_embed_container_jump_to_child (EphyEmbedContainer *container, - EphyEmbed *child); +void ephy_embed_container_set_active_child (EphyEmbedContainer *container, + EphyEmbed *child); void ephy_embed_container_remove_child (EphyEmbedContainer *container, EphyEmbed *child); diff --git a/src/ephy-tabs-menu.c b/src/ephy-tabs-menu.c index 47ce241bc..e49b3ce14 100644 --- a/src/ephy-tabs-menu.c +++ b/src/ephy-tabs-menu.c @@ -173,7 +173,7 @@ tab_action_activate_cb (GtkToggleAction *action, if (ephy_embed_container_get_active_child (EPHY_EMBED_CONTAINER (priv->window)) != embed) { - ephy_embed_container_jump_to_child (EPHY_EMBED_CONTAINER (priv->window), embed); + ephy_embed_container_set_active_child (EPHY_EMBED_CONTAINER (priv->window), embed); } } diff --git a/src/ephy-window.c b/src/ephy-window.c index 5a820a182..7d049eb83 100644 --- a/src/ephy-window.c +++ b/src/ephy-window.c @@ -500,8 +500,8 @@ ephy_window_add_child (EphyEmbedContainer *container, } static void -ephy_window_jump_to_child (EphyEmbedContainer *container, - EphyEmbed *child) +ephy_window_set_active_child (EphyEmbedContainer *container, + EphyEmbed *child) { int page; EphyWindow *window; @@ -630,7 +630,7 @@ static void ephy_window_embed_container_iface_init (EphyEmbedContainerIface *iface) { iface->add_child = ephy_window_add_child; - iface->jump_to_child = ephy_window_jump_to_child; + iface->set_active_child = ephy_window_set_active_child; iface->remove_child = ephy_window_remove_child; iface->get_active_child = ephy_window_get_active_child; iface->get_children = ephy_window_get_children; @@ -1059,7 +1059,7 @@ ephy_window_delete_event (GtkWidget *widget, if (modified) { /* jump to the first tab with modified forms */ - ephy_window_jump_to_child (EPHY_EMBED_CONTAINER (window), + ephy_window_set_active_child (EPHY_EMBED_CONTAINER (window), modified_embed); if (confirm_close_with_modified_forms (window) == FALSE) @@ -2577,7 +2577,7 @@ embed_modal_alert_cb (EphyEmbed *embed, * (since the alert is modal, the user won't be able to do anything * with his current window anyway :|) */ - ephy_window_jump_to_child (EPHY_EMBED_CONTAINER (window), embed); + ephy_window_set_active_child (EPHY_EMBED_CONTAINER (window), embed); gtk_window_present (GTK_WINDOW (window)); /* make sure the location entry shows the real URL of the tab's page */ diff --git a/src/epiphany.defs b/src/epiphany.defs index 708a212cb..0320ac0d3 100644 --- a/src/epiphany.defs +++ b/src/epiphany.defs @@ -522,9 +522,9 @@ ;; From ../../embed/ephy-embed-container.h -(define-method jump_to_child +(define-method set_active_child (of-object "EphyEmbedContainer") - (c-name "ephy_embed_container_jump_to_child") + (c-name "ephy_embed_container_set_active_child") (return-type "none") (parameters '("EphyEmbed*" "child") |