# HG changeset patch
# User cclark <colin.clark@cclark.uk>
# Date 1504695587 -3600
# Node ID c6f9494f6be12e8f551d829197e77f41998ad6e6
# Parent  e2c53828af57e31ea6f14a4ef4d283ba22f47e3b
Fix #508: Copy and Move windows scale incorrectly

https://github.com/BestImageViewer/geeqie/issues/508

diff -r e2c53828af57 -r c6f9494f6be1 src/bar_exif.c
--- a/src/bar_exif.c	Thu Aug 31 11:38:26 2017 +0100
+++ b/src/bar_exif.c	Wed Sep 06 11:59:47 2017 +0100
@@ -558,7 +558,7 @@
 	g_signal_connect(G_OBJECT(widget), "destroy",
 			 G_CALLBACK(bar_pane_exif_edit_close_cb), gd);
 
-	generic_dialog_add_message(gd, NULL, ee ? _("Configure entry") : _("Add entry"), NULL);
+	generic_dialog_add_message(gd, NULL, ee ? _("Configure entry") : _("Add entry"), NULL, FALSE);
 
 	generic_dialog_add_button(gd, GTK_STOCK_OK, NULL,
 				  bar_pane_exif_edit_ok_cb, TRUE);
diff -r e2c53828af57 -r c6f9494f6be1 src/bar_gps.c
--- a/src/bar_gps.c	Thu Aug 31 11:38:26 2017 +0100
+++ b/src/bar_gps.c	Wed Sep 06 11:59:47 2017 +0100
@@ -216,7 +216,7 @@
 							bar_pane_gps_close_cancel_cb, pgd);
 				generic_dialog_add_message(gd, GTK_STOCK_DIALOG_QUESTION,
 							_("Write lat/long to meta-data?"),
-							message->str);
+							message->str, TRUE);
 
 				generic_dialog_add_button(gd, GTK_STOCK_SAVE, NULL,
 												bar_pane_gps_close_save_cb, TRUE);
@@ -843,7 +843,7 @@
 	gd = generic_dialog_new(_("Map centering"),
 				"map_centering", NULL, TRUE, NULL, pgd);
 	generic_dialog_add_message(gd, GTK_STOCK_DIALOG_INFO,
-				"Map Centering", message->str);
+				"Map Centering", message->str, TRUE);
 	generic_dialog_add_button(gd, GTK_STOCK_OK, NULL, NULL, TRUE);
 
 	gtk_widget_show(gd->dialog);
diff -r e2c53828af57 -r c6f9494f6be1 src/bar_keywords.c
--- a/src/bar_keywords.c	Thu Aug 31 11:38:26 2017 +0100
+++ b/src/bar_keywords.c	Wed Sep 06 11:59:47 2017 +0100
@@ -939,7 +939,7 @@
 			 G_CALLBACK(bar_pane_keywords_edit_destroy_cb), cdd);
 
 
-	generic_dialog_add_message(gd, NULL, name ? _("Configure keyword") : _("New keyword"), NULL);
+	generic_dialog_add_message(gd, NULL, name ? _("Configure keyword") : _("New keyword"), NULL, FALSE);
 
 	generic_dialog_add_button(gd, GTK_STOCK_OK, NULL,
 				  bar_pane_keywords_edit_ok_cb, TRUE);
diff -r e2c53828af57 -r c6f9494f6be1 src/bar_sort.c
--- a/src/bar_sort.c	Thu Aug 31 11:38:26 2017 +0100
+++ b/src/bar_sort.c	Wed Sep 06 11:59:47 2017 +0100
@@ -560,7 +560,7 @@
 				       bar_sort_add_cancel_cb, sd);
 	file_dialog_add_button(sd->dialog, GTK_STOCK_OK, NULL, bar_sort_add_ok_cb, TRUE);
 
