Download as
Browse Code »

Commit caf9e5db55400b0921344f3b815b3a27e0da05bc

Authored by Perry Werneck
1 parent a5a9276f
Exists in master and in 5 other branches develop, edit-header-bar, keypads, script-support, v5.2

Fixing win32 small issues.

Showing 5 changed files with 27 additions and 18 deletions   Show diff stats
.gitignore
  Diff comments   View file @caf9e5d
... ... @@ -24,7 +24,9 @@ versions
24 24 ChangeLog*
25 25 Makefile
26 26 aclocal.m4
27   -configure
  27 +configure*
  28 +win32-configure*
  29 +win64-configure*
28 30 autom4te.cache
29 31 makegtkruntime.sh
30 32 copydeps.sh
... ...
Makefile.in
  Diff comments   View file @caf9e5d
... ... @@ -251,6 +251,15 @@ Debug: \
251 251 $(BINDBG)/$(PACKAGE_TARNAME)@EXEEXT@ \
252 252 $(foreach PLG, $(PLUGINS), $(BINDBG)/plugins/$(PLG)@DLLEXT@)
253 253  
  254 +publish-debug: \
  255 + $(BINDBG)/$(PACKAGE_TARNAME)@EXEEXT@
  256 +
  257 + @rm -f ~/public-html/debug-$(PACKAGE_TARNAME)-@host_cpu@.zip
  258 + @zip \
  259 + -9 -D \
  260 + ~/public_html/debug-$(PACKAGE_TARNAME)-@host_cpu@.zip \
  261 + $(BINDBG)/*
  262 +
254 263 run: \
255 264 $(BINDBG)/$(PACKAGE_TARNAME)@EXEEXT@
256 265  
... ...
src/pw3270/common/config.c
  Diff comments   View file @caf9e5d
... ... @@ -89,7 +89,7 @@
89 89 {
90 90 if(RegQueryValueExA(*hKey,key,NULL,NULL,NULL,NULL) == ERROR_SUCCESS)
91 91 {
92   - trace("Key[%s\%s] found at id %d",path,key,f);
  92 + trace("Key\"%s\\%s\" found at id %d",path,key,f);
93 93 g_free(path);
94 94 return f;
95 95 }
... ... @@ -97,7 +97,7 @@
97 97 }
98 98 }
99 99  
100   - trace("Key[%s\%s] not found",path,key,f);
  100 + trace("Key \"%s\\%s\""" not found",path,key,f);
101 101 g_free(path);
102 102  
103 103 return -1;
... ...
src/pw3270/main.c
  Diff comments   View file @caf9e5d
... ... @@ -109,17 +109,16 @@ static int initialize(void)
109 109  
110 110 static void toplevel_setup(GtkWindow *window)
111 111 {
112   - gchar * name = g_strdup_printf("%s.png",g_get_application_name());
113   - gchar * filename = pw3270_build_filename(GTK_WIDGET(window),name,NULL);
114   - gchar * role = g_strdup_printf("%s_top",g_get_application_name());
  112 + g_autofree gchar * name = g_strdup_printf("%s.png",g_get_application_name());
  113 + g_autofree gchar * role = g_strdup_printf("%s_top",g_get_application_name());
115 114  
116 115 gtk_window_set_type_hint(window,GDK_WINDOW_TYPE_HINT_NORMAL);
117 116 gtk_window_set_position(window,GTK_WIN_POS_CENTER);
118 117 gtk_window_set_role(window,role);
119 118  
120   - g_free(role);
121   -
  119 +#ifndef _WIN32
122 120 // Set default icon
  121 + g_autofree gchar * filename = pw3270_build_filename(GTK_WIDGET(window),name,NULL);
123 122 if(g_file_test(filename,G_FILE_TEST_EXISTS))
124 123 {
125 124 GError * error = NULL;
... ... @@ -132,9 +131,8 @@ static void toplevel_setup(GtkWindow *window)
132 131 g_error_free(error);
133 132 }
134 133 }
  134 +#endif // _WIN32
135 135  
136   - g_free(filename);
137   - g_free(name);
138 136 }
139 137  
140 138 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
218 216  
219 217 static gboolean startup(GtkWidget *toplevel)
220 218 {
  219 + trace("%s",__FUNCTION__);
  220 +
221 221 gtk_window_present(GTK_WINDOW(toplevel));
222 222  
223 223 #ifdef HAVE_GTKMAC
... ... @@ -411,14 +411,13 @@ int main(int argc, char *argv[])
411 411 // Just in case!
412 412 g_mkdir_with_parents(g_get_tmp_dir(),0777);
413 413  
  414 +#ifdef _WIN32
  415 + g_set_application_name(PACKAGE_NAME);
  416 +#endif // _WIN32
414 417  
415 418 if(!session_name)
416 419 session_name = PACKAGE_NAME;
417 420  
418   -#ifdef _WIN32
419   - g_set_application_name(session_name);
420   -#endif // _WIN32
421   -
422 421 rc = initialize();
423 422 if(!rc)
424 423 {
... ...
src/pw3270/window.c
  Diff comments   View file @caf9e5d
... ... @@ -263,7 +263,7 @@ static GtkWidget * trace_window = NULL;
263 263 if(*ptr)
264 264 {
265 265 pw3270_set_url(widget,ptr);
266   -// connct = pw3270_get_toggle(widget,LIB3270_TOGGLE_CONNECT_ON_STARTUP) ? TRUE : FALSE;
  266 + connct = pw3270_get_toggle(widget,LIB3270_TOGGLE_CONNECT_ON_STARTUP) ? TRUE : FALSE;
267 267 }
268 268 g_free(ptr);
269 269 }
... ... @@ -289,10 +289,8 @@ static GtkWidget * trace_window = NULL;
289 289  
290 290 v3270_set_scaled_fonts(GTK_PW3270(widget)->terminal,get_boolean_from_config("terminal","sfonts",FALSE));
291 291  
292   - /*
293 292 if(connct)
294 293 pw3270_connect(widget);
295   - */
296 294  
297 295 return widget;
298 296 }
... ... @@ -769,7 +767,8 @@ static GtkWidget * trace_window = NULL;
769 767 // Connect widget signals
770 768 g_signal_connect(widget->terminal,"field_clicked",G_CALLBACK(field_clicked),widget);
771 769 g_signal_connect(widget->terminal,"toggle_changed",G_CALLBACK(toggle_changed),widget);
772   - g_signal_connect(widget->terminal,"print",G_CALLBACK(print_all),widget);
  770 +
  771 + //g_signal_connect(widget->terminal,"print",G_CALLBACK(print_all),widget);
773 772  
774 773 // Connect window signals
775 774 g_signal_connect(widget,"window_state_event",G_CALLBACK(window_state_event),widget->terminal);
... ...