Commit eea9f2ab28e3b5f3ad9f827e1edd394a2a3d56f6
1 parent
a4003c82
Exists in
master
and in
1 other branch
Still fixing Arch builds.
Showing
4 changed files
with
16 additions
and
6 deletions
Show diff stats
src/terminal/widget.c
| ... | ... | @@ -829,7 +829,7 @@ void v3270_signal_emit(gpointer instance, enum V3270_SIGNAL signal_id, ...) |
| 829 | 829 | va_list var_args; |
| 830 | 830 | |
| 831 | 831 | va_start (var_args, signal_id); |
| 832 | - g_signal_emit_valist(instance, (guint) signal_id, 0, var_args); | |
| 832 | + g_signal_emit_valist(instance, v3270_widget_signal[signal_id], 0, var_args); | |
| 833 | 833 | va_end (var_args); |
| 834 | 834 | |
| 835 | 835 | } | ... | ... |
src/trace/exec.c
| ... | ... | @@ -317,7 +317,7 @@ |
| 317 | 317 | if(*args) |
| 318 | 318 | *(args++) = 0; |
| 319 | 319 | |
| 320 | - g_signal_emit(GTK_WIDGET(t), v3270_trace_signal[V3270_TRACE_SIGNAL_COMMAND], 0, cmdline, args, &handled); | |
| 320 | + v3270_trace_signal_emit(GTK_WIDGET(t), V3270_TRACE_SIGNAL_COMMAND, cmdline, args, &handled); | |
| 321 | 321 | |
| 322 | 322 | if(handled) |
| 323 | 323 | return 0; | ... | ... |
src/trace/private.h
| ... | ... | @@ -47,19 +47,18 @@ |
| 47 | 47 | #include <lib3270/trace.h> |
| 48 | 48 | |
| 49 | 49 | /// @brief V3270 Trace Signal list |
| 50 | - enum | |
| 50 | + enum V3270_TRACE_SIGNAL | |
| 51 | 51 | { |
| 52 | 52 | V3270_TRACE_SIGNAL_COMMAND, |
| 53 | 53 | |
| 54 | 54 | V3270_TRACE_SIGNAL_LAST |
| 55 | 55 | }; |
| 56 | 56 | |
| 57 | - G_GNUC_INTERNAL guint v3270_trace_signal[V3270_TRACE_SIGNAL_LAST]; | |
| 58 | - | |
| 59 | 57 | G_GNUC_INTERNAL H3270 * v3270_trace_get_session(GtkWidget *widget); |
| 60 | 58 | G_GNUC_INTERNAL GtkWidget * v3270_trace_get_terminal(GtkWidget *widget); |
| 61 | 59 | G_GNUC_INTERNAL GtkTextBuffer * v3270_trace_get_text_buffer(GtkWidget *widget); |
| 62 | 60 | G_GNUC_INTERNAL GtkScrolledWindow * v3270_trace_get_scrolled_window(GtkWidget *widget); |
| 61 | + G_GNUC_INTERNAL void v3270_trace_signal_emit(gpointer instance, enum V3270_TRACE_SIGNAL signal_id, ...); | |
| 63 | 62 | |
| 64 | 63 | G_BEGIN_DECLS |
| 65 | 64 | ... | ... |
src/trace/trace.c
| ... | ... | @@ -91,7 +91,7 @@ |
| 91 | 91 | |
| 92 | 92 | }; |
| 93 | 93 | |
| 94 | - guint v3270_trace_signal[V3270_TRACE_SIGNAL_LAST] = { 0 }; | |
| 94 | + static guint v3270_trace_signal[V3270_TRACE_SIGNAL_LAST] = { 0 }; | |
| 95 | 95 | |
| 96 | 96 | G_DEFINE_TYPE(V3270Trace, V3270Trace, GTK_TYPE_BOX); |
| 97 | 97 | |
| ... | ... | @@ -535,4 +535,15 @@ |
| 535 | 535 | return GTK_V3270_TRACE(widget)->scroll; |
| 536 | 536 | } |
| 537 | 537 | |
| 538 | + void v3270_trace_signal_emit(gpointer instance, enum V3270_TRACE_SIGNAL signal_id, ...) | |
| 539 | + { | |
| 540 | + | |
| 541 | + va_list var_args; | |
| 542 | + | |
| 543 | + va_start (var_args, signal_id); | |
| 544 | + g_signal_emit_valist(instance, (guint) v3270_trace_signal[signal_id], 0, var_args); | |
| 545 | + va_end (var_args); | |
| 546 | + | |
| 547 | + } | |
| 548 | + | |
| 538 | 549 | ... | ... |