And finally (I hope) the last part from the patch

[obnox/wireshark/wip.git] / gtk / ldap_stat.c

diff --git a/gtk/ldap_stat.c b/gtk/ldap_stat.c
index 189ab46f7af7600ca7af6359bf448680c2c04ef3..2b6e638a4382b5752f0fb9f2ec667b82975ef12b 100644 (file)
--- a/gtk/ldap_stat.c
+++ b/gtk/ldap_stat.c
@@ -39,7 +39,7 @@
 #include <epan/value_string.h>
 
 #include "tap_menu.h"
-#include "../tap.h"
+#include <epan/tap.h>
 #include <epan/dissectors/packet-ldap.h>
 #include "../register.h"
 #include "../timestats.h"
@@ -49,7 +49,7 @@
 #include "dlg_utils.h"
 #include "../file.h"
 #include "../globals.h"
-#include "filter_prefs.h"
+#include "filter_dlg.h"
 #include "service_response_time_table.h"
 #include "gtkglobals.h"
 
@@ -81,9 +81,9 @@ ldapstat_reset(void *pldap)
 }
 
 static int
-ldapstat_packet(void *pldap, packet_info *pinfo, epan_dissect_t *edt _U_, void *psi)
+ldapstat_packet(void *pldap, packet_info *pinfo, epan_dissect_t *edt _U_, const void *psi)
 {
-       ldap_call_response_t *ldap=(ldap_call_response_t *)psi;
+       const ldap_call_response_t *ldap=psi;
        ldapstat_t *fs=(ldapstat_t *)pldap;
 
        /* we are only interested in reply packets */
@@ -231,7 +231,7 @@ gtk_ldapstat_init(char *optarg)
     gtk_widget_show_all(ldap->win);
     window_present(ldap->win);
        
-    retap_packets(&cfile);
+    cf_retap_packets(&cfile);
 }
 
 
@@ -249,10 +249,10 @@ static void
 ldapstat_start_button_clicked(GtkWidget *item _U_, gpointer data _U_)
 {
        GString *str;
-       char *filter;
+       const char *filter;
 
        str = g_string_new("ldap,srt");
-       filter=(char *)gtk_entry_get_text(GTK_ENTRY(filter_entry));
+       filter=gtk_entry_get_text(GTK_ENTRY(filter_entry));
        if(filter[0]!=0){
                g_string_sprintfa(str,",%s", filter);
        }