From Lars Roland: Fix the service response time functions to work with GTK2.

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

diff --git a/gtk/dcerpc_stat.c b/gtk/dcerpc_stat.c
index 1d03be7da3ec0dfd626fab3e05c527d7aa1579d0..15a73831e6ba7cad6211c4880d292e97b686b6d2 100644 (file)
--- a/gtk/dcerpc_stat.c
+++ b/gtk/dcerpc_stat.c
@@ -1,7 +1,7 @@
 /* dcerpc_stat.c
  * dcerpc_stat   2002 Ronnie Sahlberg
  *
- * $Id: dcerpc_stat.c,v 1.10 2003/06/21 09:50:19 guy Exp $
+ * $Id: dcerpc_stat.c,v 1.11 2003/06/22 04:00:21 gerald Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -222,13 +222,16 @@ gtk_dcerpcstat_init(char *optarg)
        gtk_box_pack_start(GTK_BOX(vbox), filter_label, FALSE, FALSE, 0);
        gtk_widget_show(filter_label);
 
-
        for(i=0,max_procs=0;procs[i].name;i++){
                if(procs[i].num>max_procs){
                        max_procs=procs[i].num;
                }
        }
        rs->num_procedures=max_procs+1;
+
+       /* We must display TOP LEVEL Widget before calling init_srt_table() */
+       gtk_widget_show(rs->win);
+
        init_srt_table(&rs->srt_table, max_procs+1, vbox);
 
                for(i=0;i<(max_procs+1);i++){

diff --git a/gtk/rpc_stat.c b/gtk/rpc_stat.c
index 0d0a18724f020da2f407195491b6bb8d08448d27..73f3a937f2d8c4ba8d7c372f42ac57035178b996 100644 (file)
--- a/gtk/rpc_stat.c
+++ b/gtk/rpc_stat.c
@@ -1,7 +1,7 @@
 /* rpc_stat.c
  * rpc_stat   2002 Ronnie Sahlberg
  *
- * $Id: rpc_stat.c,v 1.11 2003/06/21 09:50:19 guy Exp $
+ * $Id: rpc_stat.c,v 1.12 2003/06/22 04:00:21 gerald Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -223,12 +223,14 @@ gtk_rpcstat_init(char *optarg)
        gtk_box_pack_start(GTK_BOX(vbox), filter_label, FALSE, FALSE, 0);
        gtk_widget_show(filter_label);
 
-
        rpc_min_proc=-1;
        rpc_max_proc=-1;
        g_hash_table_foreach(rpc_procs, (GHFunc)rpcstat_find_procs, NULL);
        rs->num_procedures=rpc_max_proc+1;
 
+       /* We must display TOP LEVEL Widget before calling init_srt_table() */
+       gtk_widget_show(rs->win);
+
        init_srt_table(&rs->srt_table, rpc_max_proc+1, vbox);
 
        for(i=0;i<rs->num_procedures;i++){
@@ -423,7 +425,7 @@ gtk_rpcstat_cb(GtkWidget *w _U_, gpointer d _U_)
        filter_entry=gtk_entry_new_with_max_length(250);
        gtk_box_pack_start(GTK_BOX(filter_box), filter_entry, FALSE, FALSE, 0);
        gtk_widget_show(filter_entry);
-       
+
        gtk_box_pack_start(GTK_BOX(dlg_box), filter_box, TRUE, TRUE, 0);
        gtk_widget_show(filter_box);
 

diff --git a/gtk/service_response_time_table.c b/gtk/service_response_time_table.c
index 2d61c5c147770f9291eb5407659087f1e29e6b29..eb9400dc7d105e574acf4ba96178a8c28fcb0cfd 100644 (file)
--- a/gtk/service_response_time_table.c
+++ b/gtk/service_response_time_table.c
@@ -3,7 +3,7 @@
  * Helper routines common to all service response time statistics
  * tap.
  *
- * $Id: service_response_time_table.c,v 1.4 2003/06/21 06:45:49 sahlberg Exp $
+ * $Id: service_response_time_table.c,v 1.5 2003/06/22 04:00:21 gerald Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -71,7 +71,7 @@ srt_click_column_cb(GtkCList *clist, gint column, gpointer data)
        } else {
                /* Columns 2-5   Count, Min, Max, Avg are sorted in descending
                        order by default.
-                  Columns 0 and 1 sort by ascending order by default 
+                  Columns 0 and 1 sort by ascending order by default
                */
                if(column>=2){
                        clist->sort_type = GTK_SORT_DESCENDING;
@@ -106,7 +106,7 @@ srt_sort_column(GtkCList *clist, gconstpointer ptr1, gconstpointer ptr2)
                return strcmp (text1, text2);
        case 0:
        case 2:
-               i1=atoi(text1); 
+               i1=atoi(text1);
                i2=atoi(text2);
                return i1-i2;
        case 3:
@@ -121,7 +121,7 @@ srt_sort_column(GtkCList *clist, gconstpointer ptr1, gconstpointer ptr2)
                return -1;
        }
        g_assert_not_reached();
-       return 0;       
+       return 0;
 }
 
 void
@@ -140,9 +140,11 @@ init_srt_table(srt_stat_table *rst, int num_procs, GtkWidget *vbox)
        gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(rst->scrolled_window), GTK_POLICY_AUTOMATIC, GTK_POLICY_ALWAYS);
        gtk_box_pack_start(GTK_BOX(vbox), rst->scrolled_window, TRUE, TRUE, 0);
 
