Download as
Browse Code »

Commit baf5dd1b3ef277e95244221d38947b4a1c2a6c41

Authored by Perry Werneck
2 parents d30f5538 6bb49b3c
Exists in master and in 1 other branch develop

Merge branch 'master' of https://github.com/PerryWerneck/libv3270

Showing 3 changed files with 7 additions and 7 deletions   Show diff stats
src/dialogs/print/print.c
  Diff comments   View file @baf5dd1
... ... @@ -157,7 +157,7 @@ V3270PrintOperation * v3270_print_operation_new(GtkWidget *widget, LIB3270_CONTE
157 157 operation->mode = mode;
158 158 operation->widget = GTK_V3270(widget);
159 159 operation->session = v3270_get_session(widget);
160   - operation->settings = V3270_print_settings_new(widget);
  160 + operation->settings = GTK_V3270_PRINT_SETTINGS(V3270_print_settings_new(widget));
161 161  
162 162 // Get contents.
163 163 switch(operation->mode)
... ...
src/dialogs/print/settings.c
  Diff comments   View file @baf5dd1
... ... @@ -144,12 +144,12 @@ LIB3270_EXPORT void v3270_print_settings_set_show_selection(GtkWidget *widget, g
144 144  
145 145 LIB3270_EXPORT gchar * v3270_print_settings_get_color_scheme(GtkWidget *widget)
146 146 {
147   - return v3270_color_scheme_get_text(GTK_V3270_COLOR_SCHEME(GTK_V3270_PRINT_SETTINGS(widget)->color));
  147 + return v3270_color_scheme_get_text((GTK_V3270_PRINT_SETTINGS(widget)->color));
148 148 }
149 149  
150 150 LIB3270_EXPORT void v3270_print_settings_set_color_scheme(GtkWidget *widget, const gchar *colors)
151 151 {
152   - v3270_color_scheme_set_text(GTK_V3270_COLOR_SCHEME(GTK_V3270_PRINT_SETTINGS(widget)->color), colors);
  152 + v3270_color_scheme_set_text(GTK_V3270_PRINT_SETTINGS(widget)->color, colors);
153 153 }
154 154  
155 155 LIB3270_EXPORT const gchar * v3270_print_settings_get_font_family(GtkWidget *widget)
... ...
src/dialogs/save/convenience.c
  Diff comments   View file @baf5dd1
... ... @@ -27,10 +27,10 @@
27 27 *
28 28 */
29 29  
30   - #include <config.h>
  30 + #include "private.h"
  31 + #include <internals.h>
31 32 #include <errno.h>
32 33 #include <string.h>
33   - #include "private.h"
34 34  
35 35 /*--[ Implement ]------------------------------------------------------------------------------------*/
36 36  
... ... @@ -59,7 +59,7 @@
59 59 GTK_WINDOW(gtk_widget_get_toplevel(widget)),
60 60 GTK_DIALOG_MODAL|GTK_DIALOG_DESTROY_WITH_PARENT,
61 61 GTK_MESSAGE_ERROR,GTK_BUTTONS_CLOSE,
62   - message
  62 + "%s", message
63 63 );
64 64  
65 65 gtk_window_set_title(GTK_WINDOW(popup),_("Operation has failed"));
... ... @@ -88,7 +88,7 @@
88 88 GTK_WINDOW(gtk_widget_get_toplevel(widget)),
89 89 GTK_DIALOG_MODAL|GTK_DIALOG_DESTROY_WITH_PARENT,
90 90 GTK_MESSAGE_ERROR,GTK_BUTTONS_CLOSE,
91   - message
  91 + "%s", message
92 92 );
93 93  
94 94 gtk_window_set_title(GTK_WINDOW(popup),_("Operation has failed"));
... ...