Fixing bug in about window detected on windows version.

Perry Werneck
1 parent 4cb19517
Showing 3 changed files with 15 additions and 8 deletions Show diff stats
src/libpw3270cpp/remote.cc
src/pw3270/Makefile.in
src/pw3270/dialog.c
@@ -431,7 +431,10 @@
 			val = (int) getpid();
 			while(val > 0)
 			{
+				#pragma GCC diagnostic push
+				#pragma GCC diagnostic ignored "-Wnarrowing"
 				char str[] = { 'a'+(val % 25), 0 };
+				#pragma GCC diagnostic pop
 				name.append(str);
 				val /= 25;
 			}
@@ -243,6 +243,7 @@ $(BINRLS)/$(LIBNAME): \
 	@echo $(basename $@) ...
 	@$(MKDIR) `dirname $@`
+	@rm -f $@
 	@$(LN_S) $^ $@
 $(BINRLS)/$(LIBNAME).@PACKAGE_MAJOR_VERSION@: \
@@ -250,6 +251,7 @@ $(BINRLS)/$(LIBNAME).@PACKAGE_MAJOR_VERSION@: \
 	@echo $(basename $@) ...
 	@$(MKDIR) `dirname $@`
+	@rm -f $@
 	@$(LN_S) $^ $@
 $(BINRLS)/$(LIBNAME).@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@: \
@@ -311,6 +313,7 @@ $(BINDBG)/$(LIBNAME): \
 	@echo $(basename $@) ...
 	@$(MKDIR) `dirname $@`
+	@rm -f $@
 	@$(LN_S) $^ $@
 $(BINDBG)/$(LIBNAME).@PACKAGE_MAJOR_VERSION@: \
@@ -318,6 +321,7 @@ $(BINDBG)/$(LIBNAME).@PACKAGE_MAJOR_VERSION@: \
 	@echo $(basename $@) ...
 	@$(MKDIR) `dirname $@`
+	@rm -f $@
 	@$(LN_S) $^ $@
 $(BINDBG)/$(LIBNAME).@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@: \
@@ -487,10 +487,14 @@
 		"Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02111-1307 "
 		"USA" );
-	GtkAboutDialog  * dialog 	= GTK_ABOUT_DIALOG(gtk_about_dialog_new());
-	gchar			* text 		= g_strdup_printf("%s-logo.png",g_get_application_name());
-	gchar			* filename	= build_data_filename(text,NULL);
-	gchar			* info;
+	GtkAboutDialog		* dialog 	= GTK_ABOUT_DIALOG(gtk_about_dialog_new());
+	g_autofree gchar	* text 		= g_strdup_printf("%s-logo.png",g_get_application_name());
+	g_autofree gchar	* filename	= build_data_filename(text,NULL);
+	g_autofree gchar	* info;
+
+	if(widget) {
+		gtk_window_set_transient_for(GTK_WINDOW(dialog),GTK_WINDOW(gtk_widget_get_toplevel(widget)));
+	}
 	trace("[%s]",filename);
 	if(g_file_test(filename,G_FILE_TEST_EXISTS))
@@ -511,9 +515,6 @@
 		}
 	}
-	g_free(filename);
-	g_free(text);
-
 #ifdef PACKAGE_RELEASE
 	text = g_strdup_printf(_("Version %s-%s"),PACKAGE_VERSION,G_STRINGIFY(PACKAGE_RELEASE));
 #else
@@ -541,6 +542,5 @@
 	gtk_dialog_run(GTK_DIALOG(dialog));
 	gtk_widget_destroy(GTK_WIDGET(dialog));
-	g_free(info);
  }