From 0ff46db15adcb07aa8c19369f88955b3af558107 Mon Sep 17 00:00:00 2001
From: Christian Persch <chpe@cvs.gnome.org>
Date: Tue, 18 Jul 2006 17:57:41 +0000
Subject: Force label wrapping.

2006-07-18  Christian Persch  <chpe@cvs.gnome.org>

	* embed/mozilla/EphyPromptService.cpp:

	Force label wrapping.
---
 ChangeLog                           | 6 ++++++
 embed/mozilla/EphyPromptService.cpp | 5 +++++
 2 files changed, 11 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 1f97e7d68..0974185d3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-07-18  Christian Persch  <chpe@cvs.gnome.org>
+
+	* embed/mozilla/EphyPromptService.cpp:
+
+	Force label wrapping.
+
 2006-07-14  Christian Persch  <chpe@cvs.gnome.org>
 
 	* data/mime-types-permissions.xml:
diff --git a/embed/mozilla/EphyPromptService.cpp b/embed/mozilla/EphyPromptService.cpp
index 6aa33e5d9..6319b95f6 100644
--- a/embed/mozilla/EphyPromptService.cpp
+++ b/embed/mozilla/EphyPromptService.cpp
@@ -47,6 +47,7 @@
 #include <glib-object.h>
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
+#include <gtk/gtkversion.h>
 
 #include "ephy-embed-shell.h"
 #include "ephy-gui.h"
@@ -188,6 +189,10 @@ Prompter::Prompter (const char *aStock,
 	g_free (text);
 
 	gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
+#if GTK_CHECK_VERSION (2, 10, 0)
+	/* Guard against overlong nonbreakable text (exploit) */
+	gtk_label_set_line_wrap_mode (GTK_LABEL (label), PANGO_WRAP_WORD_CHAR);
+#endif
 	gtk_label_set_selectable (GTK_LABEL (label), TRUE);
 	gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.0);
 
-- 
cgit v1.2.1