Download as
Browse Code »

Commit 290b7fab23f9f4d0e1ad1b1f58c887c16ebde7b2

Authored by Perry Werneck
2 parents 669a2ae0 381119a6
Exists in master and in 4 other branches develop, edit-header-bar, keypads, script-support

Merge branch 'master' into develop

Showing 4 changed files with 10 additions and 8 deletions   Show diff stats
src/pw3270/actions.c
  Diff comments   View file @290b7fa
@@ -394,7 +394,7 @@ static void connect_standard_action(GtkAction *action, GtkWidget *widget, const @@ -394,7 +394,7 @@ static void connect_standard_action(GtkAction *action, GtkWidget *widget, const
394 394
395 static void lib3270_toggle_action(GtkToggleAction *action,GtkWidget *widget) 395 static void lib3270_toggle_action(GtkToggleAction *action,GtkWidget *widget)
396 { 396 {
397 - LIB3270_TOGGLE toggle = (LIB3270_TOGGLE) GPOINTER_TO_INT(g_object_get_data(G_OBJECT(action),"toggle_id")); 397 + LIB3270_TOGGLE_ID toggle = (LIB3270_TOGGLE_ID) GPOINTER_TO_INT(g_object_get_data(G_OBJECT(action),"toggle_id"));
398 398
399 trace("Action %s toggled on widget %p (id=%d)\n",gtk_action_get_name(GTK_ACTION(action)),widget,(int) toggle); 399 trace("Action %s toggled on widget %p (id=%d)\n",gtk_action_get_name(GTK_ACTION(action)),widget,(int) toggle);
400 400
@@ -471,7 +471,7 @@ static void action_pakey(GtkAction *action, GtkWidget *widget) @@ -471,7 +471,7 @@ static void action_pakey(GtkAction *action, GtkWidget *widget)
471 471
472 static void action_set_toggle(GtkAction *action, GtkWidget *widget) 472 static void action_set_toggle(GtkAction *action, GtkWidget *widget)
473 { 473 {
474 - LIB3270_TOGGLE id = (LIB3270_TOGGLE) GPOINTER_TO_INT(g_object_get_data(G_OBJECT(action),"toggle_id")); 474 + LIB3270_TOGGLE_ID id = (LIB3270_TOGGLE_ID) GPOINTER_TO_INT(g_object_get_data(G_OBJECT(action),"toggle_id"));
475 475
476 trace("Action %s activated on widget %p toggle=%d\n",gtk_action_get_name(action),widget,id); 476 trace("Action %s activated on widget %p toggle=%d\n",gtk_action_get_name(action),widget,id);
477 477
@@ -481,7 +481,7 @@ static void action_set_toggle(GtkAction *action, GtkWidget *widget) @@ -481,7 +481,7 @@ static void action_set_toggle(GtkAction *action, GtkWidget *widget)
481 481
482 static void action_reset_toggle(GtkAction *action, GtkWidget *widget) 482 static void action_reset_toggle(GtkAction *action, GtkWidget *widget)
483 { 483 {
484 - LIB3270_TOGGLE id = (LIB3270_TOGGLE) GPOINTER_TO_INT(g_object_get_data(G_OBJECT(action),"toggle_id")); 484 + LIB3270_TOGGLE_ID id = (LIB3270_TOGGLE_ID) GPOINTER_TO_INT(g_object_get_data(G_OBJECT(action),"toggle_id"));
485 485
486 trace("Action %s activated on widget %p toggle=%d\n",gtk_action_get_name(action),widget,id); 486 trace("Action %s activated on widget %p toggle=%d\n",gtk_action_get_name(action),widget,id);
487 487
src/pw3270/tools.c
  Diff comments   View file @290b7fa
@@ -135,12 +135,12 @@ LIB3270_EXPORT void pw3270_set_boolean(GtkWidget *widget, const gchar *group, co @@ -135,12 +135,12 @@ LIB3270_EXPORT void pw3270_set_boolean(GtkWidget *widget, const gchar *group, co
135 135
136 LIB3270_EXPORT gboolean pw3270_set_toggle_by_name(GtkWidget *widget, const gchar *name, gboolean flag) 136 LIB3270_EXPORT gboolean pw3270_set_toggle_by_name(GtkWidget *widget, const gchar *name, gboolean flag)
137 { 137 {
138 - H3270 * hSession = pw3270_get_session(widget);  
139 - LIB3270_TOGGLE id = lib3270_get_toggle_id(name); 138 + H3270 * hSession = pw3270_get_session(widget);
  139 + LIB3270_TOGGLE_ID id = lib3270_get_toggle_id(name);
140 140
141 trace("%s(%s) id=%u",__FUNCTION__,name,id); 141 trace("%s(%s) id=%u",__FUNCTION__,name,id);
142 142
143 - if(!hSession || id == (LIB3270_TOGGLE) -1) 143 + if(!hSession || id == (LIB3270_TOGGLE_ID) -1)
144 return FALSE; 144 return FALSE;
145 145
146 lib3270_set_toggle(hSession,id,(int) flag); 146 lib3270_set_toggle(hSession,id,(int) flag);
src/pw3270/window.c
  Diff comments   View file @290b7fa
@@ -330,7 +330,7 @@ static GtkWidget * trace_window = NULL; @@ -330,7 +330,7 @@ static GtkWidget * trace_window = NULL;
330 return v3270_get_url(GTK_PW3270(widget)->terminal); 330 return v3270_get_url(GTK_PW3270(widget)->terminal);
331 } 331 }
332 332
333 - gboolean pw3270_get_toggle(GtkWidget *widget, LIB3270_TOGGLE ix) 333 + gboolean pw3270_get_toggle(GtkWidget *widget, LIB3270_TOGGLE_ID ix)
334 { 334 {
335 g_return_val_if_fail(GTK_IS_PW3270(widget),FALSE); 335 g_return_val_if_fail(GTK_IS_PW3270(widget),FALSE);
336 return v3270_get_toggle(GTK_PW3270(widget)->terminal,ix); 336 return v3270_get_toggle(GTK_PW3270(widget)->terminal,ix);
@@ -678,7 +678,7 @@ static GtkWidget * trace_window = NULL; @@ -678,7 +678,7 @@ static GtkWidget * trace_window = NULL;
678 pw3270_print(widget, NULL, GTK_PRINT_OPERATION_ACTION_PRINT_DIALOG, LIB3270_CONTENT_ALL); 678 pw3270_print(widget, NULL, GTK_PRINT_OPERATION_ACTION_PRINT_DIALOG, LIB3270_CONTENT_ALL);
679 } 679 }
680 680
681 - static void toggle_changed(GtkWidget *widget, LIB3270_TOGGLE id, gboolean toggled, const gchar *name, GtkWindow *toplevel) 681 + static void toggle_changed(GtkWidget *widget, LIB3270_TOGGLE_ID id, gboolean toggled, const gchar *name, GtkWindow *toplevel)
682 { 682 {
683 GtkAction **list = (GtkAction **) g_object_get_data(G_OBJECT(widget),"toggle_actions"); 683 GtkAction **list = (GtkAction **) g_object_get_data(G_OBJECT(widget),"toggle_actions");
684 gchar *nm = g_ascii_strdown(name,-1); 684 gchar *nm = g_ascii_strdown(name,-1);
@@ -118,6 +118,8 @@ configure() @@ -118,6 +118,8 @@ configure()
118 echo -e "\e]2;Installing pre-reqs\a" 118 echo -e "\e]2;Installing pre-reqs\a"
119 echo "Installing pre-reqs" 119 echo "Installing pre-reqs"
120 120
  121 + echo "mingw32-cross-nsis" >> ${WORKDIR}/sources/pre-reqs
  122 +
121 cat ${WORKDIR}/sources/pre-reqs \ 123 cat ${WORKDIR}/sources/pre-reqs \
122 | grep -v 3270 \ 124 | grep -v 3270 \
123 | sort --unique \ 125 | sort --unique \