aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXan Lopez <xan@src.gnome.org>2009-02-08 20:15:25 +0800
committerXan Lopez <xan@src.gnome.org>2009-02-08 20:15:25 +0800
commitcbea51644e5143aaa535a972174a0269a63d2505 (patch)
tree703013248984e6ff19005a3201a4184e1b2523d4
parent2d0e1157e413c2dfaf7101b025fa929513676bc9 (diff)
downloadgsoc2013-epiphany-cbea51644e5143aaa535a972174a0269a63d2505.tar
gsoc2013-epiphany-cbea51644e5143aaa535a972174a0269a63d2505.tar.gz
gsoc2013-epiphany-cbea51644e5143aaa535a972174a0269a63d2505.tar.bz2
gsoc2013-epiphany-cbea51644e5143aaa535a972174a0269a63d2505.tar.lz
gsoc2013-epiphany-cbea51644e5143aaa535a972174a0269a63d2505.tar.xz
gsoc2013-epiphany-cbea51644e5143aaa535a972174a0269a63d2505.tar.zst
gsoc2013-epiphany-cbea51644e5143aaa535a972174a0269a63d2505.zip
Use gtk_activatable_get_related_action instead of the deprecated gtk_widget_get_action.
svn path=/trunk/; revision=8771
-rw-r--r--src/bookmarks/ephy-bookmarks-ui.c8
-rw-r--r--src/bookmarks/ephy-topic-action.c2
-rw-r--r--src/ephy-location-action.c6
-rw-r--r--src/ephy-window.c4
4 files changed, 10 insertions, 10 deletions
diff --git a/src/bookmarks/ephy-bookmarks-ui.c b/src/bookmarks/ephy-bookmarks-ui.c
index dadfcd927..91479db85 100644
--- a/src/bookmarks/ephy-bookmarks-ui.c
+++ b/src/bookmarks/ephy-bookmarks-ui.c
@@ -116,7 +116,7 @@ activate_bookmark_properties (GtkAction *action,
widget = gtk_widget_get_ancestor (egg_editable_toolbar_get_selected (etoolbar),
GTK_TYPE_TOOL_ITEM);
- baction = widget ? gtk_widget_get_action (widget) : NULL;
+ baction = widget ? gtk_activatable_get_related_action (GTK_ACTIVATABLE (widget)) : NULL;
g_return_if_fail (EPHY_IS_BOOKMARK_ACTION (baction));
ephy_bookmarks_ui_show_bookmark (ephy_bookmark_action_get_bookmark
@@ -132,7 +132,7 @@ activate_bookmark_open_tab (GtkAction *action,
widget = gtk_widget_get_ancestor (egg_editable_toolbar_get_selected (etoolbar),
GTK_TYPE_TOOL_ITEM);
- baction = widget ? gtk_widget_get_action (widget) : NULL;
+ baction = widget ? gtk_activatable_get_related_action (GTK_ACTIVATABLE (widget)) : NULL;
g_return_if_fail (EPHY_IS_BOOKMARK_ACTION (baction));
ephy_bookmark_action_activate (EPHY_BOOKMARK_ACTION (baction), widget,
@@ -148,7 +148,7 @@ activate_bookmark_open_window (GtkAction *action,
widget = gtk_widget_get_ancestor (egg_editable_toolbar_get_selected (etoolbar),
GTK_TYPE_TOOL_ITEM);
- baction = widget ? gtk_widget_get_action (widget) : NULL;
+ baction = widget ? gtk_activatable_get_related_action (GTK_ACTIVATABLE (widget)) : NULL;
g_return_if_fail (EPHY_IS_BOOKMARK_ACTION (baction));
ephy_bookmark_action_activate (EPHY_BOOKMARK_ACTION (baction), widget,
@@ -170,7 +170,7 @@ selected_bookmark_action (EggEditableToolbar *etoolbar,
{
widget = egg_editable_toolbar_get_selected (etoolbar);
widget = widget ? gtk_widget_get_ancestor (widget, GTK_TYPE_TOOL_ITEM) : NULL;
- baction = widget ? gtk_widget_get_action (widget) : NULL;
+ baction = widget ? gtk_activatable_get_related_action (GTK_ACTIVATABLE (widget)) : NULL;
visible = EPHY_IS_BOOKMARK_ACTION (baction);
}
diff --git a/src/bookmarks/ephy-topic-action.c b/src/bookmarks/ephy-topic-action.c
index 0ef63a50d..512a6a067 100644
--- a/src/bookmarks/ephy-topic-action.c
+++ b/src/bookmarks/ephy-topic-action.c
@@ -376,7 +376,7 @@ button_enter_cb (GtkWidget *button,
gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (active_button)))
{
EphyTopicAction *active_action;
- active_action = gtk_widget_get_action (GTK_WIDGET (active_button));
+ active_action = (EphyTopicAction*)gtk_activatable_get_related_action (GTK_ACTIVATABLE (active_button));
erase_popup (active_action);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (active_button), FALSE);
diff --git a/src/ephy-location-action.c b/src/ephy-location-action.c
index 94deac3cd..cda3a117b 100644
--- a/src/ephy-location-action.c
+++ b/src/ephy-location-action.c
@@ -182,7 +182,7 @@ entry_activate_cb (GtkEntry *entry,
char *address;
GtkAction *action;
- action = gtk_widget_get_action (GTK_WIDGET (proxy));
+ action = gtk_activatable_get_related_action (GTK_ACTIVATABLE (proxy));
if (EPHY_LOCATION_ACTION (action)->priv->sync_address_is_blocked)
{
@@ -397,7 +397,7 @@ focus_in_event_cb (GtkWidget *entry,
GtkWidget *proxy)
{
GtkAction *action;
- action = gtk_widget_get_action (proxy);
+ action = gtk_activatable_get_related_action (GTK_ACTIVATABLE (proxy));
if (!EPHY_LOCATION_ACTION (action)->priv->sync_address_is_blocked)
{
@@ -414,7 +414,7 @@ focus_out_event_cb (GtkWidget *entry,
GtkWidget *proxy)
{
GtkAction *action;
- action = gtk_widget_get_action (GTK_WIDGET (proxy));
+ action = gtk_activatable_get_related_action (GTK_ACTIVATABLE (proxy));
if (EPHY_LOCATION_ACTION (action)->priv->sync_address_is_blocked)
{
diff --git a/src/ephy-window.c b/src/ephy-window.c
index ea3ed7497..dacaee3e0 100644
--- a/src/ephy-window.c
+++ b/src/ephy-window.c
@@ -1281,7 +1281,7 @@ menu_item_select_cb (GtkMenuItem *proxy,
GtkAction *action;
char *message;
- action = gtk_widget_get_action (GTK_WIDGET (proxy));
+ action = gtk_activatable_get_related_action (GTK_ACTIVATABLE (proxy));
g_return_if_fail (action != NULL);
g_object_get (action, "tooltip", &message, NULL);
@@ -1314,7 +1314,7 @@ tool_item_enter_cb (GtkWidget *proxy,
item = GTK_TOOL_ITEM (gtk_widget_get_ancestor (proxy, GTK_TYPE_TOOL_ITEM));
- action = gtk_widget_get_action (GTK_WIDGET (item));
+ action = gtk_activatable_get_related_action (GTK_ACTIVATABLE (item));
g_return_val_if_fail (action != NULL, FALSE);
g_object_get (action, "tooltip", &message, NULL);