Download as
Browse Code »

Commit 7e5037ca32442bb3f75ae000bd6c9c2aa841165c

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

Updating toggle id type for latest lib3270 code.

Showing 8 changed files with 14 additions and 14 deletions   Show diff stats
src/dialogs/togglebutton.c
  Diff comments   View file @7e5037c
@@ -43,9 +43,9 @@ @@ -43,9 +43,9 @@
43 { 43 {
44 GtkToggleButton parent; 44 GtkToggleButton parent;
45 45
46 - H3270 * hSession;  
47 - LIB3270_TOGGLE id;  
48 - const void * hListener; 46 + H3270 * hSession;
  47 + LIB3270_TOGGLE_ID id;
  48 + const void * hListener;
49 49
50 }; 50 };
51 51
@@ -98,13 +98,13 @@ @@ -98,13 +98,13 @@
98 { 98 {
99 } 99 }
100 100
101 - static void toggle_listener(H3270 G_GNUC_UNUSED(*hSession), LIB3270_TOGGLE toggle, char state, void *button) 101 + static void toggle_listener(H3270 G_GNUC_UNUSED(*hSession), LIB3270_TOGGLE_ID toggle, char state, void *button)
102 { 102 {
103 g_message("%s is %s\n", lib3270_get_toggle_name(toggle),(state ? "ON" : "OFF")); 103 g_message("%s is %s\n", lib3270_get_toggle_name(toggle),(state ? "ON" : "OFF"));
104 gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(button),(state == 0 ? FALSE : TRUE)); 104 gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(button),(state == 0 ? FALSE : TRUE));
105 } 105 }
106 106
107 - GtkWidget * v3270_toggle_button_new(GtkWidget *terminal, LIB3270_TOGGLE toggle) 107 + GtkWidget * v3270_toggle_button_new(GtkWidget *terminal, LIB3270_TOGGLE_ID toggle)
108 { 108 {
109 g_return_val_if_fail(GTK_IS_V3270(terminal),NULL); 109 g_return_val_if_fail(GTK_IS_V3270(terminal),NULL);
110 110
src/include/internals.h
  Diff comments   View file @7e5037c
@@ -122,7 +122,7 @@ @@ -122,7 +122,7 @@
122 typedef struct _V3270ToggleButton V3270ToggleButton; 122 typedef struct _V3270ToggleButton V3270ToggleButton;
123 typedef struct _V3270ToggleButtonClass V3270ToggleButtonClass; 123 typedef struct _V3270ToggleButtonClass V3270ToggleButtonClass;
124 124
125 - G_GNUC_INTERNAL GtkWidget * v3270_toggle_button_new(GtkWidget *widget, LIB3270_TOGGLE toggle); 125 + G_GNUC_INTERNAL GtkWidget * v3270_toggle_button_new(GtkWidget *widget, LIB3270_TOGGLE_ID toggle);
126 126
127 // Activity list widget. 127 // Activity list widget.
128 #define GTK_TYPE_V3270_FT_ACTIVITY_LIST (V3270FTActivityList_get_type ()) 128 #define GTK_TYPE_V3270_FT_ACTIVITY_LIST (V3270FTActivityList_get_type ())
src/include/terminal.h
  Diff comments   View file @7e5037c
@@ -69,7 +69,7 @@ G_BEGIN_DECLS @@ -69,7 +69,7 @@ G_BEGIN_DECLS
69 69
70 // Signals 70 // Signals
71 void (*activate)(GtkWidget *widget); 71 void (*activate)(GtkWidget *widget);
72 - void (*toggle_changed)(v3270 *widget,LIB3270_TOGGLE toggle_id,gboolean toggle_state,const gchar *toggle_name); 72 + void (*toggle_changed)(v3270 *widget,LIB3270_TOGGLE_ID toggle_id,gboolean toggle_state,const gchar *toggle_name);
73 void (*message_changed)(v3270 *widget, LIB3270_MESSAGE id); 73 void (*message_changed)(v3270 *widget, LIB3270_MESSAGE id);
74 void (*popup_message)(GtkWidget *widget, LIB3270_NOTIFY id , const gchar *title, const gchar *message, const gchar *text); 74 void (*popup_message)(GtkWidget *widget, LIB3270_NOTIFY id , const gchar *title, const gchar *message, const gchar *text);
75 75
src/include/v3270/toggle.h
  Diff comments   View file @7e5037c
@@ -36,8 +36,8 @@ @@ -36,8 +36,8 @@
36 36
37 G_BEGIN_DECLS 37 G_BEGIN_DECLS
38 38
39 - LIB3270_EXPORT gboolean v3270_get_toggle(GtkWidget *widget, LIB3270_TOGGLE ix);  
40 - LIB3270_EXPORT gboolean v3270_set_toggle(GtkWidget *widget, LIB3270_TOGGLE ix, gboolean state); 39 + LIB3270_EXPORT gboolean v3270_get_toggle(GtkWidget *widget, LIB3270_TOGGLE_ID ix);
  40 + LIB3270_EXPORT gboolean v3270_set_toggle(GtkWidget *widget, LIB3270_TOGGLE_ID ix, gboolean state);
41 41
42 G_END_DECLS 42 G_END_DECLS
43 43
src/terminal/callbacks.c
  Diff comments   View file @7e5037c
@@ -70,7 +70,7 @@ static void set_timer(H3270 *session, unsigned char on) @@ -70,7 +70,7 @@ static void set_timer(H3270 *session, unsigned char on)
70 70
71 } 71 }
72 72
73 -static void update_toggle(H3270 *session, LIB3270_TOGGLE ix, unsigned char value, G_GNUC_UNUSED LIB3270_TOGGLE_TYPE reason, const char *name) 73 +static void update_toggle(H3270 *session, LIB3270_TOGGLE_ID ix, unsigned char value, G_GNUC_UNUSED LIB3270_TOGGLE_TYPE reason, const char *name)
74 { 74 {
75 GtkWidget * widget = GTK_WIDGET(lib3270_get_user_data(session)); 75 GtkWidget * widget = GTK_WIDGET(lib3270_get_user_data(session));
76 v3270Class * klass = GTK_V3270_GET_CLASS(widget); 76 v3270Class * klass = GTK_V3270_GET_CLASS(widget);
src/terminal/properties/methods.c
  Diff comments   View file @7e5037c
@@ -43,7 +43,7 @@ @@ -43,7 +43,7 @@
43 return GTK_V3270(widget)->activity.disconnect; 43 return GTK_V3270(widget)->activity.disconnect;
44 } 44 }
45 45
46 -LIB3270_EXPORT gboolean v3270_get_toggle(GtkWidget *widget, LIB3270_TOGGLE ix) 46 +LIB3270_EXPORT gboolean v3270_get_toggle(GtkWidget *widget, LIB3270_TOGGLE_ID ix)
47 { 47 {
48 g_return_val_if_fail(GTK_IS_V3270(widget),FALSE); 48 g_return_val_if_fail(GTK_IS_V3270(widget),FALSE);
49 49
@@ -53,7 +53,7 @@ LIB3270_EXPORT gboolean v3270_get_toggle(GtkWidget *widget, LIB3270_TOGGLE ix) @@ -53,7 +53,7 @@ LIB3270_EXPORT gboolean v3270_get_toggle(GtkWidget *widget, LIB3270_TOGGLE ix)
53 return FALSE; 53 return FALSE;
54 } 54 }
55 55
56 -LIB3270_EXPORT gboolean v3270_set_toggle(GtkWidget *widget, LIB3270_TOGGLE ix, gboolean state) 56 +LIB3270_EXPORT gboolean v3270_set_toggle(GtkWidget *widget, LIB3270_TOGGLE_ID ix, gboolean state)
57 { 57 {
58 g_return_val_if_fail(GTK_IS_V3270(widget),FALSE); 58 g_return_val_if_fail(GTK_IS_V3270(widget),FALSE);
59 59
src/terminal/widget.c
  Diff comments   View file @7e5037c
@@ -157,7 +157,7 @@ gboolean v3270_query_tooltip(GtkWidget *widget, gint x, gint y, G_GNUC_UNUSED g @@ -157,7 +157,7 @@ gboolean v3270_query_tooltip(GtkWidget *widget, gint x, gint y, G_GNUC_UNUSED g
157 return FALSE; 157 return FALSE;
158 } 158 }
159 159
160 -static void v3270_toggle_changed(G_GNUC_UNUSED v3270 *widget, G_GNUC_UNUSED LIB3270_TOGGLE toggle_id, G_GNUC_UNUSED gboolean toggle_state, G_GNUC_UNUSED const gchar *toggle_name) 160 +static void v3270_toggle_changed(G_GNUC_UNUSED v3270 *widget, G_GNUC_UNUSED LIB3270_TOGGLE_ID toggle_id, G_GNUC_UNUSED gboolean toggle_state, G_GNUC_UNUSED const gchar *toggle_name)
161 { 161 {
162 } 162 }
163 163
src/trace/trace.c
  Diff comments   View file @7e5037c
@@ -327,7 +327,7 @@ @@ -327,7 +327,7 @@
327 { 327 {
328 size_t ix; 328 size_t ix;
329 329
330 - static const LIB3270_TOGGLE toggles[] = { 330 + static const LIB3270_TOGGLE_ID toggles[] = {
331 LIB3270_TOGGLE_DS_TRACE, 331 LIB3270_TOGGLE_DS_TRACE,
332 LIB3270_TOGGLE_NETWORK_TRACE, 332 LIB3270_TOGGLE_NETWORK_TRACE,
333 LIB3270_TOGGLE_EVENT_TRACE, 333 LIB3270_TOGGLE_EVENT_TRACE,