AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Use _gtk_action_emit_activate() instead of directly emitting the activate

Browse Source 
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)
This commit is contained in:
Matthias Clasen 2004-04-29 21:36:30 +00:00 committed by Matthias Clasen
parent e28adbacc7
commit 40532b0d45
7 changed files with 58 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ChangeLog
View File

@ -1,3 +1,13 @@
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)
2004-04-29 Matthias Clasen <mclasen@redhat.com>
* tests/testentrycompletion.c (main): Add a missing

10
ChangeLog.pre-2-10
View File

@ -1,3 +1,13 @@
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)
2004-04-29 Matthias Clasen <mclasen@redhat.com>
* tests/testentrycompletion.c (main): Add a missing

10
ChangeLog.pre-2-4
View File

@ -1,3 +1,13 @@
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)
2004-04-29 Matthias Clasen <mclasen@redhat.com>
* tests/testentrycompletion.c (main): Add a missing

10
ChangeLog.pre-2-6
View File

@ -1,3 +1,13 @@
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)
2004-04-29 Matthias Clasen <mclasen@redhat.com>
* tests/testentrycompletion.c (main): Add a missing

10
ChangeLog.pre-2-8
View File

@ -1,3 +1,13 @@
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)
2004-04-29 Matthias Clasen <mclasen@redhat.com>
* tests/testentrycompletion.c (main): Add a missing

8
gtk/gtkaction.c
View File

@ -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);

5
gtk/gtkactiongroup.c
View File

@ -584,7 +584,12 @@ gtk_action_group_add_action_with_accel (GtkActionGroup *action_group,
action_group->private_data->name, "/", name, NULL);
if (accelerator)
{
gtk_accelerator_parse (accelerator, &accel_key, &accel_mods);
if (accel_key == 0)
g_warning ("Unable to parse accelerator '%s' for action '%s'",
accelerator, name);
}
else if (stock_id && gtk_stock_lookup (stock_id, &stock_item))
{
accel_key = stock_item.keyval;