diff --git a/.gitignore b/.gitignore index ccdcae0..cba9135 100644 --- a/.gitignore +++ b/.gitignore @@ -24,7 +24,9 @@ versions ChangeLog* Makefile aclocal.m4 -configure +configure* +win32-configure* +win64-configure* autom4te.cache makegtkruntime.sh copydeps.sh diff --git a/Makefile.in b/Makefile.in index 119faad..f213e4f 100644 --- a/Makefile.in +++ b/Makefile.in @@ -251,6 +251,15 @@ Debug: \ $(BINDBG)/$(PACKAGE_TARNAME)@EXEEXT@ \ $(foreach PLG, $(PLUGINS), $(BINDBG)/plugins/$(PLG)@DLLEXT@) +publish-debug: \ + $(BINDBG)/$(PACKAGE_TARNAME)@EXEEXT@ + + @rm -f ~/public-html/debug-$(PACKAGE_TARNAME)-@host_cpu@.zip + @zip \ + -9 -D \ + ~/public_html/debug-$(PACKAGE_TARNAME)-@host_cpu@.zip \ + $(BINDBG)/* + run: \ $(BINDBG)/$(PACKAGE_TARNAME)@EXEEXT@ diff --git a/src/pw3270/common/config.c b/src/pw3270/common/config.c index c0e53af..acbd839 100644 --- a/src/pw3270/common/config.c +++ b/src/pw3270/common/config.c @@ -89,7 +89,7 @@ { if(RegQueryValueExA(*hKey,key,NULL,NULL,NULL,NULL) == ERROR_SUCCESS) { - trace("Key[%s\%s] found at id %d",path,key,f); + trace("Key\"%s\\%s\" found at id %d",path,key,f); g_free(path); return f; } @@ -97,7 +97,7 @@ } } - trace("Key[%s\%s] not found",path,key,f); + trace("Key \"%s\\%s\""" not found",path,key,f); g_free(path); return -1; diff --git a/src/pw3270/main.c b/src/pw3270/main.c index 04d0bee..95bbd2d 100644 --- a/src/pw3270/main.c +++ b/src/pw3270/main.c @@ -109,17 +109,16 @@ static int initialize(void) static void toplevel_setup(GtkWindow *window) { - gchar * name = g_strdup_printf("%s.png",g_get_application_name()); - gchar * filename = pw3270_build_filename(GTK_WIDGET(window),name,NULL); - gchar * role = g_strdup_printf("%s_top",g_get_application_name()); + g_autofree gchar * name = g_strdup_printf("%s.png",g_get_application_name()); + g_autofree gchar * role = g_strdup_printf("%s_top",g_get_application_name()); gtk_window_set_type_hint(window,GDK_WINDOW_TYPE_HINT_NORMAL); gtk_window_set_position(window,GTK_WIN_POS_CENTER); gtk_window_set_role(window,role); - g_free(role); - +#ifndef _WIN32 // Set default icon + g_autofree gchar * filename = pw3270_build_filename(GTK_WIDGET(window),name,NULL); if(g_file_test(filename,G_FILE_TEST_EXISTS)) { GError * error = NULL; @@ -132,9 +131,8 @@ static void toplevel_setup(GtkWindow *window) g_error_free(error); } } +#endif // _WIN32 - g_free(filename); - g_free(name); } static gboolean optcolors(const gchar *option_name, const gchar *value, gpointer data, GError **error) @@ -218,6 +216,8 @@ static void g_logfile(const gchar *log_domain,GLogLevelFlags log_level,const gch static gboolean startup(GtkWidget *toplevel) { + trace("%s",__FUNCTION__); + gtk_window_present(GTK_WINDOW(toplevel)); #ifdef HAVE_GTKMAC @@ -411,14 +411,13 @@ int main(int argc, char *argv[]) // Just in case! g_mkdir_with_parents(g_get_tmp_dir(),0777); +#ifdef _WIN32 + g_set_application_name(PACKAGE_NAME); +#endif // _WIN32 if(!session_name) session_name = PACKAGE_NAME; -#ifdef _WIN32 - g_set_application_name(session_name); -#endif // _WIN32 - rc = initialize(); if(!rc) { diff --git a/src/pw3270/window.c b/src/pw3270/window.c index aa6b0c6..ea283d5 100644 --- a/src/pw3270/window.c +++ b/src/pw3270/window.c @@ -263,7 +263,7 @@ static GtkWidget * trace_window = NULL; if(*ptr) { pw3270_set_url(widget,ptr); -// connct = pw3270_get_toggle(widget,LIB3270_TOGGLE_CONNECT_ON_STARTUP) ? TRUE : FALSE; + connct = pw3270_get_toggle(widget,LIB3270_TOGGLE_CONNECT_ON_STARTUP) ? TRUE : FALSE; } g_free(ptr); } @@ -289,10 +289,8 @@ static GtkWidget * trace_window = NULL; v3270_set_scaled_fonts(GTK_PW3270(widget)->terminal,get_boolean_from_config("terminal","sfonts",FALSE)); - /* if(connct) pw3270_connect(widget); - */ return widget; } @@ -769,7 +767,8 @@ static GtkWidget * trace_window = NULL; // Connect widget signals g_signal_connect(widget->terminal,"field_clicked",G_CALLBACK(field_clicked),widget); g_signal_connect(widget->terminal,"toggle_changed",G_CALLBACK(toggle_changed),widget); - g_signal_connect(widget->terminal,"print",G_CALLBACK(print_all),widget); + + //g_signal_connect(widget->terminal,"print",G_CALLBACK(print_all),widget); // Connect window signals g_signal_connect(widget,"window_state_event",G_CALLBACK(window_state_event),widget->terminal); -- libgit2 0.21.2