Fix build by #if 0 out unused de_sgsap_tmsi() function.
[obnox/wireshark/wip.git] / gtk / follow_ssl.c
index 03a66c0536d2689b8cd12737b8592bca54063274..e7c74ec114b287eed7884e862369b24f9c37bef2 100644 (file)
 #include <epan/tap.h>
 
 #include <../color.h>
-#include <../globals.h>
 #include <../alert_box.h>
 #include <../simple_dialog.h>
 #include <../util.h>
 
+#include "gtkglobals.h"
 #include <gtk/color_utils.h>
 #include <gtk/main.h>
 #include <gtk/dlg_utils.h>
@@ -61,6 +61,7 @@
 #include <gtk/font_utils.h>
 #include "gtk/follow_ssl.h"
 #include "gtk/follow_stream.h"
+#include "gtk/utf8_entities.h"
 
 #ifdef SSL_PLUGIN
 #include "packet-ssl-utils.h"
@@ -137,9 +138,9 @@ packet_is_ssl(epan_dissect_t* edt);
    a dissection routine on belongs (this might be the most recently
    selected packet, or it might be the last packet in the file). */
 void
-follow_ssl_stream_cb(GtkWidget * w, gpointer data _U_)
+follow_ssl_stream_cb(GtkWidget * w _U_, gpointer data _U_)
 {
-    GtkWidget  *filter_te;
+    GtkWidget  *filter_te, *filter_cm;
     gchar      *follow_filter;
     const gchar        *previous_filter;
     int                filter_out_filter_len, previous_filter_len;
@@ -177,7 +178,8 @@ follow_ssl_stream_cb(GtkWidget * w, gpointer data _U_)
     }
 
     /* Set the display filter entry accordingly */
-    filter_te = g_object_get_data(G_OBJECT(w), E_DFILTER_TE_KEY);
+       filter_cm = g_object_get_data(G_OBJECT(top_level), E_DFILTER_CM_KEY);
+       filter_te = gtk_bin_get_child(GTK_BIN(filter_cm));
 
     /* needed in follow_filter_out_stream(), is there a better way? */
     follow_info->filter_te = filter_te;
@@ -251,25 +253,25 @@ follow_ssl_stream_cb(GtkWidget * w, gpointer data _U_)
 
     if(follow_info->client_port == stats.port[0]) {
            server_to_client_string =
-                   g_strdup_printf("%s:%s --> %s:%s (%u bytes)",
+                   g_strdup_printf("%s:%s " UTF8_RIGHTWARDS_ARROW " %s:%s (%u bytes)",
                                    hostname0, port0,
                                    hostname1, port1,
                                    follow_info->bytes_written[0]);
 
            client_to_server_string =
-                   g_strdup_printf("%s:%s --> %s:%s (%u bytes)",
+                   g_strdup_printf("%s:%s " UTF8_RIGHTWARDS_ARROW " %s:%s (%u bytes)",
                                    hostname1, port1,
                                    hostname0, port0,
                                    follow_info->bytes_written[1]);
     } else {
            server_to_client_string =
-                   g_strdup_printf("%s:%s --> %s:%s (%u bytes)",
+                   g_strdup_printf("%s:%s " UTF8_RIGHTWARDS_ARROW " %s:%s (%u bytes)",
                                    hostname1, port1,
                                    hostname0, port0,
                                    follow_info->bytes_written[0]);
 
            client_to_server_string =
-                   g_strdup_printf("%s:%s --> %s:%s (%u bytes)",
+                   g_strdup_printf("%s:%s " UTF8_RIGHTWARDS_ARROW " %s:%s (%u bytes)",
                                    hostname0, port0,
                                    hostname1, port1,
                                    follow_info->bytes_written[1]);