projects
/
platform
/
upstream
/
glib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
gsocket: Set SO_NOSIGPIPE on sockets on Darwin
[platform/upstream/glib.git]
/
gio
/
gsimpleaction.c
diff --git
a/gio/gsimpleaction.c
b/gio/gsimpleaction.c
index
819f50b
..
610e2fa
100644
(file)
--- a/
gio/gsimpleaction.c
+++ b/
gio/gsimpleaction.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>
*/
@@
-210,7
+208,7
@@
g_simple_action_activate (GAction *action,
* for handling activation.
*/
if (g_signal_has_handler_pending (action, g_simple_action_signals[SIGNAL_ACTIVATE], 0, TRUE))
* for handling activation.
*/
if (g_signal_has_handler_pending (action, g_simple_action_signals[SIGNAL_ACTIVATE], 0, TRUE))
- g_signal_emit (action, g_simple_action_signals[SIGNAL_
CHANGE_ST
ATE], 0, parameter);
+ g_signal_emit (action, g_simple_action_signals[SIGNAL_
ACTIV
ATE], 0, parameter);
/* If not, do some reasonable defaults for stateful actions. */
else if (simple->state)
/* If not, do some reasonable defaults for stateful actions. */
else if (simple->state)
@@
-396,13
+394,12
@@
g_simple_action_class_init (GSimpleActionClass *class)
*
* If no handler is connected to this signal then the default
* behaviour is to call g_simple_action_set_state() to set the state
*
* If no handler is connected to this signal then the default
* behaviour is to call g_simple_action_set_state() to set the state
- * to the requested value.
If you connect a signal handler then no
- * default action is taken.
If the state should change then you must
+ * to the requested value. If you connect a signal handler then no
+ * default action is taken. If the state should change then you must
* call g_simple_action_set_state() from the handler.
*
* call g_simple_action_set_state() from the handler.
*
- * <example>
- * <title>Example 'change-state' handler</title>
- * <programlisting>
+ * An example of a 'change-state' handler:
+ * |[<!-- language="C" -->
* static void
* change_volume_state (GSimpleAction *action,
* GVariant *value,
* static void
* change_volume_state (GSimpleAction *action,
* GVariant *value,
@@
-416,11
+413,10
@@
g_simple_action_class_init (GSimpleActionClass *class)
* if (0 <= requested && requested <= 10)
* g_simple_action_set_state (action, value);
* }
* if (0 <= requested && requested <= 10)
* g_simple_action_set_state (action, value);
* }
- * </programlisting>
- * </example>
+ * ]|
*
*
- * The handler need not set the state to the requested value.
It
- * could set it to any value at all, or take some other action.
+ * The handler need not set the state to the requested value.
+ *
It
could set it to any value at all, or take some other action.
*
* Since: 2.30
*/
*
* Since: 2.30
*/
@@
-436,7
+432,7
@@
g_simple_action_class_init (GSimpleActionClass *class)
/**
* GSimpleAction:name:
*
/**
* GSimpleAction:name:
*
- * The name of the action.
This is mostly meaningful for identifying
+ * The name of the action. This is mostly meaningful for identifying
* the action once it has been added to a #GSimpleActionGroup.
*
* Since: 2.28
* the action once it has been added to a #GSimpleActionGroup.
*
* Since: 2.28