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

15 files changed, 229 insertions, 226 deletions

diff --git a/gtk/gtk.symbols b/gtk/gtk.symbols
index 806e9bef0..b2bb94cd5 100644
--- a/gtk/gtk.symbols
+++ b/gtk/gtk.symbols
@@ -234,7 +234,7 @@ gtk_activatable_do_set_related_action
 gtk_activatable_get_related_action
 gtk_activatable_get_type G_GNUC_CONST
 gtk_activatable_get_use_action_appearance
-gtk_activatable_reset
+gtk_activatable_sync_action_properties
 gtk_activatable_set_related_action
 gtk_activatable_set_use_action_appearance
 #endif
diff --git a/gtk/gtkactivatable.c b/gtk/gtkactivatable.c
index 198c8ba97..8e1483726 100644
--- a/gtk/gtkactivatable.c
+++ b/gtk/gtkactivatable.c
@@ -23,29 +23,30 @@
  *
  * Activatable widgets can be connected to a #GtkAction and reflects
  * the state of its action. A #GtkActivatable can also provide feedback
- * through its action, as they are responsible for activating their 
+ * through its action, as they are responsible for activating their
  * related actions.
  *
  * <refsect2>
  * <title>Implementing GtkActivatable</title>
  * <para>
  * When extending a class that is already #GtkActivatable; it is only
- * necessary to implement the #GtkActivatable->reset() and #GtkActivatable->update()
- * methods and chain up to the parent implementation, however when introducing
+ * necessary to implement the #GtkActivatable->sync_action_properties()
+ * and #GtkActivatable->update() methods and chain up to the parent
+ * implementation, however when introducing
  * a new #GtkActivatable class; the #GtkActivatable:related-action and
  * #GtkActivatable:use-action-appearance properties need to be handled by
- * the implementor. Handling these properties is mostly a matter of installing 
- * the action pointer and boolean flag on your instance, and calling 
- * gtk_activatable_do_set_related_action() and gtk_activatable_reset() at the
- * appropriate times.
- * </para> 
+ * the implementor. Handling these properties is mostly a matter of installing
+ * the action pointer and boolean flag on your instance, and calling
+ * gtk_activatable_do_set_related_action() and
+ * gtk_activatable_sync_action_properties() at the appropriate times.
+ * </para>
  * <example>
  * <title>A class fragment implementing #GtkActivatable</title>
  * <programlisting><![CDATA[
  *
  * enum {
  * ...
- * 
+ *
  * PROP_ACTIVATABLE_RELATED_ACTION,
  * PROP_ACTIVATABLE_USE_ACTION_APPEARANCE
  * }
@@ -61,33 +62,33 @@
  * 
  * ...
  * 
- * static void foo_bar_activatable_interface_init (GtkActivatableIface  *iface);
- * static void foo_bar_activatable_update         (GtkActivatable       *activatable,
- * 						   GtkAction            *action,
- * 						   const gchar          *property_name);
- * static void foo_bar_activatable_reset          (GtkActivatable       *activatable,
- * 						   GtkAction            *action);
+ * static void foo_bar_activatable_interface_init         (GtkActivatableIface  *iface);
+ * static void foo_bar_activatable_update                 (GtkActivatable       *activatable,
+ * 						           GtkAction            *action,
+ * 						           const gchar          *property_name);
+ * static void foo_bar_activatable_sync_action_properties (GtkActivatable       *activatable,
+ * 						           GtkAction            *action);
  * ...
- * 
- * 
+ *
+ *
  * static void
  * foo_bar_class_init (FooBarClass *klass)
  * {
- * 
+ *
  *   ...
- * 
+ *
  *   g_object_class_override_property (gobject_class, PROP_ACTIVATABLE_RELATED_ACTION, "related-action");
  *   g_object_class_override_property (gobject_class, PROP_ACTIVATABLE_USE_ACTION_APPEARANCE, "use-action-appearance");
- * 
+ *
  *   ...
  * }
- * 
- * 
- * static void 
+ *
+ *
+ * static void
  * foo_bar_activatable_interface_init (GtkActivatableIface  *iface)
  * {
  *   iface->update = foo_bar_activatable_update;
- *   iface->reset = foo_bar_activatable_reset;
+ *   iface->sync_action_properties = foo_bar_activatable_sync_action_properties;
  * }
  * 
  * ... Break the reference using gtk_activatable_do_set_related_action()...
@@ -173,7 +174,7 @@
  *     {
  *       priv->use_action_appearance = use_appearance;
  *       
- *       gtk_activatable_reset (GTK_ACTIVATABLE (bar), priv->action);
+ *       gtk_activatable_sync_action_properties (GTK_ACTIVATABLE (bar), priv->action);
  *     }
  * }
  * 
@@ -195,9 +196,9 @@
  * }
  * 
  * ... Selectively reset and update activatable depending on the use-action-appearance property ...