-
        rst->table=(GtkCList *)gtk_clist_new(6);
 
+       gtk_widget_show(GTK_WIDGET(rst->table));
+       gtk_widget_show(rst->scrolled_window);
+
        col_arrows = (column_arrows *) g_malloc(sizeof(column_arrows) * 6);
        win_style = gtk_widget_get_style(rst->scrolled_window);
        ascend_pm = gdk_pixmap_create_from_xpm_d(rst->scrolled_window->window,
@@ -163,10 +165,10 @@ init_srt_table(srt_stat_table *rst, int num_procs, GtkWidget *vbox)
                col_arrows[i].ascend_pm = gtk_pixmap_new(ascend_pm, ascend_bm);
                gtk_table_attach(GTK_TABLE(col_arrows[i].table), col_arrows[i].ascend_pm, 1, 2, 1, 2, GTK_SHRINK, GTK_SHRINK, 0, 0);
                col_arrows[i].descend_pm = gtk_pixmap_new(descend_pm, descend_bm);
+               gtk_table_attach(GTK_TABLE(col_arrows[i].table), col_arrows[i].descend_pm, 1, 2, 0, 1, GTK_SHRINK, GTK_SHRINK, 0, 0);
                if (i == 2) {
                        gtk_widget_show(col_arrows[i].descend_pm);
                }
-               gtk_table_attach(GTK_TABLE(col_arrows[i].table), col_arrows[i].descend_pm, 1, 2, 0, 1, GTK_SHRINK, GTK_SHRINK, 0, 0);
                gtk_clist_set_column_widget(GTK_CLIST(rst->table), i, col_arrows[i].table);
                gtk_widget_show(col_arrows[i].table);
        }
@@ -192,7 +194,7 @@ init_srt_table(srt_stat_table *rst, int num_procs, GtkWidget *vbox)
 
        SIGNAL_CONNECT(rst->table, "click-column", srt_click_column_cb, col_arrows);
 
-       gtk_widget_show((GtkWidget *)rst->table);
+       gtk_widget_show(GTK_WIDGET(rst->table));
        gtk_widget_show(rst->scrolled_window);
 
 
@@ -239,7 +241,7 @@ add_srt_table_data(srt_stat_table *rst, int index, nstime_t *req_time, packet_in
        nstime_t delta;
 
        rp=&rst->procedures[index];
-       
+
        /* calculate time delta between request and reply */
        delta.secs=pinfo->fd->abs_secs-req_time->secs;
        delta.nsecs=pinfo->fd->abs_usecs*1000-req_time->nsecs;
@@ -344,7 +346,7 @@ reset_srt_table_data(srt_stat_table *rst)
        int i;
 
        for(i=0;i<rst->num_procs;i++){
-               rst->procedures[i].num=0;       
+               rst->procedures[i].num=0;
                rst->procedures[i].min.secs=0;
                rst->procedures[i].min.nsecs=0;
                rst->procedures[i].max.secs=0;

diff --git a/gtk/smb_stat.c b/gtk/smb_stat.c
index bc1e7a7ed14e6a7b940ef518fe34b491db8c98f9..4f692fb6c1a393f3d3a9d95da20a4fc34fabbb92 100644 (file)
--- a/gtk/smb_stat.c
+++ b/gtk/smb_stat.c
@@ -1,7 +1,7 @@
 /* smb_stat.c
  * smb_stat   2003 Ronnie Sahlberg
  *
- * $Id: smb_stat.c,v 1.8 2003/06/21 09:50:19 guy Exp $
+ * $Id: smb_stat.c,v 1.9 2003/06/22 04:00:21 gerald Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -170,6 +170,10 @@ gtk_smbstat_init(char *optarg)
        label=gtk_label_new("SMB Commands");
        gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0);
        gtk_widget_show(label);
+
+       /* We must display TOP LEVEL Widget before calling init_srt_table() */
+       gtk_widget_show(ss->win);
+
        init_srt_table(&ss->smb_srt_table, 256, vbox);
        for(i=0;i<256;i++){
                init_srt_table_row(&ss->smb_srt_table, i, val_to_str(i, smb_cmd_vals, "Unknown(0x%02x)"));