Download as
Browse Code »

Commit e7cb2516e950b9ef5f7724982f0f470445614e71

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

Fixing mingw build.

Showing 4 changed files with 33 additions and 24 deletions   Show diff stats
locale/Makefile.in
  Diff comments   View file @e7cb251
@@ -63,7 +63,7 @@ $(BINDIR)/%/LC_MESSAGES/$(PACKAGE_NAME).mo: \ @@ -63,7 +63,7 @@ $(BINDIR)/%/LC_MESSAGES/$(PACKAGE_NAME).mo: \
63 @$(MKDIR) `dirname $@` 63 @$(MKDIR) `dirname $@`
64 @$(MSGFMT) -c -v -o $@ $^ 64 @$(MSGFMT) -c -v -o $@ $^
65 65
66 -$(DESTDIR)/$(localedir)/%/LC_MESSAGES/$(PACKAGE_NAME).mo: \ 66 +$(DESTDIR)$(localedir)/%/LC_MESSAGES/$(PACKAGE_NAME).mo: \
67 $(BINDIR)/%/LC_MESSAGES/$(PACKAGE_NAME).mo 67 $(BINDIR)/%/LC_MESSAGES/$(PACKAGE_NAME).mo
68 68
69 @echo $< ... 69 @echo $< ...
@@ -76,7 +76,7 @@ all: \ @@ -76,7 +76,7 @@ all: \
76 $(foreach SRC, $(basename $(wildcard *.po)), $(BINDIR)/$(SRC)/LC_MESSAGES/$(PACKAGE_NAME).mo) 76 $(foreach SRC, $(basename $(wildcard *.po)), $(BINDIR)/$(SRC)/LC_MESSAGES/$(PACKAGE_NAME).mo)
77 77
78 install: \ 78 install: \
79 - $(foreach SRC, $(basename $(wildcard *.po)), $(DESTDIR)/$(localedir)/$(SRC)/LC_MESSAGES/$(PACKAGE_NAME).mo) 79 + $(foreach SRC, $(basename $(wildcard *.po)), $(DESTDIR)$(localedir)/$(SRC)/LC_MESSAGES/$(PACKAGE_NAME).mo)
80 80
81 81
82 82
src/dialogs/colorscheme.c
  Diff comments   View file @e7cb251
@@ -264,7 +264,11 @@ @@ -264,7 +264,11 @@
264 264
265 if(!g_file_test(filename,G_FILE_TEST_IS_REGULAR)) 265 if(!g_file_test(filename,G_FILE_TEST_IS_REGULAR))
266 { 266 {
  267 +#ifdef DEBUG
  268 + g_message("Unable to load color schemes in \"%s\"",filename);
  269 +#else
267 g_warning("Unable to load color schemes in \"%s\"",filename); 270 g_warning("Unable to load color schemes in \"%s\"",filename);
  271 +#endif
268 gtk_widget_set_sensitive(widget,FALSE); 272 gtk_widget_set_sensitive(widget,FALSE);
269 return widget; 273 return widget;
270 } 274 }
src/include/v3270/selection.h
  Diff comments   View file @e7cb251
@@ -47,38 +47,38 @@ @@ -47,38 +47,38 @@
47 47
48 } V3270_COPY_MODE; 48 } V3270_COPY_MODE;
49 49
50 - void v3270_clipboard_set(GtkWidget *widget, V3270_COPY_MODE mode, gboolean cut);  
51 - void v3270_clipboard_get_from_url(GtkWidget *widget, const gchar *url); 50 + LIB3270_EXPORT void v3270_clipboard_set(GtkWidget *widget, V3270_COPY_MODE mode, gboolean cut);
  51 + LIB3270_EXPORT void v3270_clipboard_get_from_url(GtkWidget *widget, const gchar *url);
52 52
53 /// @brief Check if the widget has saved text. 53 /// @brief Check if the widget has saved text.
54 - gboolean v3270_has_copy(GtkWidget *widget); 54 + LIB3270_EXPORT gboolean v3270_has_copy(GtkWidget *widget);
55 55
56 - void v3270_paste(GtkWidget *widget) G_GNUC_DEPRECATED;  
57 - void v3270_paste_text(GtkWidget *widget) G_GNUC_DEPRECATED;  
58 - void v3270_paste_from_file(GtkWidget *widget) G_GNUC_DEPRECATED;  
59 - void v3270_copy_selection(GtkWidget *widget, V3270_COPY_MODE mode, gboolean cut) G_GNUC_DEPRECATED;  
60 - void v3270_append_selection(GtkWidget *widget, gboolean cut) G_GNUC_DEPRECATED; 56 + LIB3270_EXPORT void v3270_paste(GtkWidget *widget) G_GNUC_DEPRECATED;
  57 + LIB3270_EXPORT void v3270_paste_text(GtkWidget *widget) G_GNUC_DEPRECATED;
  58 + LIB3270_EXPORT void v3270_paste_from_file(GtkWidget *widget) G_GNUC_DEPRECATED;
  59 + LIB3270_EXPORT void v3270_copy_selection(GtkWidget *widget, V3270_COPY_MODE mode, gboolean cut) G_GNUC_DEPRECATED;
  60 + LIB3270_EXPORT void v3270_append_selection(GtkWidget *widget, gboolean cut) G_GNUC_DEPRECATED;