-	generic_dialog_add_message(GENERIC_DIALOG(sd->dialog), NULL, title, NULL);
+	generic_dialog_add_message(GENERIC_DIALOG(sd->dialog), NULL, title, NULL, FALSE);
 
 	if (sd->mode == BAR_SORT_MODE_FOLDER)
 		{
diff -r e2c53828af57 -r c6f9494f6be1 src/cache_maint.c
--- a/src/cache_maint.c	Thu Aug 31 11:38:26 2017 +0100
+++ b/src/cache_maint.c	Wed Sep 06 11:59:47 2017 +0100
@@ -332,7 +332,7 @@
 	cm->button_stop = generic_dialog_add_button(cm->gd, GTK_STOCK_STOP, NULL,
 						    cache_maintain_home_stop_cb, FALSE);
 
-	generic_dialog_add_message(cm->gd, NULL, msg, NULL);
+	generic_dialog_add_message(cm->gd, NULL, msg, NULL, FALSE);
 	gtk_window_set_default_size(GTK_WINDOW(cm->gd->dialog), PURGE_DIALOG_WIDTH, -1);
 
 	hbox = gtk_hbox_new(FALSE, 0);
@@ -807,7 +807,7 @@
 						    cache_manager_render_stop_cb, FALSE);
 	gtk_widget_set_sensitive(cd->button_stop, FALSE);
 
-	generic_dialog_add_message(cd->gd, NULL, _("Create thumbnails"), NULL);
+	generic_dialog_add_message(cd->gd, NULL, _("Create thumbnails"), NULL, FALSE);
 
 	hbox = pref_box_new(cd->gd->vbox, FALSE, GTK_ORIENTATION_HORIZONTAL, 0);
 	pref_spacer(hbox, PREF_PAD_INDENT);
@@ -1066,7 +1066,7 @@
 						    cache_manager_standard_clean_stop_cb, FALSE);
 	gtk_widget_set_sensitive(cd->button_stop, FALSE);
 
-	generic_dialog_add_message(cd->gd, stock_id, msg, NULL);
+	generic_dialog_add_message(cd->gd, stock_id, msg, NULL, FALSE);
 
 	cd->progress = gtk_progress_bar_new();
 	gtk_progress_bar_set_text(GTK_PROGRESS_BAR(cd->progress), _("click start to begin"));
@@ -1132,7 +1132,7 @@
 				"clear_cache", parent, TRUE,
 				dummy_cancel_cb, NULL);
 	generic_dialog_add_message(gd, GTK_STOCK_DIALOG_QUESTION, _("Clear cache"),
-				   _("This will remove all thumbnails that have\nbeen saved to disk, continue?"));
+				   _("This will remove all thumbnails that have\nbeen saved to disk, continue?"), TRUE);
 	generic_dialog_add_button(gd, GTK_STOCK_OK, NULL, cache_manager_main_clear_ok_cb, TRUE);
 
 	gtk_widget_show(gd->dialog);
@@ -1214,7 +1214,7 @@
 	generic_dialog_add_button(gd, GTK_STOCK_HELP, NULL,
 				  cache_manager_help_cb, FALSE);
 
-	generic_dialog_add_message(gd, NULL, _("Cache and Data Maintenance"), NULL);
+	generic_dialog_add_message(gd, NULL, _("Cache and Data Maintenance"), NULL, FALSE);
 
 	sizegroup = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
 
diff -r e2c53828af57 -r c6f9494f6be1 src/collect-dlg.c
--- a/src/collect-dlg.c	Thu Aug 31 11:38:26 2017 +0100
+++ b/src/collect-dlg.c	Wed Sep 06 11:59:47 2017 +0100
@@ -79,7 +79,7 @@
 					collection_confirm_cancel_cb, fd);
 
 		generic_dialog_add_message(gd, GTK_STOCK_DIALOG_QUESTION,
-					   _("Overwrite existing file?"), fd->dest_path);
+					   _("Overwrite existing file?"), fd->dest_path, TRUE);
 
 		generic_dialog_add_button(gd, GTK_STOCK_OK, _("_Overwrite"), collection_confirm_ok_cb, TRUE);
 
@@ -229,7 +229,7 @@
 	fd = file_util_file_dlg(title, "dlg_collection", parent,
 			     collection_save_or_load_dialog_close_cb, cd);
 
