diff --git a/locale/Makefile.in b/locale/Makefile.in index bb9ded2..9255b83 100644 --- a/locale/Makefile.in +++ b/locale/Makefile.in @@ -63,7 +63,7 @@ $(BINDIR)/%/LC_MESSAGES/$(PACKAGE_NAME).mo: \ @$(MKDIR) `dirname $@` @$(MSGFMT) -c -v -o $@ $^ -$(DESTDIR)/$(localedir)/%/LC_MESSAGES/$(PACKAGE_NAME).mo: \ +$(DESTDIR)$(localedir)/%/LC_MESSAGES/$(PACKAGE_NAME).mo: \ $(BINDIR)/%/LC_MESSAGES/$(PACKAGE_NAME).mo @echo $< ... @@ -76,7 +76,7 @@ all: \ $(foreach SRC, $(basename $(wildcard *.po)), $(BINDIR)/$(SRC)/LC_MESSAGES/$(PACKAGE_NAME).mo) install: \ - $(foreach SRC, $(basename $(wildcard *.po)), $(DESTDIR)/$(localedir)/$(SRC)/LC_MESSAGES/$(PACKAGE_NAME).mo) + $(foreach SRC, $(basename $(wildcard *.po)), $(DESTDIR)$(localedir)/$(SRC)/LC_MESSAGES/$(PACKAGE_NAME).mo) diff --git a/src/dialogs/colorscheme.c b/src/dialogs/colorscheme.c index ceb81f5..d40c017 100644 --- a/src/dialogs/colorscheme.c +++ b/src/dialogs/colorscheme.c @@ -264,7 +264,11 @@ if(!g_file_test(filename,G_FILE_TEST_IS_REGULAR)) { +#ifdef DEBUG + g_message("Unable to load color schemes in \"%s\"",filename); +#else g_warning("Unable to load color schemes in \"%s\"",filename); +#endif gtk_widget_set_sensitive(widget,FALSE); return widget; } diff --git a/src/include/v3270/selection.h b/src/include/v3270/selection.h index 2da7fc1..a650bf3 100644 --- a/src/include/v3270/selection.h +++ b/src/include/v3270/selection.h @@ -47,38 +47,38 @@ } V3270_COPY_MODE; - void v3270_clipboard_set(GtkWidget *widget, V3270_COPY_MODE mode, gboolean cut); - void v3270_clipboard_get_from_url(GtkWidget *widget, const gchar *url); + LIB3270_EXPORT void v3270_clipboard_set(GtkWidget *widget, V3270_COPY_MODE mode, gboolean cut); + LIB3270_EXPORT void v3270_clipboard_get_from_url(GtkWidget *widget, const gchar *url); /// @brief Check if the widget has saved text. - gboolean v3270_has_copy(GtkWidget *widget); + LIB3270_EXPORT gboolean v3270_has_copy(GtkWidget *widget); - void v3270_paste(GtkWidget *widget) G_GNUC_DEPRECATED; - void v3270_paste_text(GtkWidget *widget) G_GNUC_DEPRECATED; - void v3270_paste_from_file(GtkWidget *widget) G_GNUC_DEPRECATED; - void v3270_copy_selection(GtkWidget *widget, V3270_COPY_MODE mode, gboolean cut) G_GNUC_DEPRECATED; - void v3270_append_selection(GtkWidget *widget, gboolean cut) G_GNUC_DEPRECATED; + LIB3270_EXPORT void v3270_paste(GtkWidget *widget) G_GNUC_DEPRECATED; + LIB3270_EXPORT void v3270_paste_text(GtkWidget *widget) G_GNUC_DEPRECATED; + LIB3270_EXPORT void v3270_paste_from_file(GtkWidget *widget) G_GNUC_DEPRECATED; + LIB3270_EXPORT void v3270_copy_selection(GtkWidget *widget, V3270_COPY_MODE mode, gboolean cut) G_GNUC_DEPRECATED; + LIB3270_EXPORT void v3270_append_selection(GtkWidget *widget, gboolean cut) G_GNUC_DEPRECATED; // Selections - gchar * v3270_get_selected(GtkWidget *widget, gboolean cut); - gchar * v3270_get_copy(GtkWidget *widget); + LIB3270_EXPORT gchar * v3270_get_selected(GtkWidget *widget, gboolean cut); + LIB3270_EXPORT gchar * v3270_get_copy(GtkWidget *widget); - gchar * v3270_get_text(GtkWidget *widget,int offset, int len); - gchar * v3270_get_region(GtkWidget *widget, gint start_pos, gint end_pos, gboolean all); + LIB3270_EXPORT gchar * v3270_get_text(GtkWidget *widget,int offset, int len); + LIB3270_EXPORT gchar * v3270_get_region(GtkWidget *widget, gint start_pos, gint end_pos, gboolean all); - void v3270_set_string(GtkWidget *widget, const gchar *str); + LIB3270_EXPORT void v3270_set_string(GtkWidget *widget, const gchar *str); - gboolean v3270_get_selection_bounds(GtkWidget *widget, gint *start, gint *end); - void v3270_unselect(GtkWidget *widget); - void v3270_select_all(GtkWidget *widget); - void v3270_select_region(GtkWidget *widget, gint start, gint end); + LIB3270_EXPORT gboolean v3270_get_selection_bounds(GtkWidget *widget, gint *start, gint *end); + LIB3270_EXPORT void v3270_unselect(GtkWidget *widget); + LIB3270_EXPORT void v3270_select_all(GtkWidget *widget); + LIB3270_EXPORT void v3270_select_region(GtkWidget *widget, gint start, gint end); - void v3270_selection_set_font_family(GtkWidget *widget, const gchar *name); - const gchar * v3270_selection_get_font_family(GtkWidget *widget); + LIB3270_EXPORT void v3270_selection_set_font_family(GtkWidget *widget, const gchar *name); + LIB3270_EXPORT const gchar * v3270_selection_get_font_family(GtkWidget *widget); - void v3270_selection_set_color_scheme(GtkWidget *widget, const gchar *name); - const gchar * v3270_selection_get_color_scheme(GtkWidget *widget); + LIB3270_EXPORT void v3270_selection_set_color_scheme(GtkWidget *widget, const gchar *name); + LIB3270_EXPORT const gchar * v3270_selection_get_color_scheme(GtkWidget *widget); G_END_DECLS diff --git a/src/terminal/windows/registry.c b/src/terminal/windows/registry.c index 1f4d024..abd3c6d 100644 --- a/src/terminal/windows/registry.c +++ b/src/terminal/windows/registry.c @@ -43,7 +43,12 @@ /*--[ Implement ]------------------------------------------------------------------------------------*/ static void save_string(HKEY hKey, const gchar *key, const gchar *value) { - RegSetValueEx(hKey,key,0,REG_SZ,(const BYTE *) value,strlen(value)+1); + + if(value) { + RegSetValueEx(hKey,key,0,REG_SZ,(const BYTE *) value,strlen(value)+1); + } else { + RegDeleteValue(hKey,key); + } } static void save_by_pspec(GtkWidget *widget, GParamSpec *pspec, HKEY hKey) -- libgit2 0.21.2