Download as
Browse Code »

Commit 104cd184eb3fe0e2156aa4416c8321848a24ef8a

Authored by Perry Werneck
1 parent e99275ec
Exists in master and in 1 other branch develop

Returning to the original parameter method for keyboard actions.

Showing 5 changed files with 11 additions and 11 deletions   Show diff stats
src/terminal/actions/clipboard.c
  Diff comments   View file @104cd18
... ... @@ -34,7 +34,7 @@
34 34  
35 35 /*--[ Implement ]------------------------------------------------------------------------------------*/
36 36  
37   - int fire_copy_accelerator(const V3270_ACTION * action, GtkWidget *widget) {
  37 + int fire_copy_accelerator(GtkWidget *widget, const V3270_ACTION * action) {
38 38  
39 39 debug("%s",__FUNCTION__);
40 40  
... ... @@ -47,7 +47,7 @@
47 47 return EINVAL;
48 48 }
49 49  
50   - int fire_paste_accelerator(const V3270_ACTION * action, GtkWidget *widget) {
  50 + int fire_paste_accelerator(GtkWidget *widget, const V3270_ACTION * action) {
51 51  
52 52  
53 53 switch((int) action->flags)
... ...
src/terminal/actions/private.h
  Diff comments   View file @104cd18
... ... @@ -32,8 +32,8 @@
32 32 #include <v3270/actions.h>
33 33 #include <internals.h>
34 34  
35   - G_GNUC_INTERNAL int fire_copy_accelerator(const V3270_ACTION *action, GtkWidget *widget);
36   - G_GNUC_INTERNAL int fire_paste_accelerator(const V3270_ACTION *action, GtkWidget *widget);
37   - G_GNUC_INTERNAL int fire_zoom_action(const V3270_ACTION *action, GtkWidget *widget);
38   - G_GNUC_INTERNAL int fire_keypad_action(const V3270_ACTION *action, GtkWidget *widget);
  35 + G_GNUC_INTERNAL int fire_copy_accelerator(GtkWidget *widget, const V3270_ACTION *action);
  36 + G_GNUC_INTERNAL int fire_paste_accelerator(GtkWidget *widget, const V3270_ACTION *action);
  37 + G_GNUC_INTERNAL int fire_zoom_action(GtkWidget *widget, const V3270_ACTION *action);
  38 + G_GNUC_INTERNAL int fire_keypad_action(GtkWidget *widget, const V3270_ACTION *action);
39 39  
... ...
src/terminal/actions/zoom.c
  Diff comments   View file @104cd18
... ... @@ -34,7 +34,7 @@
34 34  
35 35 /*--[ Implement ]------------------------------------------------------------------------------------*/
36 36  
37   - int fire_zoom_action(const V3270_ACTION *action, GtkWidget *widget) {
  37 + int fire_zoom_action(GtkWidget *widget, const V3270_ACTION *action) {
38 38  
39 39 debug("%s",__FUNCTION__);
40 40  
... ...
src/terminal/keyboard/accelerator.c
  Diff comments   View file @104cd18
... ... @@ -71,7 +71,7 @@
71 71  
72 72 void v3270_accelerator_activate(const V3270Accelerator * acel, GtkWidget *terminal)
73 73 {
74   - int rc = ((int (*)(gconstpointer, GtkWidget *)) acel->activate)(acel->arg,terminal);
  74 + int rc = ((int (*)(GtkWidget *, gconstpointer)) acel->activate)(terminal, acel->arg);
75 75  
76 76 if(rc)
77 77 gdk_display_beep(gdk_display_get_default());
... ...
src/terminal/keyboard/init.c
  Diff comments   View file @104cd18
... ... @@ -46,7 +46,7 @@
46 46  
47 47 /*--[ Implement ]------------------------------------------------------------------------------------*/
48 48  
49   - static int fire_lib3270_action(const LIB3270_ACTION * action, GtkWidget *widget)
  49 + static int fire_lib3270_action(GtkWidget *widget, const LIB3270_ACTION * action)
50 50 {
51 51 int rc = EPERM;
52 52  
... ... @@ -62,13 +62,13 @@
62 62  
63 63 }
64 64  
65   - static int fire_lib3270_toggle(const LIB3270_TOGGLE * action, GtkWidget *widget)
  65 + static int fire_lib3270_toggle(GtkWidget *widget, const LIB3270_TOGGLE * action)
66 66 {
67 67 debug("%s(%s)",__FUNCTION__,action->name);
68 68 return lib3270_toggle(v3270_get_session(widget),action->id);
69 69 }
70 70  
71   - int fire_keypad_action(const struct _v3270_action * action, GtkWidget *widget)
  71 + int fire_keypad_action(GtkWidget *widget, const struct _v3270_action * action)
72 72 {
73 73 int rc = 0;
74 74 debug("%s",__FUNCTION__);
... ...