summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Persch <chpe@cvs.gnome.org>2006-07-18 17:58:46 +0000
committerChristian Persch <chpe@src.gnome.org>2006-07-18 17:58:46 +0000
commit1ed16c225c589166e934ad88900e4f49afc2b67d (patch)
tree1ddfbc176d50e3ed63e30d99b0cd54f405cebf3d
parentd8491bc7af1db8e0698502b4c9a99d5119ed183e (diff)
downloadepiphany-gnome-2-12-plus.tar.gz
Force label wrapping.gnome-2-12-plus
2006-07-18 Christian Persch <chpe@cvs.gnome.org> * embed/mozilla/EphyPromptService.cpp: Force label wrapping.
-rw-r--r--ChangeLog6
-rw-r--r--embed/mozilla/EphyPromptService.cpp5
2 files changed, 11 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 5140a5ba5..3131d2812 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
=== THIS BRANCH IS DEAD! ===
+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>
* src/bookmarks/ephy-favorites-menu.c:
diff --git a/embed/mozilla/EphyPromptService.cpp b/embed/mozilla/EphyPromptService.cpp
index 357029590..b68f94c4f 100644
--- a/embed/mozilla/EphyPromptService.cpp
+++ b/embed/mozilla/EphyPromptService.cpp
@@ -46,6 +46,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"
@@ -187,6 +188,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);