diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2004-04-29 21:36:30 +0000 |
|---|---|---|
| committer | Matthias Clasen <matthiasc@src.gnome.org> | 2004-04-29 21:36:30 +0000 |
| commit | 40532b0d45e4d5bd72f039725acbfcee079582f2 (patch) | |
| tree | 53a05f45808371c21022b778dc2ee004d32960e6 /gtk/gtkaction.c | |
| parent | e28adbacc73f8dfff98bce45821374e31b7a0f8e (diff) | |
| download | gtk+-40532b0d45e4d5bd72f039725acbfcee079582f2.tar.gz | |
Use _gtk_action_emit_activate() instead of directly emitting the activate
2004-04-29 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkaction.c (closure_accel_activate): Use
_gtk_action_emit_activate() instead of directly
emitting the activate signal. (#141429, Jody Goldberg)
* gtk/gtkactiongroup.c (gtk_action_group_add_action_with_accel):
Warn people when the accelerator can not be
parsed. (#141429, Jody Goldberg)
Diffstat (limited to 'gtk/gtkaction.c')
| -rw-r--r-- | gtk/gtkaction.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/gtk/gtkaction.c b/gtk/gtkaction.c index 089b2a27ed..5ab6e57890 100644 --- a/gtk/gtkaction.c +++ b/gtk/gtkaction.c @@ -315,6 +315,8 @@ gtk_action_init (GtkAction *action) action->private_data->short_label_set = FALSE; action->private_data->accel_count = 0; + action->private_data->accel_group = NULL; + action->private_data->accel_quark = 0; action->private_data->accel_closure = g_closure_new_object (sizeof (GClosure), G_OBJECT (action)); g_closure_set_marshal (action->private_data->accel_closure, @@ -322,10 +324,6 @@ gtk_action_init (GtkAction *action) g_closure_ref (action->private_data->accel_closure); g_closure_sink (action->private_data->accel_closure); - action->private_data->accel_quark = 0; - action->private_data->accel_count = 0; - action->private_data->accel_group = NULL; - action->private_data->action_group = NULL; action->private_data->proxies = NULL; @@ -1300,7 +1298,7 @@ closure_accel_activate (GClosure *closure, gpointer marshal_data) { if (gtk_action_is_sensitive (GTK_ACTION (closure->data))) - g_signal_emit (closure->data, action_signals[ACTIVATE], 0); + _gtk_action_emit_activate (GTK_ACTION (closure->data)); /* we handled the accelerator */ g_value_set_boolean (return_value, TRUE); |