From Thomas Dreibholz:

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

diff --git a/gtk/ldap_stat.c b/gtk/ldap_stat.c
index 6bfc24c08f9a919630186a7098a8a53be43caa2e..7d628a3fbc52d9f325b3a40183bd05963e51513b 100644 (file)
--- a/gtk/ldap_stat.c
+++ b/gtk/ldap_stat.c
@@ -37,23 +37,22 @@
 #include <epan/packet_info.h>
 #include <epan/epan.h>
 #include <epan/value_string.h>
-
 #include <epan/tap.h>
 #include <epan/dissectors/packet-ldap.h>
-#include "../register.h"
+
 #include "../timestats.h"
-#include "compat_macros.h"
 #include "../simple_dialog.h"
-#include "gui_utils.h"
-#include "dlg_utils.h"
 #include "../file.h"
-#include "../globals.h"
-#include "filter_dlg.h"
-#include "service_response_time_table.h"
 #include "../stat_menu.h"
-#include "../tap_dfilter_dlg.h"
-#include "gtkglobals.h"
 
+#include "gtk/gui_utils.h"
+#include "gtk/dlg_utils.h"
+#include "gtk/service_response_time_table.h"
+#include "gtk/tap_param_dlg.h"
+#include "gtk/gtkglobals.h"
+#include "gtk/main.h"
+
+#include "gtk/old-gtk-compat.h"
 
 /* used to keep track of the statistics for an entire program interface */
 typedef struct _ldapstat_t {
@@ -92,7 +91,7 @@ ldapstat_packet(void *pldap, packet_info *pinfo, epan_dissect_t *edt _U_, const
                return 0;
        }
        /* if we havnt seen the request, just ignore it */
-       if(!ldap->req_frame){ 
+       if(!ldap->req_frame){
                return 0;
        }
 
@@ -127,8 +126,6 @@ ldapstat_draw(void *pldap)
 }
 
 
-void protect_thread_critical_region(void);
-void unprotect_thread_critical_region(void);
 static void
 win_destroy_cb(GtkWindow *win _U_, gpointer data)
 {
@@ -149,7 +146,7 @@ gtk_ldapstat_init(const char *optarg, void *userdata _U_)
        ldapstat_t *ldap;
        const char *filter=NULL;
        GtkWidget *label;
-       char filter_string[256];
+       char *filter_string;
        GString *error_string;
        GtkWidget *vbox;
        GtkWidget *bbox;
@@ -163,7 +160,8 @@ gtk_ldapstat_init(const char *optarg, void *userdata _U_)
 
        ldap=g_malloc(sizeof(ldapstat_t));
 
-       ldap->win=window_new(GTK_WINDOW_TOPLEVEL, "ldap-stat");
+       ldap->win = dlg_window_new("ldap-stat");
+       gtk_window_set_destroy_with_parent (GTK_WINDOW(ldap->win), TRUE);
        gtk_window_set_default_size(GTK_WINDOW(ldap->win), 550, 400);
        ldapstat_set_title(ldap);
 
@@ -174,8 +172,10 @@ gtk_ldapstat_init(const char *optarg, void *userdata _U_)
        label=gtk_label_new("LDAP Service Response Time statistics");
        gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0);
 
-       g_snprintf(filter_string,255,"Filter:%s",filter?filter:"");
+       filter_string = g_strdup_printf("Filter: %s", filter ? filter : "");
        label=gtk_label_new(filter_string);
+       g_free(filter_string);
+       gtk_label_set_line_wrap(GTK_LABEL(label), TRUE);
        gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0);
 
        label=gtk_label_new("LDAP Commands");
@@ -211,9 +211,9 @@ gtk_ldapstat_init(const char *optarg, void *userdata _U_)
        init_srt_table_row(&ldap->ldap_srt_table, 23, "Extended");
 
 
-       error_string=register_tap_listener("ldap", ldap, filter, ldapstat_reset, ldapstat_packet, ldapstat_draw);
+       error_string=register_tap_listener("ldap", ldap, filter, 0, ldapstat_reset, ldapstat_packet, ldapstat_draw);
        if(error_string){
-               simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, error_string->str);
+               simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "%s", error_string->str);
                g_string_free(error_string, TRUE);
                g_free(ldap);
                return;
@@ -223,23 +223,30 @@ gtk_ldapstat_init(const char *optarg, void *userdata _U_)
        bbox = dlg_button_row_new(GTK_STOCK_CLOSE, NULL);
        gtk_box_pack_end(GTK_BOX(vbox), bbox, FALSE, FALSE, 0);
 
-       close_bt = OBJECT_GET_DATA(bbox, GTK_STOCK_CLOSE);
+       close_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_CLOSE);
        window_set_cancel_button(ldap->win, close_bt, window_cancel_button_cb);
 
-       SIGNAL_CONNECT(ldap->win, "delete_event", window_delete_event_cb, NULL);
-       SIGNAL_CONNECT(ldap->win, "destroy", win_destroy_cb, ldap);
+       g_signal_connect(ldap->win, "delete_event", G_CALLBACK(window_delete_event_cb), NULL);
+       g_signal_connect(ldap->win, "destroy", G_CALLBACK(win_destroy_cb), ldap);
 
        gtk_widget_show_all(ldap->win);
        window_present(ldap->win);
-       
-       cf_retap_packets(&cfile, FALSE);
+
+       cf_retap_packets(&cfile);
+       gdk_window_raise(gtk_widget_get_window(ldap->win));
 }
 
-static tap_dfilter_dlg ldap_stat_dlg = {
+static tap_param ldap_stat_params[] = {
+       { PARAM_FILTER, "Filter", NULL }
+};
+
+static tap_param_dlg ldap_stat_dlg = {
        "LDAP Service Response Time Statistics",
        "ldap,srt",
        gtk_ldapstat_init,
-       -1
+       -1,
+       G_N_ELEMENTS(ldap_stat_params),
+       ldap_stat_params
 };
 
 void
@@ -248,3 +255,8 @@ register_tap_listener_gtkldapstat(void)
        register_dfilter_stat(&ldap_stat_dlg, "LDAP",
            REGISTER_STAT_GROUP_RESPONSE_TIME);
 }
+void ldap_srt_cb(GtkAction *action, gpointer user_data _U_)
+{
+       tap_param_dlg_cb(action, &ldap_stat_dlg);
+}
+