epiphany r8771 - in trunk/src: . bookmarks

[xan svn gnome org]

Author: xan
Date: Sun Feb  8 12:15:25 2009
New Revision: 8771
URL: http://svn.gnome.org/viewvc/epiphany?rev=8771&view=rev

Log:
Use gtk_activatable_get_related_action instead of the deprecated gtk_widget_get_action.

Modified:
   trunk/src/bookmarks/ephy-bookmarks-ui.c
   trunk/src/bookmarks/ephy-topic-action.c
   trunk/src/ephy-location-action.c
   trunk/src/ephy-window.c

Modified: trunk/src/bookmarks/ephy-bookmarks-ui.c
==============================================================================
--- trunk/src/bookmarks/ephy-bookmarks-ui.c	(original)
+++ trunk/src/bookmarks/ephy-bookmarks-ui.c	Sun Feb  8 12:15:25 2009
@@ -116,7 +116,7 @@
 
 	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 @@
 
 	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 @@
 
 	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 @@
 	{
 		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);
 	}
 	  

Modified: trunk/src/bookmarks/ephy-topic-action.c
==============================================================================
--- trunk/src/bookmarks/ephy-topic-action.c	(original)
+++ trunk/src/bookmarks/ephy-topic-action.c	Sun Feb  8 12:15:25 2009
@@ -376,7 +376,7 @@
 	    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);

Modified: trunk/src/ephy-location-action.c
==============================================================================
--- trunk/src/ephy-location-action.c	(original)
+++ trunk/src/ephy-location-action.c	Sun Feb  8 12:15:25 2009
@@ -182,7 +182,7 @@
 	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 @@
 		   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 @@
 		    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)
 	{

Modified: trunk/src/ephy-window.c
==============================================================================
--- trunk/src/ephy-window.c	(original)
+++ trunk/src/ephy-window.c	Sun Feb  8 12:15:25 2009
@@ -1281,7 +1281,7 @@
 	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 @@
     
 		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);