- * static void 
- * gtk_button_activatable_reset (GtkActivatable       *activatable,
- * 		                 GtkAction            *action)
+ * static void
+ * gtk_button_activatable_sync_action_properties (GtkActivatable       *activatable,
+ * 		                                  GtkAction            *action)
  * {
  *   GtkButtonPrivate *priv = GTK_BUTTON_GET_PRIVATE (activatable);
  * 
@@ -227,8 +228,8 @@
  * 
  * static void 
  * foo_bar_activatable_update (GtkActivatable       *activatable,
- * 			    GtkAction            *action,
- * 			    const gchar          *property_name)
+ * 			       GtkAction            *action,
+ * 			       const gchar          *property_name)
  * {
  *   FooBarPrivate *priv = FOO_BAR_GET_PRIVATE (activatable);
  * 
@@ -316,7 +317,8 @@ gtk_activatable_class_init (gpointer g_iface)
    * should be ignored by the #GtkActivatable when this property is %FALSE.
    *
    * <note><para>#GtkActivatable implementors need to handle this property
-   * and call gtk_activatable_reset() on the activatable widget when it changes.</para></note>
+   * and call gtk_activatable_sync_action_properties() on the activatable
+   * widget when it changes.</para></note>
    *
    * Since: 2.16
    */
@@ -348,29 +350,30 @@ gtk_activatable_update (GtkActivatable *activatable,
 }
 
 /**
- * gtk_activatable_reset:
+ * gtk_activatable_sync_action_properties:
  * @activatable: a #GtkActivatable
  * @action: the related #GtkAction or %NULL
  *
- * This is called to update the activatable completely, this is called internally when 
- * the #GtkActivatable::related-action property is set or unset and by the implementing 
- * class when #GtkActivatable::use-action-appearance changes.
+ * This is called to update the activatable completely, this is called
+ * internally when the #GtkActivatable::related-action property is set
+ * or unset and by the implementing class when
+ * #GtkActivatable::use-action-appearance changes.
  *
  * Since: 2.16
  **/
 void
-gtk_activatable_reset (GtkActivatable *activatable,
-		       GtkAction      *action)
+gtk_activatable_sync_action_properties (GtkActivatable *activatable,
+		                        GtkAction      *action)
 {
   GtkActivatableIface *iface;
 
   g_return_if_fail (GTK_IS_ACTIVATABLE (activatable));
 
   iface = GTK_ACTIVATABLE_GET_IFACE (activatable);
-  if (iface->reset)
-    iface->reset (activatable, action);
+  if (iface->sync_action_properties)
+    iface->sync_action_properties (activatable, action);
   else
-    g_critical ("GtkActivatable->reset() unimplemented for type %s", 
+    g_critical ("GtkActivatable->sync_action_properties() unimplemented for type %s", 
 		g_type_name (G_OBJECT_TYPE (activatable)));
 }
 
@@ -450,16 +453,16 @@ gtk_activatable_do_set_related_action (GtkActivatable *activatable,
 
           /*
            * We don't want prev_action to be activated
-           * during the reset() call when syncing "active".
+           * during the sync_action_properties() call when syncing "active".
            */ 
           gtk_action_block_activate (prev_action);
 	}
       
       /* Some applications rely on their proxy UI to be set up
        * before they receive the ::connect-proxy signal, so we
-       * need to call reset() before add_to_proxy_list().
+       * need to call sync_action_properties() before add_to_proxy_list().
        */
-      gtk_activatable_reset (activatable, action);
+      gtk_activatable_sync_action_properties (activatable, action);
 
       if (prev_action)
         {
@@ -470,9 +473,9 @@ gtk_activatable_do_set_related_action (GtkActivatable *activatable,
       if (action)
 	{
 	  g_object_ref (action);
-	  
+
 	  g_signal_connect (G_OBJECT (action), "notify", G_CALLBACK (gtk_activatable_action_notify), activatable);
-	  
+
 	  _gtk_action_add_to_proxy_list (action, GTK_WIDGET (activatable));
 
           g_object_set_data (activatable, "gtk-action", action);
@@ -511,17 +514,19 @@ gtk_activatable_get_related_action (GtkActivatable *activatable)
  * @activatable: a #GtkActivatable
  * @use_appearance: whether to use the actions appearance
  *
- * Sets whether this activatable should reset its layout and appearance 
- * when setting the related action or when the action changes appearance 
+ * Sets whether this activatable should reset its layout and appearance
+ * when setting the related action or when the action changes appearance
  *
- * <note><para>#GtkActivatable implementors need to handle the #GtkActivatable:use-action-appearance
- * property and call gtk_activatable_reset() to update @activatable if needed.</para></note>
+ * <note><para>#GtkActivatable implementors need to handle the
+ * #GtkActivatable:use-action-appearance property and call
+ * gtk_activatable_sync_action_properties() to update @activatable
+ * if needed.</para></note>
  *
  * Since: 2.16
  **/
 void
-gtk_activatable_set_use_action_appearance  (GtkActivatable *activatable,
-					    gboolean        use_appearance)
+gtk_activatable_set_use_action_appearance (GtkActivatable *activatable,
+					   gboolean        use_appearance)
 {
   g_object_set (activatable, "use-action-appearance", use_appearance, NULL);
 }
diff --git a/gtk/gtkactivatable.h b/gtk/gtkactivatable.h
index 75478899e..45d1decd4 100644
--- a/gtk/gtkactivatable.h
+++ b/gtk/gtkactivatable.h
@@ -45,8 +45,8 @@ typedef struct _GtkActivatableIface GtkActivatableIface;
  * @update: Called to update the activatable when its related action's properties change.
  * You must check the #GtkActivatable:use-action-appearance property only apply action
  * properties that are meant to effect the appearance accordingly.
- * @reset: Called to update the activatable completely, this is called internally when 
- * #GtkActivatable::related-action property is set or unset and by the implementor when 
+ * @sync_action_properties: Called to update the activatable completely, this is called internally when
+ * #GtkActivatable::related-action property is set or unset and by the implementor when
  * #GtkActivatable::use-action-appearance changes.<note><para>This method can be called
  * with a %NULL action at times</para></note>
  *
@@ -58,17 +58,17 @@ struct _GtkActivatableIface
   GTypeInterface g_iface;
 
   /* virtual table */
-  void   (* update)  (GtkActivatable *activatable, 
-		      GtkAction      *action, 
-		      const gchar    *property_name);
-  void   (* reset)   (GtkActivatable *activatable, 
-		      GtkAction      *action);
+  void   (* update)                   (GtkActivatable *activatable,
+		                       GtkAction      *action,
+		                       const gchar    *property_name);
+  void   (* sync_action_properties)   (GtkActivatable *activatable,
+		                       GtkAction      *action);
 };
 
 
 GType      gtk_activatable_get_type                   (void) G_GNUC_CONST;
 
-void       gtk_activatable_reset                      (GtkActivatable *activatable,
+void       gtk_activatable_sync_action_properties     (GtkActivatable *activatable,
 						       GtkAction      *action);
 
 void       gtk_activatable_set_related_action         (GtkActivatable *activatable,
diff --git a/gtk/gtkbutton.c b/gtk/gtkbutton.c
index 702bbfa15..d749344a0 100644
--- a/gtk/gtkbutton.c
+++ b/gtk/gtkbutton.c
@@ -148,16 +148,16 @@ static void gtk_button_grab_notify     (GtkWidget             *widget,
 					gboolean               was_grabbed);
 
 
-static void gtk_button_activatable_interface_init (GtkActivatableIface  *iface);
-static void gtk_button_activatable_update         (GtkActivatable       *activatable,
-						   GtkAction            *action,
-						   const gchar          *property_name);
-static void gtk_button_activatable_reset          (GtkActivatable       *activatable,
-						   GtkAction            *action);
-static void gtk_button_set_related_action         (GtkButton            *button, 
-						   GtkAction            *action);
-static void gtk_button_set_use_action_appearance  (GtkButton            *button, 
-						   gboolean              use_appearance);
+static void gtk_button_activatable_interface_init         (GtkActivatableIface  *iface);
+static void gtk_button_update                    (GtkActivatable       *activatable,
+				                  GtkAction            *action,
+			                          const gchar          *property_name);
+static void gtk_button_sync_action_properties    (GtkActivatable       *activatable,
+                                                  GtkAction            *action);
+static void gtk_button_set_related_action        (GtkButton            *button,
+					          GtkAction            *action);
+static void gtk_button_set_use_action_appearance (GtkButton            *button,
+						  gboolean              use_appearance);
 
 static guint button_signals[LAST_SIGNAL] = { 0 };
 
@@ -741,8 +741,8 @@ gtk_button_get_property (GObject         *object,
 static void 
 gtk_button_activatable_interface_init (GtkActivatableIface  *iface)
 {
-  iface->update = gtk_button_activatable_update;
-  iface->reset = gtk_button_activatable_reset;
+  iface->update = gtk_button_update;
+  iface->sync_action_properties = gtk_button_sync_action_properties;
 }
 
 static void
@@ -808,9 +808,9 @@ activatable_update_gicon (GtkButton *button,
 }
 
 static void 
-gtk_button_activatable_update (GtkActivatable       *activatable,
-			       GtkAction            *action,
-			       const gchar          *property_name)
+gtk_button_update (GtkActivatable *activatable,
+		   GtkAction      *action,
+	           const gchar    *property_name)
 {
   GtkButtonPrivate *priv = GTK_BUTTON_GET_PRIVATE (activatable);
 
@@ -837,9 +837,9 @@ gtk_button_activatable_update (GtkActivatable       *activatable,
     activatable_update_icon_name (GTK_BUTTON (activatable), action);
 }
 
-static void 
-gtk_button_activatable_reset (GtkActivatable       *activatable,
-			      GtkAction            *action)
+static void
+gtk_button_sync_action_properties (GtkActivatable *activatable,
+			           GtkAction      *action)
 {
   GtkButtonPrivate *priv = GTK_BUTTON_GET_PRIVATE (activatable);
 
@@ -863,8 +863,8 @@ gtk_button_activatable_reset (GtkActivatable       *activatable,
 }
 
 static void
-gtk_button_set_related_action (GtkButton   *button, 
-			       GtkAction   *action)
+gtk_button_set_related_action (GtkButton *button,
+			       GtkAction *action)
 {
   GtkButtonPrivate *priv = GTK_BUTTON_GET_PRIVATE (button);
 
@@ -877,7 +877,7 @@ gtk_button_set_related_action (GtkButton   *button,
    */
   g_signal_handlers_disconnect_by_func (button, gtk_real_button_clicked, NULL);
   if (action)
-    g_signal_connect_after (button, "clicked", 
+    g_signal_connect_after (button, "clicked",
                             G_CALLBACK (gtk_real_button_clicked), NULL);
 
   gtk_activatable_do_set_related_action (GTK_ACTIVATABLE (button), action);
@@ -886,16 +886,16 @@ gtk_button_set_related_action (GtkButton   *button,
 }
 
 static void
-gtk_button_set_use_action_appearance (GtkButton   *button, 
-				      gboolean     use_appearance)
+gtk_button_set_use_action_appearance (GtkButton *button,
+				      gboolean   use_appearance)
 {
   GtkButtonPrivate *priv = GTK_BUTTON_GET_PRIVATE (button);
 
   if (priv->use_action_appearance != use_appearance)
     {
       priv->use_action_appearance = use_appearance;
-      
-      gtk_activatable_reset (GTK_ACTIVATABLE (button), priv->action);
+
+      gtk_activatable_sync_action_properties (GTK_ACTIVATABLE (button), priv->action);
     }
 }
 
diff --git a/gtk/gtkcheckmenuitem.c b/gtk/gtkcheckmenuitem.c
index 1bfc26b76..8bf097268 100644
--- a/gtk/gtkcheckmenuitem.c
+++ b/gtk/gtkcheckmenuitem.c
@@ -65,10 +65,10 @@ static void gtk_check_menu_item_get_property         (GObject               *obj
 						      GParamSpec            *pspec);
 
 static void gtk_check_menu_item_activatable_interface_init (GtkActivatableIface  *iface);
-static void gtk_check_menu_item_activatable_update         (GtkActivatable       *activatable,
+static void gtk_check_menu_item_update                     (GtkActivatable       *activatable,
 							    GtkAction            *action,
 							    const gchar          *property_name);
-static void gtk_check_menu_item_activatable_reset          (GtkActivatable       *activatable,
+static void gtk_check_menu_item_sync_action_properties     (GtkActivatable       *activatable,
 							    GtkAction            *action);
 
 static GtkActivatableIface *parent_activatable_iface;
@@ -148,14 +148,14 @@ static void
 gtk_check_menu_item_activatable_interface_init (GtkActivatableIface  *iface)
 {
   parent_activatable_iface = g_type_interface_peek_parent (iface);
-  iface->update = gtk_check_menu_item_activatable_update;
-  iface->reset = gtk_check_menu_item_activatable_reset;
+  iface->update = gtk_check_menu_item_update;
+  iface->sync_action_properties = gtk_check_menu_item_sync_action_properties;
 }
 
-static void 
-gtk_check_menu_item_activatable_update (GtkActivatable       *activatable,
-					GtkAction            *action,
-					const gchar          *property_name)
+static void
+gtk_check_menu_item_update (GtkActivatable *activatable,
+			    GtkAction      *action,
+			    const gchar    *property_name)
 {
   GtkCheckMenuItem *check_menu_item;
 
@@ -174,19 +174,19 @@ gtk_check_menu_item_activatable_update (GtkActivatable       *activatable,
     return;
 
   if (strcmp (property_name, "draw-as-radio") == 0)
-    gtk_check_menu_item_set_draw_as_radio (check_menu_item, 
+    gtk_check_menu_item_set_draw_as_radio (check_menu_item,
 					   gtk_toggle_action_get_draw_as_radio (GTK_TOGGLE_ACTION (action)));
 }
 
-static void 
-gtk_check_menu_item_activatable_reset (GtkActivatable       *activatable,
-				       GtkAction            *action)
+static void
+gtk_check_menu_item_sync_action_properties (GtkActivatable *activatable,
+		                            GtkAction      *action)
 {
   GtkCheckMenuItem *check_menu_item;
 
   check_menu_item = GTK_CHECK_MENU_ITEM (activatable);
 
-  parent_activatable_iface->reset (activatable, action);
+  parent_activatable_iface->sync_action_properties (activatable, action);
 
   if (!GTK_IS_TOGGLE_ACTION (action))
     return;
@@ -198,7 +198,7 @@ gtk_check_menu_item_activatable_reset (GtkActivatable       *activatable,
   if (!gtk_activatable_get_use_action_appearance (activatable))
     return;
 
-  gtk_check_menu_item_set_draw_as_radio (check_menu_item, 
+  gtk_check_menu_item_set_draw_as_radio (check_menu_item,
 					 gtk_toggle_action_get_draw_as_radio (GTK_TOGGLE_ACTION (action)));
 }
 
diff --git a/gtk/gtkimagemenuitem.c b/gtk/gtkimagemenuitem.c
index 04cc352ff..8948c9312 100644
--- a/gtk/gtkimagemenuitem.c
+++ b/gtk/gtkimagemenuitem.c
@@ -72,10 +72,10 @@ static void gtk_image_menu_item_screen_changed       (GtkWidget        *widget,
 static void gtk_image_menu_item_recalculate          (GtkImageMenuItem *image_menu_item);
 
 static void gtk_image_menu_item_activatable_interface_init (GtkActivatableIface  *iface);
-static void gtk_image_menu_item_activatable_update         (GtkActivatable       *activatable,
+static void gtk_image_menu_item_update                     (GtkActivatable       *activatable,
 							    GtkAction            *action,
 							    const gchar          *property_name);
-static void gtk_image_menu_item_activatable_reset          (GtkActivatable       *activatable,
+static void gtk_image_menu_item_sync_action_properties     (GtkActivatable       *activatable,
 							    GtkAction            *action);
 
 typedef struct {
@@ -552,8 +552,8 @@ static void
 gtk_image_menu_item_activatable_interface_init (GtkActivatableIface  *iface)
 {
   parent_activatable_iface = g_type_interface_peek_parent (iface);
-  iface->update = gtk_image_menu_item_activatable_update;
-  iface->reset = gtk_image_menu_item_activatable_reset;
+  iface->update = gtk_image_menu_item_update;
+  iface->sync_action_properties = gtk_image_menu_item_sync_action_properties;
 }
 
 static gboolean
@@ -609,10 +609,10 @@ activatable_update_icon_name (GtkImageMenuItem *image_menu_item, GtkAction *acti
     }
 }
 
-static void 
-gtk_image_menu_item_activatable_update (GtkActivatable       *activatable,
-					GtkAction            *action,
-					const gchar          *property_name)
+static void
+gtk_image_menu_item_update (GtkActivatable *activatable,
+			    GtkAction      *action,
+			    const gchar    *property_name)
 {
   GtkImageMenuItem *image_menu_item;
   GtkWidget *image;
@@ -635,8 +635,8 @@ gtk_image_menu_item_activatable_update (GtkActivatable       *activatable,
 }
 
 static void 
-gtk_image_menu_item_activatable_reset (GtkActivatable       *activatable,
-				       GtkAction            *action)
+gtk_image_menu_item_sync_action_properties (GtkActivatable *activatable,
+			                    GtkAction      *action)
 {
   GtkImageMenuItem *image_menu_item;
   GtkWidget *image;
@@ -644,7 +644,7 @@ gtk_image_menu_item_activatable_reset (GtkActivatable       *activatable,
 
   image_menu_item = GTK_IMAGE_MENU_ITEM (activatable);
 
-  parent_activatable_iface->reset (activatable, action);
+  parent_activatable_iface->sync_action_properties (activatable, action);
 
   if (!action)
     return;
diff --git a/gtk/gtkmenuitem.c b/gtk/gtkmenuitem.c
index 03eca0bf5..ced23c099 100644
--- a/gtk/gtkmenuitem.c
+++ b/gtk/gtkmenuitem.c
@@ -134,10 +134,10 @@ static void gtk_menu_item_buildable_add_child      (GtkBuildable        *buildab
 						    const gchar         *type);
 
 static void gtk_menu_item_activatable_interface_init (GtkActivatableIface  *iface);
-static void gtk_menu_item_activatable_update         (GtkActivatable       *activatable,
+static void gtk_menu_item_update                     (GtkActivatable       *activatable,
 						      GtkAction            *action,
 						      const gchar          *property_name);
-static void gtk_menu_item_activatable_reset          (GtkActivatable       *activatable,
+static void gtk_menu_item_sync_action_properties     (GtkActivatable       *activatable,
 						      GtkAction            *action);
 static void gtk_menu_item_set_related_action         (GtkMenuItem          *menu_item, 
 						      GtkAction            *action);
@@ -576,15 +576,15 @@ gtk_menu_item_buildable_add_child (GtkBuildable *buildable,
 static void
 gtk_menu_item_activatable_interface_init (GtkActivatableIface *iface)
 {
-  iface->update = gtk_menu_item_activatable_update;
-  iface->reset = gtk_menu_item_activatable_reset;
+  iface->update = gtk_menu_item_update;
+  iface->sync_action_properties = gtk_menu_item_sync_action_properties;
 }
 
-static void 
+static void
 activatable_update_label (GtkMenuItem *menu_item, GtkAction *action)
 {
   GtkWidget *child = GTK_BIN (menu_item)->child;
-	  
+
   if (GTK_IS_LABEL (child))
     {
       const gchar *label;
@@ -597,9 +597,9 @@ activatable_update_label (GtkMenuItem *menu_item, GtkAction *action)
 gboolean _gtk_menu_is_empty (GtkWidget *menu);
 
 static void
-gtk_menu_item_activatable_update (GtkActivatable *activatable,
-				  GtkAction      *action,
-				  const gchar    *property_name)
+gtk_menu_item_update (GtkActivatable *activatable,
+		      GtkAction      *action,
+		      const gchar    *property_name)
 {
   GtkMenuItem *menu_item = GTK_MENU_ITEM (activatable);
   GtkMenuItemPrivate *priv = GET_PRIVATE (menu_item);
@@ -617,8 +617,8 @@ gtk_menu_item_activatable_update (GtkActivatable *activatable,
 }
 
 static void
-gtk_menu_item_activatable_reset (GtkActivatable *activatable,
-				 GtkAction      *action)
+gtk_menu_item_sync_action_properties (GtkActivatable *activatable,
+				      GtkAction      *action)
 {
   GtkMenuItem *menu_item = GTK_MENU_ITEM (activatable);
   GtkMenuItemPrivate *priv = GET_PRIVATE (menu_item);
@@ -626,7 +626,7 @@ gtk_menu_item_activatable_reset (GtkActivatable *activatable,
   if (!action)
     return;
 
-  _gtk_action_sync_menu_visible (action, GTK_WIDGET (menu_item), 
+  _gtk_action_sync_menu_visible (action, GTK_WIDGET (menu_item),
 				 _gtk_menu_is_empty (gtk_menu_item_get_submenu (menu_item)));
 
   gtk_widget_set_sensitive (GTK_WIDGET (menu_item), gtk_action_is_sensitive (action));
@@ -634,14 +634,14 @@ gtk_menu_item_activatable_reset (GtkActivatable *activatable,
   if (priv->use_action_appearance)
     {
       GtkWidget *label = GTK_BIN (menu_item)->child;
-	  
+
       /* make sure label is a label */
       if (label && !GTK_IS_LABEL (label))
 	{
 	  gtk_container_remove (GTK_CONTAINER (menu_item), label);
 	  label = NULL;
 	}
-	  
+
       if (!label)
 	label = g_object_new (GTK_TYPE_ACCEL_LABEL,
 			      "use-underline", TRUE,
@@ -649,18 +649,18 @@ gtk_menu_item_activatable_reset (GtkActivatable *activatable,
 			      "visible", TRUE,
 			      "parent", menu_item,
 			      NULL);
-      
+
       if (GTK_IS_ACCEL_LABEL (label) && gtk_action_get_accel_path (action))
 	g_object_set (label,
 		      "accel-closure", gtk_action_get_accel_closure (action),
 		      NULL);
-      
+
       activatable_update_label (menu_item, action);
     }
 }
 
 static void
-gtk_menu_item_set_related_action (GtkMenuItem *menu_item, 
+gtk_menu_item_set_related_action (GtkMenuItem *menu_item,
 				  GtkAction   *action)
 {
     GtkMenuItemPrivate *priv = GET_PRIVATE (menu_item);
@@ -691,7 +691,7 @@ gtk_menu_item_set_related_action (GtkMenuItem *menu_item,
 }
 
 static void
-gtk_menu_item_set_use_action_appearance (GtkMenuItem *menu_item, 
+gtk_menu_item_set_use_action_appearance (GtkMenuItem *menu_item,
 					 gboolean     use_appearance)
 {
     GtkMenuItemPrivate *priv = GET_PRIVATE (menu_item);
@@ -699,8 +699,8 @@ gtk_menu_item_set_use_action_appearance (GtkMenuItem *menu_item,
     if (priv->use_action_appearance != use_appearance)
       {
 	priv->use_action_appearance = use_appearance;
-	
-	gtk_activatable_reset (GTK_ACTIVATABLE (menu_item), priv->action);
+
+	gtk_activatable_sync_action_properties (GTK_ACTIVATABLE (menu_item), priv->action);
       }
 }
 
diff --git a/gtk/gtkrecentchooser.c b/gtk/gtkrecentchooser.c
index 9ebe4c9a9..5975353b2 100644
--- a/gtk/gtkrecentchooser.c
+++ b/gtk/gtkrecentchooser.c
@@ -1094,9 +1094,9 @@ _gtk_recent_chooser_selection_changed (GtkRecentChooser *chooser)
 }
 
 void
-_gtk_recent_chooser_activatable_update (GtkActivatable *activatable,
-					GtkAction      *action,
-					const gchar    *property_name)
+_gtk_recent_chooser_update (GtkActivatable *activatable,
+			    GtkAction      *action,
+			    const gchar    *property_name)
 {
   GtkRecentChooser *recent_chooser = GTK_RECENT_CHOOSER (activatable);
   GtkRecentChooser *action_chooser = GTK_RECENT_CHOOSER (action);
@@ -1124,8 +1124,8 @@ _gtk_recent_chooser_activatable_update (GtkActivatable *activatable,
 }
 
 void
-_gtk_recent_chooser_activatable_reset (GtkActivatable *activatable,
-				       GtkAction      *action)
+_gtk_recent_chooser_sync_action_properties (GtkActivatable *activatable,
+			                    GtkAction      *action)
 {
   GtkRecentChooser *recent_chooser = GTK_RECENT_CHOOSER (activatable);
   GtkRecentChooser *action_chooser = GTK_RECENT_CHOOSER (action);
@@ -1148,7 +1148,7 @@ _gtk_recent_chooser_activatable_reset (GtkActivatable *activatable,
 }
 
 void
-_gtk_recent_chooser_set_related_action (GtkRecentChooser *recent_chooser, 
+_gtk_recent_chooser_set_related_action (GtkRecentChooser *recent_chooser,
 					GtkAction        *action)
 {
   GtkAction *prev_action;
@@ -1185,8 +1185,8 @@ _gtk_recent_chooser_set_use_action_appearance (GtkRecentChooser *recent_chooser,
     {
 
       g_object_set_qdata (G_OBJECT (recent_chooser), quark_gtk_use_action_appearance, GINT_TO_POINTER (!use_appearance));
-      
-      gtk_activatable_reset (GTK_ACTIVATABLE (recent_chooser), action);
+ 
+      gtk_activatable_sync_action_properties (GTK_ACTIVATABLE (recent_chooser), action);
     }
 }
 
diff --git a/gtk/gtkrecentchooserdefault.c b/gtk/gtkrecentchooserdefault.c
index d8fecb2fb..9b485f2a3 100644
--- a/gtk/gtkrecentchooserdefault.c
+++ b/gtk/gtkrecentchooserdefault.c
@@ -284,10 +284,10 @@ static gboolean recent_view_query_tooltip_cb      (GtkWidget        *widget,
                                                    gpointer          user_data);
 
 static void gtk_recent_chooser_activatable_iface_init (GtkActivatableIface  *iface);
-static void gtk_recent_chooser_activatable_update     (GtkActivatable       *activatable,
+static void gtk_recent_chooser_update                 (GtkActivatable       *activatable,
 						       GtkAction            *action,
 						       const gchar          *property_name);
-static void gtk_recent_chooser_activatable_reset      (GtkActivatable       *activatable,
+static void gtk_recent_chooser_sync_action_properties (GtkActivatable       *activatable,
 						       GtkAction            *action);
 
 G_DEFINE_TYPE_WITH_CODE (GtkRecentChooserDefault,
@@ -318,12 +318,12 @@ gtk_recent_chooser_iface_init (GtkRecentChooserIface *iface)
   iface->list_filters = gtk_recent_chooser_default_list_filters;
 }
 
-static void 
-gtk_recent_chooser_activatable_iface_init (GtkActivatableIface  *iface)
+static void
+gtk_recent_chooser_activatable_iface_init (GtkActivatableIface *iface)
 
-{  
-  iface->update = gtk_recent_chooser_activatable_update;
-  iface->reset  = gtk_recent_chooser_activatable_reset;
+{
+  iface->update = gtk_recent_chooser_update;
+  iface->sync_action_properties = gtk_recent_chooser_sync_action_properties;
 }
 
 static void
@@ -1948,10 +1948,10 @@ set_recent_manager (GtkRecentChooserDefault *impl,
     }
 }
 
-static void 
-gtk_recent_chooser_activatable_update (GtkActivatable       *activatable,
-				       GtkAction            *action,
-				       const gchar          *property_name)
+static void
+gtk_recent_chooser_update (GtkActivatable *activatable,
+			   GtkAction      *action,
+			   const gchar    *property_name)
 {
   if (strcmp (property_name, "visible") == 0)
     {
@@ -1964,13 +1964,13 @@ gtk_recent_chooser_activatable_update (GtkActivatable       *activatable,
   if (strcmp (property_name, "sensitive") == 0)
     gtk_widget_set_sensitive (GTK_WIDGET (activatable), gtk_action_is_sensitive (action));
 
-  _gtk_recent_chooser_activatable_update (activatable, action, property_name);
+  _gtk_recent_chooser_update (activatable, action, property_name);
 }
 
 
 static void 
-gtk_recent_chooser_activatable_reset (GtkActivatable       *activatable,
-				      GtkAction            *action)
+gtk_recent_chooser_sync_action_properties (GtkActivatable *activatable,
+				           GtkAction      *action)
 {
   if (action)
     {
@@ -1982,7 +1982,7 @@ gtk_recent_chooser_activatable_reset (GtkActivatable       *activatable,
       gtk_widget_set_sensitive (GTK_WIDGET (activatable), gtk_action_is_sensitive (action));
     }
 
-  _gtk_recent_chooser_activatable_reset (activatable, action);
+  _gtk_recent_chooser_sync_action_properties (activatable, action);
 }
 
 
diff --git a/gtk/gtkrecentchoosermenu.c b/gtk/gtkrecentchoosermenu.c
index 67c9b0522..1dd2ac26a 100644
--- a/gtk/gtkrecentchoosermenu.c
+++ b/gtk/gtkrecentchoosermenu.c
@@ -161,10 +161,10 @@ static void     manager_changed_cb (GtkRecentManager *manager,
 				    gpointer          user_data);
 
 static void gtk_recent_chooser_activatable_iface_init (GtkActivatableIface  *iface);
-static void gtk_recent_chooser_activatable_update     (GtkActivatable       *activatable,
+static void gtk_recent_chooser_update                 (GtkActivatable       *activatable,
 						       GtkAction            *action,
 						       const gchar          *property_name);
-static void gtk_recent_chooser_activatable_reset      (GtkActivatable       *activatable,
+static void gtk_recent_chooser_sync_action_properties (GtkActivatable       *activatable,
 						       GtkAction            *action);
 
 G_DEFINE_TYPE_WITH_CODE (GtkRecentChooserMenu,
@@ -193,12 +193,11 @@ gtk_recent_chooser_iface_init (GtkRecentChooserIface *iface)
   iface->list_filters = gtk_recent_chooser_menu_list_filters;
 }
 
-static void 
-gtk_recent_chooser_activatable_iface_init (GtkActivatableIface  *iface)
-
-{  
-  iface->update = gtk_recent_chooser_activatable_update;
-  iface->reset = gtk_recent_chooser_activatable_reset;
+static void
+gtk_recent_chooser_activatable_iface_init (GtkActivatableIface *iface)
+{
+  iface->update = gtk_recent_chooser_update;
+  iface->sync_action_properties = gtk_recent_chooser_sync_action_properties;
 }
 
 static void
@@ -1173,24 +1172,24 @@ gtk_recent_chooser_menu_set_show_tips (GtkRecentChooserMenu *menu,
   gtk_container_foreach (GTK_CONTAINER (menu), foreach_set_shot_tips, menu);
 }
 
-static void 
-gtk_recent_chooser_activatable_update (GtkActivatable       *activatable,
-				       GtkAction            *action,
-				       const gchar          *property_name)
+static void
+gtk_recent_chooser_update (GtkActivatable *activatable,
+			   GtkAction      *action,
+			   const gchar    *property_name)
 {
   if (strcmp (property_name, "sensitive") == 0)
     gtk_widget_set_sensitive (GTK_WIDGET (activatable), gtk_action_is_sensitive (action));
 
-  _gtk_recent_chooser_activatable_update (activatable, action, property_name);
+  _gtk_recent_chooser_update (activatable, action, property_name);
 }
 
-static void 
-gtk_recent_chooser_activatable_reset (GtkActivatable       *activatable,
-				      GtkAction            *action)
+static void
+gtk_recent_chooser_sync_action_properties (GtkActivatable *activatable,
+				           GtkAction      *action)
 {
   gtk_widget_set_sensitive (GTK_WIDGET (activatable), gtk_action_is_sensitive (action));
 
-  _gtk_recent_chooser_activatable_reset (activatable, action);
+  _gtk_recent_chooser_sync_action_properties (activatable, action);
 }
 
 
diff --git a/gtk/gtkrecentchooserprivate.h b/gtk/gtkrecentchooserprivate.h
index 23ea2b497..13ae206ca 100644
--- a/gtk/gtkrecentchooserprivate.h
+++ b/gtk/gtkrecentchooserprivate.h
@@ -38,10 +38,10 @@ GList *           _gtk_recent_chooser_get_items              (GtkRecentChooser
 void              _gtk_recent_chooser_item_activated         (GtkRecentChooser  *chooser);
 void              _gtk_recent_chooser_selection_changed      (GtkRecentChooser  *chooser);
 
-void              _gtk_recent_chooser_activatable_update     (GtkActivatable       *activatable,
+void              _gtk_recent_chooser_update                 (GtkActivatable       *activatable,
 							      GtkAction            *action,
 							      const gchar          *property_name);
-void              _gtk_recent_chooser_activatable_reset      (GtkActivatable       *activatable,
+void              _gtk_recent_chooser_sync_action_properties (GtkActivatable       *activatable,
 							      GtkAction            *action);
 void              _gtk_recent_chooser_set_related_action     (GtkRecentChooser     *recent_chooser, 
 							      GtkAction            *action);
diff --git a/gtk/gtktogglebutton.c b/gtk/gtktogglebutton.c
index 6526f82fe..ddc6678ff 100644
--- a/gtk/gtktogglebutton.c
+++ b/gtk/gtktogglebutton.c
@@ -71,11 +71,11 @@ static void gtk_toggle_button_update_state  (GtkButton            *button);
 
 
 static void gtk_toggle_button_activatable_interface_init (GtkActivatableIface  *iface);
-static void gtk_toggle_button_activatable_update         (GtkActivatable       *activatable,
-							  GtkAction            *action,
-							  const gchar          *property_name);
-static void gtk_toggle_button_activatable_reset          (GtkActivatable       *activatable,
-							  GtkAction            *action);
+static void gtk_toggle_button_update         	     (GtkActivatable       *activatable,
+					 	      GtkAction            *action,
+						      const gchar          *property_name);
+static void gtk_toggle_button_sync_action_properties (GtkActivatable       *activatable,
+						      GtkAction            *action);
 
 static GtkActivatableIface *parent_activatable_iface;
 static guint                toggle_button_signals[LAST_SIGNAL] = { 0 };
@@ -151,19 +151,18 @@ gtk_toggle_button_init (GtkToggleButton *toggle_button)
   GTK_BUTTON (toggle_button)->depress_on_activate = TRUE;
 }
 
-
-static void 
-gtk_toggle_button_activatable_interface_init (GtkActivatableIface  *iface)
+static void
+gtk_toggle_button_activatable_interface_init (GtkActivatableIface *iface)
 {
   parent_activatable_iface = g_type_interface_peek_parent (iface);
-  iface->update = gtk_toggle_button_activatable_update;
-  iface->reset = gtk_toggle_button_activatable_reset;
+  iface->update = gtk_toggle_button_update;
+  iface->sync_action_properties = gtk_toggle_button_sync_action_properties;
 }
 
 static void
-gtk_toggle_button_activatable_update (GtkActivatable   *activatable,
-				      GtkAction        *action,
-				      const gchar      *property_name)
+gtk_toggle_button_update (GtkActivatable *activatable,
+			  GtkAction      *action,
+			  const gchar    *property_name)
 {
   GtkToggleButton *button;
 
@@ -181,12 +180,12 @@ gtk_toggle_button_activatable_update (GtkActivatable   *activatable,
 }
 
 static void
-gtk_toggle_button_activatable_reset (GtkActivatable   *activatable,
-				     GtkAction        *action)
+gtk_toggle_button_sync_action_properties (GtkActivatable *activatable,
+				          GtkAction      *action)
 {
   GtkToggleButton *button;
 
-  parent_activatable_iface->reset (activatable, action);
+  parent_activatable_iface->sync_action_properties (activatable, action);
 
   if (!GTK_IS_TOGGLE_ACTION (action))
     return;
diff --git a/gtk/gtktoggletoolbutton.c b/gtk/gtktoggletoolbutton.c
index 4d1e2a9cf..bb26802fe 100644
--- a/gtk/gtktoggletoolbutton.c
+++ b/gtk/gtktoggletoolbutton.c
@@ -71,10 +71,10 @@ static void menu_item_activated (GtkWidget           *widget,
 
 
 static void gtk_toggle_tool_button_activatable_interface_init (GtkActivatableIface  *iface);
-static void gtk_toggle_tool_button_activatable_update         (GtkActivatable       *activatable,
+static void gtk_toggle_tool_button_update                     (GtkActivatable       *activatable,
 							       GtkAction            *action,
 							       const gchar          *property_name);
-static void gtk_toggle_tool_button_activatable_reset          (GtkActivatable       *activatable,
+static void gtk_toggle_tool_button_sync_action_properties     (GtkActivatable       *activatable,
 							       GtkAction            *action);
 
 static GtkActivatableIface *parent_activatable_iface;
@@ -311,18 +311,18 @@ button_toggled (GtkWidget           *widget,
     }
 }
 
-static void 
-gtk_toggle_tool_button_activatable_interface_init (GtkActivatableIface  *iface)
+static void
+gtk_toggle_tool_button_activatable_interface_init (GtkActivatableIface *iface)
 {
   parent_activatable_iface = g_type_interface_peek_parent (iface);
-  iface->update = gtk_toggle_tool_button_activatable_update;
-  iface->reset = gtk_toggle_tool_button_activatable_reset;
+  iface->update = gtk_toggle_tool_button_update;
+  iface->sync_action_properties = gtk_toggle_tool_button_sync_action_properties;
 }
 
 static void
-gtk_toggle_tool_button_activatable_update (GtkActivatable  *activatable,
-					   GtkAction       *action,
-					   const gchar     *property_name)
+gtk_toggle_tool_button_update (GtkActivatable *activatable,
+			       GtkAction      *action,
+			       const gchar    *property_name)
 {
   GtkToggleToolButton *button;
 
@@ -339,12 +339,12 @@ gtk_toggle_tool_button_activatable_update (GtkActivatable  *activatable,
 }
 
 static void
-gtk_toggle_tool_button_activatable_reset (GtkActivatable  *activatable,
-					  GtkAction       *action)
+gtk_toggle_tool_button_sync_action_properties (GtkActivatable *activatable,
+					       GtkAction      *action)
 {
   GtkToggleToolButton *button;
 
-  parent_activatable_iface->reset (activatable, action);
+  parent_activatable_iface->sync_action_properties (activatable, action);
 
   if (!GTK_IS_TOGGLE_ACTION (action))
     return;
diff --git a/gtk/gtktoolbutton.c b/gtk/gtktoolbutton.c
index 2f7d8f1bf..89231ea3a 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;
diff --git a/gtk/gtktoolitem.c b/gtk/gtktoolitem.c
index 6360c444a..9c00b0dab 100644
--- a/gtk/gtktoolitem.c
+++ b/gtk/gtktoolitem.c
@@ -128,10 +128,10 @@ static gboolean gtk_tool_item_real_set_tooltip (GtkToolItem *tool_item,
 						const gchar *tip_private);
 
 static void gtk_tool_item_activatable_interface_init (GtkActivatableIface  *iface);
-static void gtk_tool_item_activatable_update         (GtkActivatable       *activatable,
+static void gtk_tool_item_update                     (GtkActivatable       *activatable,
 						      GtkAction            *action,
 						      const gchar          *property_name);
-static void gtk_tool_item_activatable_reset          (GtkActivatable       *activatable,
+static void gtk_tool_item_sync_action_properties     (GtkActivatable       *activatable,
 						      GtkAction            *action);
 static void gtk_tool_item_set_related_action         (GtkToolItem          *item, 
 						      GtkAction            *action);
@@ -579,17 +579,17 @@ _gtk_tool_item_create_menu_proxy (GtkToolItem *item)
   return FALSE;
 }
 
-static void 
-gtk_tool_item_activatable_interface_init (GtkActivatableIface  *iface)
+static void
+gtk_tool_item_activatable_interface_init (GtkActivatableIface *iface)
 {
-  iface->update = gtk_tool_item_activatable_update;
-  iface->reset = gtk_tool_item_activatable_reset;
+  iface->update = gtk_tool_item_update;
+  iface->sync_action_properties = gtk_tool_item_sync_action_properties;
 }
 
-static void 
-gtk_tool_item_activatable_update (GtkActivatable       *activatable,
-				  GtkAction            *action,
-				  const gchar          *property_name)
+static void
+gtk_tool_item_update (GtkActivatable *activatable,
+		      GtkAction      *action,
+	     	      const gchar    *property_name)
 {
   if (strcmp (property_name, "visible") == 0)
     {
@@ -614,9 +614,9 @@ gtk_tool_item_activatable_update (GtkActivatable       *activatable,
 				    gtk_action_get_is_important (action));
 }
 
-static void 
-gtk_tool_item_activatable_reset (GtkActivatable       *activatable,
-				 GtkAction            *action)
+static void
+gtk_tool_item_sync_action_properties (GtkActivatable *activatable,
+				      GtkAction      *action)
 {
   if (!action)
     return;
@@ -656,14 +656,14 @@ gtk_tool_item_set_related_action (GtkToolItem *item,
 }
 
 static void
-gtk_tool_item_set_use_action_appearance (GtkToolItem *item, 
+gtk_tool_item_set_use_action_appearance (GtkToolItem *item,
 					 gboolean     use_appearance)
 {
   if (item->priv->use_action_appearance != use_appearance)
     {
       item->priv->use_action_appearance = use_appearance;
-      
-      gtk_activatable_reset (GTK_ACTIVATABLE (item), item->priv->action);
+
+      gtk_activatable_sync_action_properties (GTK_ACTIVATABLE (item), item->priv->action);
     }
 }