Fix bug #2286: Folow TCP stream window [needs line wrapping turned back on]

wrapped lines

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@24742 f5534014-38df-0310-8fa8-9805f1628bb7

diff --git a/gtk/follow_stream.c b/gtk/follow_stream.c
index a05e4f0442f5833fbd28383655902ffd388c157e..9ede92d6afb052e4a0e89e33f6b8261142557f9a 100644 (file)
--- a/gtk/follow_stream.c
+++ b/gtk/follow_stream.c
@@ -58,6 +58,14 @@
 #include <unistd.h>
 #endif
 
+/* This is backwards-compatibility code for old versions of GTK+ (2.2.1 and
+ * earlier).  It defines the new wrap behavior (unknown in earlier versions)
+ * as the old (slightly buggy) wrap behavior.
+ */
+#ifndef GTK_WRAP_WORD_CHAR
+#define GTK_WRAP_WORD_CHAR GTK_WRAP_WORD
+#endif
+
 /* static variable declarations to speed up the performance
  * of follow_load_text and follow_add_to_gtk_text
  */
@@ -780,6 +788,7 @@ follow_stream(gchar *title, follow_info_t *follow_info,
 #else
        text = gtk_text_view_new();
        gtk_text_view_set_editable(GTK_TEXT_VIEW(text), FALSE);
+       gtk_text_view_set_wrap_mode(GTK_TEXT_VIEW(text), GTK_WRAP_WORD_CHAR);
 #endif
        gtk_container_add(GTK_CONTAINER(txt_scrollw), text);
        follow_info->text = text;

diff --git a/gtk/follow_tcp.c b/gtk/follow_tcp.c
index 71c5e8177cfc1e79ff691966fd01424da951ada8..665b5e629c98ee29e01bcacce714f8b255301c01 100644 (file)
--- a/gtk/follow_tcp.c
+++ b/gtk/follow_tcp.c
@@ -71,14 +71,6 @@
 
 #include "follow_stream.h"
 
-/* This is backwards-compatibility code for old versions of GTK+ (2.2.1 and
- * earlier).  It defines the new wrap behavior (unknown in earlier versions)
- * as the old (slightly buggy) wrap behavior.
- */
-#ifndef GTK_WRAP_WORD_CHAR
-#define GTK_WRAP_WORD_CHAR GTK_WRAP_WORD
-#endif
-
 /* With MSVC and a libwireshark.dll, we need a special declaration. */
 WS_VAR_IMPORT FILE *data_out_file;