-	generic_dialog_add_message(GENERIC_DIALOG(fd), NULL, title, NULL);
+	generic_dialog_add_message(GENERIC_DIALOG(fd), NULL, title, NULL, TRUE);
 	file_dialog_add_button(fd, stock_id, btntext, btnfunc, TRUE);
 
 	file_dialog_add_path_widgets(fd, get_collections_dir(), path,
diff -r e2c53828af57 -r c6f9494f6be1 src/collect.c
--- a/src/collect.c	Thu Aug 31 11:38:26 2017 +0100
+++ b/src/collect.c	Wed Sep 06 11:59:47 2017 +0100
@@ -1165,7 +1165,7 @@
 				collection_close_cancel_cb, cw);
 	generic_dialog_add_message(gd, GTK_STOCK_DIALOG_QUESTION,
 				   _("Close collection"),
-				   _("Collection has been modified.\nSave first?"));
+				   _("Collection has been modified.\nSave first?"), TRUE);
 
 	generic_dialog_add_button(gd, GTK_STOCK_SAVE, NULL, collection_close_save_cb, TRUE);
 	generic_dialog_add_button(gd, GTK_STOCK_DELETE, _("_Discard"), collection_close_close_cb, FALSE);
diff -r e2c53828af57 -r c6f9494f6be1 src/desktop_file.c
--- a/src/desktop_file.c	Thu Aug 31 11:38:26 2017 +0100
+++ b/src/desktop_file.c	Wed Sep 06 11:59:47 2017 +0100
@@ -350,7 +350,7 @@
 
 		text = g_strdup_printf(_("About to delete the file:\n %s"), path);
 		generic_dialog_add_message(ewl->gd, GTK_STOCK_DIALOG_QUESTION,
-					   _("Delete file"), text);
+					   _("Delete file"), text, TRUE);
 		g_free(text);
 
 		gtk_widget_show(ewl->gd->dialog);
diff -r e2c53828af57 -r c6f9494f6be1 src/editors.c
--- a/src/editors.c	Thu Aug 31 11:38:26 2017 +0100
+++ b/src/editors.c	Wed Sep 06 11:59:47 2017 +0100
@@ -537,7 +537,7 @@
 				   NULL, FALSE,
 				   NULL, ed);
 	buf = g_strdup_printf(_("Output of %s"), text);
-	generic_dialog_add_message(vd->gd, NULL, buf, NULL);
+	generic_dialog_add_message(vd->gd, NULL, buf, NULL, TRUE);
 	g_free(buf);
 	vd->button_stop = generic_dialog_add_button(vd->gd, GTK_STOCK_STOP, NULL,
 						   editor_verbose_window_stop, FALSE);
diff -r e2c53828af57 -r c6f9494f6be1 src/layout_util.c
--- a/src/layout_util.c	Thu Aug 31 11:38:26 2017 +0100
+++ b/src/layout_util.c	Wed Sep 06 11:59:47 2017 +0100
@@ -524,7 +524,7 @@
 			gd = generic_dialog_new(_("Image orientation"),
 			"Image orientation", NULL, TRUE, NULL, NULL);
 			generic_dialog_add_message(gd, GTK_STOCK_DIALOG_ERROR,
-			"Image orientation", message->str);
+			"Image orientation", message->str, TRUE);
 			generic_dialog_add_button(gd, GTK_STOCK_OK, NULL, NULL, TRUE);
 
 			gtk_widget_show(gd->dialog);
diff -r e2c53828af57 -r c6f9494f6be1 src/main.c
--- a/src/main.c	Thu Aug 31 11:38:26 2017 +0100
+++ b/src/main.c	Wed Sep 06 11:59:47 2017 +0100
@@ -721,7 +721,7 @@
 	g_free(msg);
 	msg = g_strdup_printf(_("Quit %s"), GQ_APPNAME);
 	generic_dialog_add_message(exit_dialog, GTK_STOCK_DIALOG_QUESTION,
-				   msg, _("Collections have been modified. Quit anyway?"));
+				   msg, _("Collections have been modified. Quit anyway?"), TRUE);
 	g_free(msg);
 	generic_dialog_add_button(exit_dialog, GTK_STOCK_QUIT, NULL, exit_confirm_exit_cb, TRUE);
 
