Revert "Merge remote-tracking branch 'origin/sandbox/mniesluchow/upstream_2_16' into...

[platform/upstream/atk.git] / atk / atkaction.c

diff --git a/atk/atkaction.c b/atk/atkaction.c
index bc12cb2..089a2fd 100755 (executable)
--- a/atk/atkaction.c
+++ b/atk/atkaction.c
@@ -17,8 +17,6 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#include "config.h"
-
 #include "atkaction.h"
 
 /**
@@ -126,8 +124,8 @@ atk_action_get_n_actions  (AtkAction *obj)
  *
  * Returns a description of the specified action of the object.
  *
- * Returns: (nullable): a description string, or %NULL if @action does
- * not implement this interface.
+ * Returns: a description string, or %NULL if @action does not
+ * implement this interface.
  **/
 const gchar*
 atk_action_get_description (AtkAction *obj,
@@ -165,8 +163,8 @@ atk_action_get_description (AtkAction *obj,
  * i.e. the result of some actions via atk_action_do_action() may be
  * NIL.
  *
- * Returns: (nullable): a name string, or %NULL if @action does not
- * implement this interface.
+ * Returns: a name string, or %NULL if @action does not implement this
+ * interface.
  **/
 const gchar*
 atk_action_get_name (AtkAction *obj,
@@ -191,8 +189,8 @@ atk_action_get_name (AtkAction *obj,
  *
  * Returns the localized name of the specified action of the object.
  *
- * Returns: (nullable): a name string, or %NULL if @action does not
- * implement this interface.
+ * Returns: a name string, or %NULL if @action does not implement this
+ * interface.
  **/
 const gchar*
 atk_action_get_localized_name (AtkAction *obj,
@@ -238,8 +236,8 @@ atk_action_get_localized_name (AtkAction *obj,
  * for the German locale. If, hypothetically, this menu item lacked a mnemonic,
  * it would be represented by ";;Ctrl+N" and ";;Strg+N" respectively.
  *
- * Returns: (nullable): the keybinding which can be used to activate
- * this action, or %NULL if there is no keybinding for this action.
+ * Returns: the keybinding which can be used to activate this action,
+ * or %NULL if there is no keybinding for this action.
  *
  **/
 const gchar*