61 61
62 // Selections 62 // Selections
63 63
64 - gchar * v3270_get_selected(GtkWidget *widget, gboolean cut);  
65 - gchar * v3270_get_copy(GtkWidget *widget); 64 + LIB3270_EXPORT gchar * v3270_get_selected(GtkWidget *widget, gboolean cut);
  65 + LIB3270_EXPORT gchar * v3270_get_copy(GtkWidget *widget);
66 66
67 - gchar * v3270_get_text(GtkWidget *widget,int offset, int len);  
68 - gchar * v3270_get_region(GtkWidget *widget, gint start_pos, gint end_pos, gboolean all); 67 + LIB3270_EXPORT gchar * v3270_get_text(GtkWidget *widget,int offset, int len);
  68 + LIB3270_EXPORT gchar * v3270_get_region(GtkWidget *widget, gint start_pos, gint end_pos, gboolean all);
69 69
70 - void v3270_set_string(GtkWidget *widget, const gchar *str); 70 + LIB3270_EXPORT void v3270_set_string(GtkWidget *widget, const gchar *str);
71 71
72 - gboolean v3270_get_selection_bounds(GtkWidget *widget, gint *start, gint *end);  
73 - void v3270_unselect(GtkWidget *widget);  
74 - void v3270_select_all(GtkWidget *widget);  
75 - void v3270_select_region(GtkWidget *widget, gint start, gint end); 72 + LIB3270_EXPORT gboolean v3270_get_selection_bounds(GtkWidget *widget, gint *start, gint *end);
  73 + LIB3270_EXPORT void v3270_unselect(GtkWidget *widget);
  74 + LIB3270_EXPORT void v3270_select_all(GtkWidget *widget);
  75 + LIB3270_EXPORT void v3270_select_region(GtkWidget *widget, gint start, gint end);
76 76
77 - void v3270_selection_set_font_family(GtkWidget *widget, const gchar *name);  
78 - const gchar * v3270_selection_get_font_family(GtkWidget *widget); 77 + LIB3270_EXPORT void v3270_selection_set_font_family(GtkWidget *widget, const gchar *name);
  78 + LIB3270_EXPORT const gchar * v3270_selection_get_font_family(GtkWidget *widget);
79 79
80 - void v3270_selection_set_color_scheme(GtkWidget *widget, const gchar *name);  
81 - const gchar * v3270_selection_get_color_scheme(GtkWidget *widget); 80 + LIB3270_EXPORT void v3270_selection_set_color_scheme(GtkWidget *widget, const gchar *name);
  81 + LIB3270_EXPORT const gchar * v3270_selection_get_color_scheme(GtkWidget *widget);
82 82
83 G_END_DECLS 83 G_END_DECLS
84 84
src/terminal/windows/registry.c
  Diff comments   View file @e7cb251
@@ -43,7 +43,12 @@ @@ -43,7 +43,12 @@
43 /*--[ Implement ]------------------------------------------------------------------------------------*/ 43 /*--[ Implement ]------------------------------------------------------------------------------------*/
44 44
45 static void save_string(HKEY hKey, const gchar *key, const gchar *value) { 45 static void save_string(HKEY hKey, const gchar *key, const gchar *value) {
46 - RegSetValueEx(hKey,key,0,REG_SZ,(const BYTE *) value,strlen(value)+1); 46 +
  47 + if(value) {
  48 + RegSetValueEx(hKey,key,0,REG_SZ,(const BYTE *) value,strlen(value)+1);
  49 + } else {
  50 + RegDeleteValue(hKey,key);
  51 + }
47 } 52 }
48 53
49 static void save_by_pspec(GtkWidget *widget, GParamSpec *pspec, HKEY hKey) 54 static void save_by_pspec(GtkWidget *widget, GParamSpec *pspec, HKEY hKey)