diff -r e2c53828af57 -r c6f9494f6be1 src/pan-view/pan-view.c
--- a/src/pan-view/pan-view.c	Thu Aug 31 11:38:26 2017 +0100
+++ b/src/pan-view/pan-view.c	Wed Sep 06 11:59:47 2017 +0100
@@ -1996,7 +1996,7 @@
 					 _("Pan view performance may be poor."),
 					 _("To improve performance of thumbnails in the pan view the"
 					   " following options can be enabled. Note that both options"
-					   " must be enabled to notice a change in performance."));
+					   " must be enabled to notice a change in performance."), TRUE);
 
 	group = pref_box_new(box, FALSE, GTK_ORIENTATION_HORIZONTAL, 0);
 	pref_spacer(group, PREF_PAD_INDENT);
diff -r e2c53828af57 -r c6f9494f6be1 src/preferences.c
--- a/src/preferences.c	Thu Aug 31 11:38:26 2017 +0100
+++ b/src/preferences.c	Wed Sep 06 11:59:47 2017 +0100
@@ -991,7 +991,7 @@
 				"reset_filter", widget, TRUE,
 				dummy_cancel_cb, data);
 	generic_dialog_add_message(gd, GTK_STOCK_DIALOG_QUESTION, _("Reset filters"),
-				   _("This will reset the file filters to the defaults.\nContinue?"));
+				   _("This will reset the file filters to the defaults.\nContinue?"), TRUE);
 	generic_dialog_add_button(gd, GTK_STOCK_OK, NULL, filter_default_ok_cb, TRUE);
 	gtk_widget_show(gd->dialog);
 }
@@ -1022,7 +1022,7 @@
 				"clear_trash", widget, TRUE,
 				dummy_cancel_cb, NULL);
 	generic_dialog_add_message(gd, GTK_STOCK_DIALOG_QUESTION, _("Clear trash"),
-				    _("This will remove the trash contents."));
+				    _("This will remove the trash contents."), FALSE);
 	generic_dialog_add_button(gd, GTK_STOCK_OK, NULL, safe_delete_clear_ok_cb, TRUE);
 	entry = gtk_entry_new();
 	gtk_widget_set_can_focus(entry, FALSE);
@@ -1070,7 +1070,7 @@
 				"reset_image_overlay_template_string", widget, TRUE,
 				dummy_cancel_cb, data);
 	generic_dialog_add_message(gd, GTK_STOCK_DIALOG_QUESTION, _("Reset image overlay template string"),
-				   _("This will reset the image overlay template string to the default.\nContinue?"));
+				   _("This will reset the image overlay template string to the default.\nContinue?"), TRUE);
 	generic_dialog_add_button(gd, GTK_STOCK_OK, NULL, image_overlay_default_template_ok_cb, TRUE);
 	gtk_widget_show(gd->dialog);
 }
diff -r e2c53828af57 -r c6f9494f6be1 src/print.c
--- a/src/print.c	Thu Aug 31 11:38:26 2017 +0100
+++ b/src/print.c	Wed Sep 06 11:59:47 2017 +0100
@@ -1976,7 +1976,7 @@
 	generic_dialog_add_button(gd, GTK_STOCK_OK, NULL, NULL, TRUE);
 
 	buf = g_strdup_printf(_("An error occured printing to %s."), print_output_name(pw->output));
-	generic_dialog_add_message(gd, GTK_STOCK_DIALOG_ERROR, _("Printing error"), buf);
+	generic_dialog_add_message(gd, GTK_STOCK_DIALOG_ERROR, _("Printing error"), buf, TRUE);
 	g_free(buf);
 
 	group = pref_group_new(gd->vbox, FALSE, _("Details"), GTK_ORIENTATION_VERTICAL);
@@ -2599,7 +2599,7 @@
 					   print_job_cancel_cb, pw);
 
 	msg = g_strdup_printf(_("Printing %d pages to %s."), print_layout_page_count(pw), print_output_name(pw->output));
