diff --git a/src/terminal/actions/clipboard.c b/src/terminal/actions/clipboard.c
index 9b4c273..20a0d6d 100644
--- a/src/terminal/actions/clipboard.c
+++ b/src/terminal/actions/clipboard.c
@@ -34,7 +34,7 @@
 
 /*--[ Implement ]------------------------------------------------------------------------------------*/
 
- int fire_copy_accelerator(const V3270_ACTION * action, GtkWidget *widget) {
+ int fire_copy_accelerator(GtkWidget *widget, const V3270_ACTION * action) {
 
 	debug("%s",__FUNCTION__);
 
@@ -47,7 +47,7 @@
 	return EINVAL;
  }
 
- int fire_paste_accelerator(const V3270_ACTION * action, GtkWidget *widget) {
+ int fire_paste_accelerator(GtkWidget *widget, const V3270_ACTION * action) {
 
 
 	switch((int) action->flags)
diff --git a/src/terminal/actions/private.h b/src/terminal/actions/private.h
index 59abdd6..1e1d922 100644
--- a/src/terminal/actions/private.h
+++ b/src/terminal/actions/private.h
@@ -32,8 +32,8 @@
  #include <v3270/actions.h>
  #include <internals.h>
 
- G_GNUC_INTERNAL int fire_copy_accelerator(const V3270_ACTION *action, GtkWidget *widget);
- G_GNUC_INTERNAL int fire_paste_accelerator(const V3270_ACTION *action, GtkWidget *widget);
- G_GNUC_INTERNAL int fire_zoom_action(const V3270_ACTION *action, GtkWidget *widget);
- G_GNUC_INTERNAL int fire_keypad_action(const V3270_ACTION *action, GtkWidget *widget);
+ G_GNUC_INTERNAL int fire_copy_accelerator(GtkWidget *widget, const V3270_ACTION *action);
+ G_GNUC_INTERNAL int fire_paste_accelerator(GtkWidget *widget, const V3270_ACTION *action);
+ G_GNUC_INTERNAL int fire_zoom_action(GtkWidget *widget, const V3270_ACTION *action);
+ G_GNUC_INTERNAL int fire_keypad_action(GtkWidget *widget, const V3270_ACTION *action);
 
diff --git a/src/terminal/actions/zoom.c b/src/terminal/actions/zoom.c
index 8cba2b5..9e2e77f 100644
--- a/src/terminal/actions/zoom.c
+++ b/src/terminal/actions/zoom.c
@@ -34,7 +34,7 @@
 
 /*--[ Implement ]------------------------------------------------------------------------------------*/
 
- int fire_zoom_action(const V3270_ACTION *action, GtkWidget *widget) {
+ int fire_zoom_action(GtkWidget *widget, const V3270_ACTION *action) {
 
  	debug("%s",__FUNCTION__);
 
diff --git a/src/terminal/keyboard/accelerator.c b/src/terminal/keyboard/accelerator.c
index 10fc154..edddde1 100644
--- a/src/terminal/keyboard/accelerator.c
+++ b/src/terminal/keyboard/accelerator.c
@@ -71,7 +71,7 @@
 
  void v3270_accelerator_activate(const V3270Accelerator * acel, GtkWidget *terminal)
  {
- 	int rc = ((int (*)(gconstpointer, GtkWidget *)) acel->activate)(acel->arg,terminal);
+ 	int rc = ((int (*)(GtkWidget *, gconstpointer)) acel->activate)(terminal, acel->arg);
 
  	if(rc)
 		gdk_display_beep(gdk_display_get_default());
diff --git a/src/terminal/keyboard/init.c b/src/terminal/keyboard/init.c
index 8ff5530..0ce16b7 100644
--- a/src/terminal/keyboard/init.c
+++ b/src/terminal/keyboard/init.c
@@ -46,7 +46,7 @@
 
 /*--[ Implement ]------------------------------------------------------------------------------------*/
 
- static int fire_lib3270_action(const LIB3270_ACTION * action, GtkWidget *widget)
+ static int fire_lib3270_action(GtkWidget *widget, const LIB3270_ACTION * action)
  {
  	int rc = EPERM;
 
@@ -62,13 +62,13 @@
 
  }
 
- static int fire_lib3270_toggle(const LIB3270_TOGGLE * action, GtkWidget *widget)
+ static int fire_lib3270_toggle(GtkWidget *widget, const LIB3270_TOGGLE * action)
  {
     debug("%s(%s)",__FUNCTION__,action->name);
  	return lib3270_toggle(v3270_get_session(widget),action->id);
  }
 
- int fire_keypad_action(const struct _v3270_action * action, GtkWidget *widget)
+ int fire_keypad_action(GtkWidget *widget, const struct _v3270_action * action)
  {
  	int rc = 0;
  	debug("%s",__FUNCTION__);
--
libgit2 0.21.2