diff options
| author | Matthias Clasen <matthiasc@src.gnome.org> | 2009-02-03 01:55:28 +0000 |
|---|---|---|
| committer | Matthias Clasen <matthiasc@src.gnome.org> | 2009-02-03 01:55:28 +0000 |
| commit | ebb342a24643ca15935ab08ec500283b936b27a4 (patch) | |
| tree | 9966cef2c015e47df76c564e5ce0c4db5c529a75 /gtk | |
| parent | b72e4f7f5e820e4d8a88db72beed491bd8378625 (diff) | |
| download | gtk+-ebb342a24643ca15935ab08ec500283b936b27a4.tar.gz | |
2.15.3GTK_2_15_3
svn path=/trunk/; revision=22273
Diffstat (limited to 'gtk')
| -rw-r--r-- | gtk/gtkaction.c | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/gtk/gtkaction.c b/gtk/gtkaction.c index 9ce778eaef..37f6e92548 100644 --- a/gtk/gtkaction.c +++ b/gtk/gtkaction.c @@ -759,6 +759,7 @@ gtk_action_activate (GtkAction *action) /** * gtk_action_block_activate: + * @action: a #GtkAction * * Disable activation signals from the action * @@ -766,6 +767,8 @@ gtk_action_activate (GtkAction *action) * #GtkActivatable widget could result in calling gtk_action_activate(), * this is a convenience function to avoid recursing in those * cases (updating toggle state for instance). + * + * Since: 2.16 */ void gtk_action_block_activate (GtkAction *action) @@ -777,8 +780,11 @@ gtk_action_block_activate (GtkAction *action) /** * gtk_action_unblock_activate: + * @action: a #GtkAction * * Reenable activation signals from the action + * + * Since: 2.16 */ void gtk_action_unblock_activate (GtkAction *action) @@ -1252,7 +1258,7 @@ gtk_action_get_label (GtkAction *action) /** * gtk_action_set_short_label: * @action: a #GtkAction - * @label: the label text to set + * @short_label: the label text to set * * Sets a shorter label text on @action. * @@ -1260,14 +1266,14 @@ gtk_action_get_label (GtkAction *action) */ void gtk_action_set_short_label (GtkAction *action, - const gchar *label) + const gchar *short_label) { gchar *tmp; g_return_if_fail (GTK_IS_ACTION (action)); tmp = action->private_data->short_label; - action->private_data->short_label = g_strdup (label); + action->private_data->short_label = g_strdup (short_label); g_free (tmp); action->private_data->short_label_set = (action->private_data->short_label != NULL); /* if short_label is unset, then use the value of label */ @@ -1431,7 +1437,7 @@ gtk_action_get_tooltip (GtkAction *action) /** * gtk_action_set_stock_id: * @action: a #GtkAction - * @tooltip: the tooltip text + * @stock_id: the stock id * * Sets the stock id on @action * @@ -1489,7 +1495,7 @@ gtk_action_get_stock_id (GtkAction *action) /** * gtk_action_set_icon_name: * @action: a #GtkAction - * @tooltip: the icon name to set + * @icon_name: the icon name to set * * Sets the icon name on @action * |