-	generic_dialog_add_message(pw->job_dialog, NULL, msg, NULL);
+	generic_dialog_add_message(pw->job_dialog, NULL, msg, NULL, TRUE);
 	g_free(msg);
 
 	if (pw->job_output == PRINT_OUTPUT_PS_FILE ||
diff -r e2c53828af57 -r c6f9494f6be1 src/shortcuts.c
--- a/src/shortcuts.c	Thu Aug 31 11:38:26 2017 +0100
+++ b/src/shortcuts.c	Wed Sep 06 11:59:47 2017 +0100
@@ -100,7 +100,7 @@
 					shortcuts_add_cancel_cb, scd);
 	file_dialog_add_button(scd->dialog, GTK_STOCK_OK, NULL, shortcuts_add_ok_cb, TRUE);
 
-	generic_dialog_add_message(GENERIC_DIALOG(scd->dialog), NULL, title, NULL);
+	generic_dialog_add_message(GENERIC_DIALOG(scd->dialog), NULL, title, NULL, FALSE);
 
 	file_dialog_add_path_widgets(scd->dialog, NULL, NULL, "add_shortcuts", NULL, NULL);
 
diff -r e2c53828af57 -r c6f9494f6be1 src/ui_bookmark.c
--- a/src/ui_bookmark.c	Thu Aug 31 11:38:26 2017 +0100
+++ b/src/ui_bookmark.c	Wed Sep 06 11:59:47 2017 +0100
@@ -288,7 +288,7 @@
 	g_signal_connect(G_OBJECT(gd->dialog), "destroy",
 			 G_CALLBACK(bookmark_edit_destroy_cb), p);
 
-	generic_dialog_add_message(gd, NULL, _("Edit Bookmark"), NULL);
+	generic_dialog_add_message(gd, NULL, _("Edit Bookmark"), NULL, FALSE);
 
 	generic_dialog_add_button(gd, GTK_STOCK_OK, NULL,
 				  bookmark_edit_ok_cb, TRUE);
diff -r e2c53828af57 -r c6f9494f6be1 src/ui_fileops.c
--- a/src/ui_fileops.c	Thu Aug 31 11:38:26 2017 +0100
+++ b/src/ui_fileops.c	Wed Sep 06 11:59:47 2017 +0100
@@ -108,7 +108,7 @@
 	generic_dialog_add_button(gd, GTK_STOCK_CLOSE, NULL, NULL, TRUE);
 
 	generic_dialog_add_message(gd, GTK_STOCK_DIALOG_WARNING,
-				   _("Filename encoding locale mismatch"), string->str);
+				   _("Filename encoding locale mismatch"), string->str, TRUE);
 
 	gtk_widget_show(gd->dialog);
 
diff -r e2c53828af57 -r c6f9494f6be1 src/ui_pathsel.c
--- a/src/ui_pathsel.c	Thu Aug 31 11:38:26 2017 +0100
+++ b/src/ui_pathsel.c	Wed Sep 06 11:59:47 2017 +0100
@@ -542,7 +542,7 @@
 
 	text = g_strdup_printf(_("About to delete the file:\n %s"), path);
 	generic_dialog_add_message(dd->gd, GTK_STOCK_DIALOG_QUESTION,
-				   _("Delete file"), text);
+				   _("Delete file"), text, TRUE);
 	g_free(text);
 
 	gtk_widget_show(dd->gd->dialog);
diff -r e2c53828af57 -r c6f9494f6be1 src/ui_tabcomp.c
--- a/src/ui_tabcomp.c	Thu Aug 31 11:38:26 2017 +0100
+++ b/src/ui_tabcomp.c	Wed Sep 06 11:59:47 2017 +0100
@@ -936,7 +936,7 @@
 	file_dialog_add_button(td->fd, GTK_STOCK_OK, NULL,
 				 tab_completion_select_ok_cb, TRUE);
 
-	generic_dialog_add_message(GENERIC_DIALOG(td->fd), NULL, title, NULL);
+	generic_dialog_add_message(GENERIC_DIALOG(td->fd), NULL, title, NULL, TRUE);
 
 	path = gtk_entry_get_text(GTK_ENTRY(td->entry));
 	if (strlen(path) == 0) path = NULL;
