Rename gtk_activatable_reset to gtk_activatable_sync_action_properties,

        * gtk/gtk.symbols:
        * gtk/gtkactivatable.[hc]: Rename gtk_activatable_reset to
        gtk_activatable_sync_action_properties, since the previous name
        was deemed too generic. Update all implementations.


svn path=/trunk/; revision=22389

1 files changed, 10 insertions, 10 deletions

diff --git a/gtk/gtktoolbutton.c b/gtk/gtktoolbutton.c
index 2f7d8f1bf4..89231ea3ac 100644
--- a/gtk/gtktoolbutton.c
+++ b/gtk/gtktoolbutton.c
@@ -80,10 +80,10 @@ static void gtk_tool_button_style_set      (GtkWidget          *widget,
 static void gtk_tool_button_construct_contents (GtkToolItem *tool_item);
 
 static void gtk_tool_button_activatable_interface_init (GtkActivatableIface  *iface);
-static void gtk_tool_button_activatable_update         (GtkActivatable       *activatable,
+static void gtk_tool_button_update                     (GtkActivatable       *activatable,
 							GtkAction            *action,
 							const gchar          *property_name);
-static void gtk_tool_button_activatable_reset          (GtkActivatable       *activatable,
+static void gtk_tool_button_sync_action_properties     (GtkActivatable       *activatable,
 							GtkAction            *action);
 
 
@@ -740,14 +740,14 @@ static void
 gtk_tool_button_activatable_interface_init (GtkActivatableIface  *iface)
 {
   parent_activatable_iface = g_type_interface_peek_parent (iface);
-  iface->update = gtk_tool_button_activatable_update;
-  iface->reset = gtk_tool_button_activatable_reset;
+  iface->update = gtk_tool_button_update;
+  iface->sync_action_properties = gtk_tool_button_sync_action_properties;
 }
 
 static void
-gtk_tool_button_activatable_update (GtkActivatable       *activatable,
-				    GtkAction            *action,
-				    const gchar          *property_name)
+gtk_tool_button_update (GtkActivatable *activatable,
+			GtkAction      *action,
+			const gchar    *property_name)
 {
   GtkToolButton *button;
   GtkWidget *image;
@@ -789,14 +789,14 @@ gtk_tool_button_activatable_update (GtkActivatable       *activatable,
 }
 
 static void
-gtk_tool_button_activatable_reset (GtkActivatable       *activatable,
-				   GtkAction            *action)
+gtk_tool_button_sync_action_properties (GtkActivatable *activatable,
+				        GtkAction      *action)
 {
   GtkToolButton *button;
   GIcon         *icon;
   const gchar   *stock_id;
 
-  parent_activatable_iface->reset (activatable, action);
+  parent_activatable_iface->sync_action_properties (activatable, action);
 
   if (!action)
     return;