Change FSF Address

[~andy/gtk] / gtk / gtkactiongroup.c

diff --git a/gtk/gtkactiongroup.c b/gtk/gtkactiongroup.c
index d0749f43b74de8bdfd79b791ac07e0c75c979c37..e8504ec2f0997ee9d12a2de3120c51e24f7da6b9 100644 (file)
--- a/gtk/gtkactiongroup.c
+++ b/gtk/gtkactiongroup.c
@@ -14,9 +14,7 @@
  * Library General Public License for more details.
  *
  * You should have received a copy of the GNU Library General Public
- * License along with the Gnome Library; see the file COPYING.LIB.  If not,
- * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
@@ -645,7 +643,7 @@ gtk_action_group_real_get_action (GtkActionGroup *self,
  * 
  * Since: 2.4
  */
-G_CONST_RETURN gchar *
+const gchar *
 gtk_action_group_get_name (GtkActionGroup *action_group)
 {
   GtkActionGroupPrivate *private;
@@ -1003,9 +1001,9 @@ gtk_action_group_list_actions (GtkActionGroup *action_group)
 
 
 /**
- * gtk_action_group_add_actions:
+ * gtk_action_group_add_actions: (skip)
  * @action_group: the action group
- * @entries: an array of action descriptions
+ * @entries: (array length=n_entries): an array of action descriptions
  * @n_entries: the number of entries
  * @user_data: data to pass to the action callbacks
  *
@@ -1054,9 +1052,9 @@ shared_data_unref (gpointer data)
 
 
 /**
- * gtk_action_group_add_actions_full:
+ * gtk_action_group_add_actions_full: (skip)
  * @action_group: the action group
- * @entries: an array of action descriptions
+ * @entries: (array length=n_entries): an array of action descriptions
  * @n_entries: the number of entries
  * @user_data: data to pass to the action callbacks
  * @destroy: destroy notification callback for @user_data
@@ -1134,9 +1132,9 @@ gtk_action_group_add_actions_full (GtkActionGroup       *action_group,
 }
 
 /**
- * gtk_action_group_add_toggle_actions:
+ * gtk_action_group_add_toggle_actions: (skip)
  * @action_group: the action group
- * @entries: an array of toggle action descriptions
+ * @entries: (array length=n_entries): an array of toggle action descriptions
  * @n_entries: the number of entries
  * @user_data: data to pass to the action callbacks
  *
@@ -1162,9 +1160,9 @@ gtk_action_group_add_toggle_actions (GtkActionGroup             *action_group,
 
 
 /**
- * gtk_action_group_add_toggle_actions_full:
+ * gtk_action_group_add_toggle_actions_full: (skip)
  * @action_group: the action group
- * @entries: an array of toggle action descriptions
+ * @entries: (array length=n_entries): an array of toggle action descriptions
  * @n_entries: the number of entries
  * @user_data: data to pass to the action callbacks
  * @destroy: destroy notification callback for @user_data
@@ -1243,9 +1241,9 @@ gtk_action_group_add_toggle_actions_full (GtkActionGroup             *action_gro
 }
 
 /**
- * gtk_action_group_add_radio_actions:
+ * gtk_action_group_add_radio_actions: (skip)
  * @action_group: the action group
- * @entries: an array of radio action descriptions
+ * @entries: (array length=n_entries): an array of radio action descriptions
  * @n_entries: the number of entries
  * @value: the value of the action to activate initially, or -1 if
  *   no action should be activated
@@ -1276,9 +1274,9 @@ gtk_action_group_add_radio_actions (GtkActionGroup            *action_group,
 }
 
 /**
- * gtk_action_group_add_radio_actions_full:
+ * gtk_action_group_add_radio_actions_full: (skip)
  * @action_group: the action group
- * @entries: an array of radio action descriptions
+ * @entries: (array length=n_entries): an array of radio action descriptions
  * @n_entries: the number of entries
  * @value: the value of the action to activate initially, or -1 if
  *   no action should be activated
@@ -1406,7 +1404,8 @@ dgettext_swapped (const gchar *msgid,
 /**
  * gtk_action_group_set_translation_domain:
  * @action_group: a #GtkActionGroup
- * @domain: the translation domain to use for g_dgettext() calls
+ * @domain: (allow-none): the translation domain to use for g_dgettext()
+ * calls, or %NULL to use the domain set with textdomain()
  * 
  * Sets the translation domain and uses g_dgettext() for translating the 
  * @label and @tooltip of #GtkActionEntry<!-- -->s added by 
@@ -1442,7 +1441,7 @@ gtk_action_group_set_translation_domain (GtkActionGroup *action_group,
  *
  * Since: 2.6
  **/
-G_CONST_RETURN gchar *
+const gchar *
 gtk_action_group_translate_string (GtkActionGroup *action_group,
                                   const gchar    *string)
 {