projects
/
platform
/
upstream
/
glib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[kdbus] Update kdbus interface header (commit: b620b72c9127) 14/10/16
[platform/upstream/glib.git]
/
gio
/
gactiongroup.c
diff --git
a/gio/gactiongroup.c
b/gio/gactiongroup.c
index
5fe1dc7
..
c608a4a
100644
(file)
--- a/
gio/gactiongroup.c
+++ b/
gio/gactiongroup.c
@@
-12,9
+12,7
@@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
+ * Public License along with this library; if not, see <http://www.gnu.org/licenses/>.
*
* Authors: Ryan Lortie <desrt@desrt.ca>
*/
*
* Authors: Ryan Lortie <desrt@desrt.ca>
*/
@@
-66,7
+64,7
@@
* with actions. 'Internal' APIs (ie: ones meant only to be accessed by
* the action group implementation) are found on subclasses. This is
* why you will find - for example - g_action_group_get_action_enabled()
* with actions. 'Internal' APIs (ie: ones meant only to be accessed by
* the action group implementation) are found on subclasses. This is
* why you will find - for example - g_action_group_get_action_enabled()
- * but not an equivalent
<function>set()</function>
call.
+ * but not an equivalent
set()
call.
*
* Signals are emitted on the action group in response to state changes
* on individual actions.
*
* Signals are emitted on the action group in response to state changes
* on individual actions.
@@
-391,7
+389,7
@@
g_action_group_has_action (GActionGroup *action_group,
* possible for an action to be removed and for a new action to be added
* with the same name but a different parameter type.
*
* possible for an action to be removed and for a new action to be added
* with the same name but a different parameter type.
*
- * Return
value
: the parameter type
+ * Return
s: (nullable)
: the parameter type
*
* Since: 2.28
**/
*
* Since: 2.28
**/
@@
-427,7
+425,8
@@
g_action_group_get_action_parameter_type (GActionGroup *action_group,
* possible for an action to be removed and for a new action to be added
* with the same name but a different state type.
*
* possible for an action to be removed and for a new action to be added
* with the same name but a different state type.
*
- * Returns: (transfer full): the state type, if the action is stateful
+ * Returns: (nullable) (transfer full): the state type, if the action
+ * is stateful
*
* Since: 2.28
**/
*
* Since: 2.28
**/
@@
-465,7
+464,7
@@
g_action_group_get_action_state_type (GActionGroup *action_group,
* The return value (if non-%NULL) should be freed with
* g_variant_unref() when it is no longer required.
*
* The return value (if non-%NULL) should be freed with
* g_variant_unref() when it is no longer required.
*
- * Return
value:
(transfer full): the state range hint
+ * Return
s: (nullable)
(transfer full): the state range hint
*
* Since: 2.28
**/
*
* Since: 2.28
**/
@@
-489,7
+488,7
@@
g_action_group_get_action_state_hint (GActionGroup *action_group,
* An action must be enabled in order to be activated or in order to
* have its state changed from outside callers.
*
* An action must be enabled in order to be activated or in order to
* have its state changed from outside callers.
*
- * Return
value
: whether or not the action is currently enabled
+ * Return
s
: whether or not the action is currently enabled
*
* Since: 2.28
**/
*
* Since: 2.28
**/
@@
-517,7
+516,7
@@
g_action_group_get_action_enabled (GActionGroup *action_group,
* The return value (if non-%NULL) should be freed with
* g_variant_unref() when it is no longer required.
*
* The return value (if non-%NULL) should be freed with
* g_variant_unref() when it is no longer required.
*
- * Return
value: (allow-non
e): the current state of the action
+ * Return
s: (nullabl
e): the current state of the action
*
* Since: 2.28
**/
*
* Since: 2.28
**/