Commit d60e5c876accb67238e2e76aef6f5961404d6666
1 parent
4cb19517
Exists in
master
and in
5 other branches
Fixing bug in about window detected on windows version.
Showing
3 changed files
with
15 additions
and
8 deletions
Show diff stats
src/libpw3270cpp/remote.cc
| ... | ... | @@ -431,7 +431,10 @@ |
| 431 | 431 | val = (int) getpid(); |
| 432 | 432 | while(val > 0) |
| 433 | 433 | { |
| 434 | + #pragma GCC diagnostic push | |
| 435 | + #pragma GCC diagnostic ignored "-Wnarrowing" | |
| 434 | 436 | char str[] = { 'a'+(val % 25), 0 }; |
| 437 | + #pragma GCC diagnostic pop | |
| 435 | 438 | name.append(str); |
| 436 | 439 | val /= 25; |
| 437 | 440 | } | ... | ... |
src/pw3270/Makefile.in
| ... | ... | @@ -243,6 +243,7 @@ $(BINRLS)/$(LIBNAME): \ |
| 243 | 243 | |
| 244 | 244 | @echo $(basename $@) ... |
| 245 | 245 | @$(MKDIR) `dirname $@` |
| 246 | + @rm -f $@ | |
| 246 | 247 | @$(LN_S) $^ $@ |
| 247 | 248 | |
| 248 | 249 | $(BINRLS)/$(LIBNAME).@PACKAGE_MAJOR_VERSION@: \ |
| ... | ... | @@ -250,6 +251,7 @@ $(BINRLS)/$(LIBNAME).@PACKAGE_MAJOR_VERSION@: \ |
| 250 | 251 | |
| 251 | 252 | @echo $(basename $@) ... |
| 252 | 253 | @$(MKDIR) `dirname $@` |
| 254 | + @rm -f $@ | |
| 253 | 255 | @$(LN_S) $^ $@ |
| 254 | 256 | |
| 255 | 257 | $(BINRLS)/$(LIBNAME).@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@: \ |
| ... | ... | @@ -311,6 +313,7 @@ $(BINDBG)/$(LIBNAME): \ |
| 311 | 313 | |
| 312 | 314 | @echo $(basename $@) ... |
| 313 | 315 | @$(MKDIR) `dirname $@` |
| 316 | + @rm -f $@ | |
| 314 | 317 | @$(LN_S) $^ $@ |
| 315 | 318 | |
| 316 | 319 | $(BINDBG)/$(LIBNAME).@PACKAGE_MAJOR_VERSION@: \ |
| ... | ... | @@ -318,6 +321,7 @@ $(BINDBG)/$(LIBNAME).@PACKAGE_MAJOR_VERSION@: \ |
| 318 | 321 | |
| 319 | 322 | @echo $(basename $@) ... |
| 320 | 323 | @$(MKDIR) `dirname $@` |
| 324 | + @rm -f $@ | |
| 321 | 325 | @$(LN_S) $^ $@ |
| 322 | 326 | |
| 323 | 327 | $(BINDBG)/$(LIBNAME).@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@: \ | ... | ... |
src/pw3270/dialog.c
| ... | ... | @@ -487,10 +487,14 @@ |
| 487 | 487 | "Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02111-1307 " |
| 488 | 488 | "USA" ); |
| 489 | 489 | |
| 490 | - GtkAboutDialog * dialog = GTK_ABOUT_DIALOG(gtk_about_dialog_new()); | |
| 491 | - gchar * text = g_strdup_printf("%s-logo.png",g_get_application_name()); | |
| 492 | - gchar * filename = build_data_filename(text,NULL); | |
| 493 | - gchar * info; | |
| 490 | + GtkAboutDialog * dialog = GTK_ABOUT_DIALOG(gtk_about_dialog_new()); | |
| 491 | + g_autofree gchar * text = g_strdup_printf("%s-logo.png",g_get_application_name()); | |
| 492 | + g_autofree gchar * filename = build_data_filename(text,NULL); | |
| 493 | + g_autofree gchar * info; | |
| 494 | + | |
| 495 | + if(widget) { | |
| 496 | + gtk_window_set_transient_for(GTK_WINDOW(dialog),GTK_WINDOW(gtk_widget_get_toplevel(widget))); | |
| 497 | + } | |
| 494 | 498 | |
| 495 | 499 | trace("[%s]",filename); |
| 496 | 500 | if(g_file_test(filename,G_FILE_TEST_EXISTS)) |
| ... | ... | @@ -511,9 +515,6 @@ |
| 511 | 515 | } |
| 512 | 516 | } |
| 513 | 517 | |
| 514 | - g_free(filename); | |
| 515 | - g_free(text); | |
| 516 | - | |
| 517 | 518 | #ifdef PACKAGE_RELEASE |
| 518 | 519 | text = g_strdup_printf(_("Version %s-%s"),PACKAGE_VERSION,G_STRINGIFY(PACKAGE_RELEASE)); |
| 519 | 520 | #else |
| ... | ... | @@ -541,6 +542,5 @@ |
| 541 | 542 | gtk_dialog_run(GTK_DIALOG(dialog)); |
| 542 | 543 | gtk_widget_destroy(GTK_WIDGET(dialog)); |
| 543 | 544 | |
| 544 | - g_free(info); | |
| 545 | 545 | } |
| 546 | 546 | ... | ... |