diff -r e2c53828af57 -r c6f9494f6be1 src/ui_utildlg.c
--- a/src/ui_utildlg.c	Thu Aug 31 11:38:26 2017 +0100
+++ b/src/ui_utildlg.c	Wed Sep 06 11:59:47 2017 +0100
@@ -181,14 +181,25 @@
 	return button;
 }
 
+/**
+ * @brief 
+ * @param gd 
+ * @param icon_stock_id 
+ * @param heading 
+ * @param text 
+ * @param expand Used as the "expand" and "fill" parameters in the eventual call to gtk_box_pack_start() 
+ * @returns 
+ * 
+ * 
+ */
 GtkWidget *generic_dialog_add_message(GenericDialog *gd, const gchar *icon_stock_id,
-				      const gchar *heading, const gchar *text)
+				      const gchar *heading, const gchar *text, gboolean expand)
 {
 	GtkWidget *hbox;
 	GtkWidget *vbox;
 	GtkWidget *label;
 
-	hbox = pref_box_new(gd->vbox, TRUE, GTK_ORIENTATION_HORIZONTAL, PREF_PAD_SPACE);
+	hbox = pref_box_new(gd->vbox, expand, GTK_ORIENTATION_HORIZONTAL, PREF_PAD_SPACE);
 	if (icon_stock_id)
 		{
 		GtkWidget *image;
@@ -321,7 +332,7 @@
 	gd = generic_dialog_new(heading, "warning", parent, TRUE, NULL, NULL);
 	generic_dialog_add_button(gd, GTK_STOCK_OK, NULL, warning_dialog_ok_cb, TRUE);
 
-	generic_dialog_add_message(gd, icon_stock_id, heading, text);
+	generic_dialog_add_message(gd, icon_stock_id, heading, text, TRUE);
 
 	gtk_widget_show(gd->dialog);
 
diff -r e2c53828af57 -r c6f9494f6be1 src/ui_utildlg.h
--- a/src/ui_utildlg.h	Thu Aug 31 11:38:26 2017 +0100
+++ b/src/ui_utildlg.h	Wed Sep 06 11:59:47 2017 +0100
@@ -71,7 +71,7 @@
 void generic_dialog_attach_default(GenericDialog *gd, GtkWidget *widget);
 
 GtkWidget *generic_dialog_add_message(GenericDialog *gd, const gchar *icon_stock_id,
-				      const gchar *heading, const gchar *text);
+				      const gchar *heading, const gchar *text, gboolean expand);
 
 gboolean generic_dialog_get_alternative_button_order(GtkWidget *widget);
 
diff -r e2c53828af57 -r c6f9494f6be1 src/utilops.c
--- a/src/utilops.c	Thu Aug 31 11:38:26 2017 +0100
+++ b/src/utilops.c	Wed Sep 06 11:59:47 2017 +0100
@@ -202,7 +202,7 @@
 	GenericDialog *gd;
 
 	gd = file_util_gen_dlg(heading, "warning", parent, TRUE, NULL, NULL);
-	generic_dialog_add_message(gd, icon_stock_id, heading, message);
+	generic_dialog_add_message(gd, icon_stock_id, heading, message, TRUE);
 	generic_dialog_add_button(gd, GTK_STOCK_OK, NULL, file_util_warning_dialog_ok_cb, TRUE);
 	if (options->place_dialogs_under_mouse)
 		{
@@ -592,7 +592,7 @@
 					      NULL, TRUE,
 					      file_util_abort_cb, ud);
 
-			generic_dialog_add_message(d, GTK_STOCK_DIALOG_WARNING, NULL, msg->str);
+			generic_dialog_add_message(d, GTK_STOCK_DIALOG_WARNING, NULL, msg->str, TRUE);
 
 			generic_dialog_add_button(d, GTK_STOCK_GO_FORWARD, _("Co_ntinue"),
 						  file_util_resume_cb, TRUE);
@@ -1025,7 +1025,7 @@
 					ud->parent, TRUE,
 					file_util_check_abort_cb, ud);
 
-		generic_dialog_add_message(d, GTK_STOCK_DIALOG_WARNING, _("Really continue?"), desc);
+		generic_dialog_add_message(d, GTK_STOCK_DIALOG_WARNING, _("Really continue?"), desc, TRUE);
 
 		generic_dialog_add_button(d, GTK_STOCK_GO_FORWARD, _("Co_ntinue"),
 					  file_util_check_resume_cb, TRUE);
@@ -1039,7 +1039,7 @@
 		d = file_util_gen_dlg(ud->messages.title, "dlg_confirm",
 					ud->parent, TRUE,
 					file_util_check_abort_cb, ud);
-		generic_dialog_add_message(d, GTK_STOCK_DIALOG_WARNING, _("This operation can't continue:"), desc);
+		generic_dialog_add_message(d, GTK_STOCK_DIALOG_WARNING, _("This operation can't continue:"), desc, TRUE);
 
 		gtk_widget_show(d->dialog);
 		}
@@ -1152,7 +1152,7 @@
 		d = file_util_gen_dlg(ud->messages.title, "dlg_confirm",
 					ud->parent, TRUE,
 					file_util_check_abort_cb, ud);
-		generic_dialog_add_message(d, GTK_STOCK_DIALOG_WARNING, _("This operation can't continue:"), desc);
+		generic_dialog_add_message(d, GTK_STOCK_DIALOG_WARNING, _("This operation can't continue:"), desc, TRUE);
 
 		gtk_widget_show(d->dialog);
 		ud->phase = UTILITY_PHASE_START;
@@ -1511,7 +1511,7 @@
 
 	box = generic_dialog_add_message(ud->gd, GTK_STOCK_DIALOG_QUESTION,
 					 ud->messages.question,
-					 dir_msg);
+					 dir_msg, TRUE);
 
 	g_free(dir_msg);
 
@@ -1558,7 +1558,7 @@
 
 	ud->fdlg = fdlg;
 
-	generic_dialog_add_message(GENERIC_DIALOG(fdlg), NULL, ud->messages.question, NULL);
+	generic_dialog_add_message(GENERIC_DIALOG(fdlg), NULL, ud->messages.question, NULL, FALSE);
 
 	label = pref_label_new(GENERIC_DIALOG(fdlg)->vbox, _("Choose the destination folder."));
 	gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5);
@@ -1606,7 +1606,7 @@
 	ud->gd = file_util_gen_dlg(ud->messages.title, "dlg_confirm",
 				   ud->parent, FALSE,  file_util_cancel_cb, ud);
 
-	box = generic_dialog_add_message(ud->gd, NULL, ud->messages.question, NULL);
+	box = generic_dialog_add_message(ud->gd, NULL, ud->messages.question, NULL, TRUE);
 
 	if (ud->discard_func) generic_dialog_add_button(ud->gd, GTK_STOCK_REVERT_TO_SAVED, _("Discard changes"), file_util_discard_cb, FALSE);
 	if (ud->details_func) generic_dialog_add_button(ud->gd, GTK_STOCK_INFO, _("File details"), file_util_details_cb, FALSE);
@@ -1981,7 +1981,7 @@
 
 	message = file_util_details_get_message(ud, fd, &stock_id);
 
-	box = generic_dialog_add_message(gd, stock_id, _("File details"), message);
+	box = generic_dialog_add_message(gd, stock_id, _("File details"), message, TRUE);
 
 	generic_dialog_add_image(gd, box, fd, NULL, FALSE, NULL, NULL, FALSE);
 
@@ -2037,7 +2037,7 @@
 		message2 = g_strdup_printf(_("The following metadata tags will be written to the image file itself."));
 		}
 
-	box = generic_dialog_add_message(gd, stock_id, _("Overview of changed metadata"), message1);
+	box = generic_dialog_add_message(gd, stock_id, _("Overview of changed metadata"), message1, TRUE);
 
 	box = pref_group_new(box, TRUE, message2, GTK_ORIENTATION_HORIZONTAL);
 
@@ -2637,7 +2637,7 @@
 					fd->path);
 		box = generic_dialog_add_message(gd, GTK_STOCK_DIALOG_WARNING,
 						 _("Folder contains subfolders"),
-						 text);
+						 text, TRUE);
 		g_free(text);
 
 		box = pref_group_new(box, TRUE, _("Subfolders:"), GTK_ORIENTATION_VERTICAL);