merge_all_tap_menus() has been moved to menus.c.

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

diff --git a/gtk/expert_comp_table.c b/gtk/expert_comp_table.c
index e018d98d381e9a8618e3ed35402e1d42068d1ce9..fde24724875c31808a7b3019133caf294d9dcac1 100644 (file)
--- a/gtk/expert_comp_table.c
+++ b/gtk/expert_comp_table.c
@@ -42,7 +42,6 @@
 #include <epan/expert.h>
 
 #include "../simple_dialog.h"
-#include "../color.h"
 
 #include "gtk/expert_comp_table.h"
 #include "gtk/filter_utils.h"
@@ -55,6 +54,8 @@
 #include "gtk/stock_icons.h"
 #include "gtk/utf8_entities.h"
 
+#include "gtk/old-gtk-compat.h"
+
 const char  *packet = "Packet:";
 
 enum
@@ -278,11 +279,7 @@ error_select_filter_cb(GtkWidget *widget _U_, gpointer callback_data, guint call
     case ACTION_MATCH:
         gtk_entry_set_text(GTK_ENTRY(main_display_filter_widget), str);
         main_filter_packets(&cfile, str, FALSE);
-#if GTK_CHECK_VERSION(2,14,0)
        gdk_window_raise(gtk_widget_get_window(top_level));
-#else
-        gdk_window_raise(top_level->window);
-#endif
         break;
     case ACTION_PREPARE:
         gtk_entry_set_text(GTK_ENTRY(main_display_filter_widget), str);
@@ -674,6 +671,7 @@ init_error_table(error_equiv_table *err, guint num_procs, GtkWidget *vbox)
 
     gtk_tree_view_column_set_sizing(column, GTK_TREE_VIEW_COLUMN_FIXED);
     gtk_tree_view_column_set_min_width(column, 80);
+    gtk_tree_view_column_set_fixed_width(column, 80);
     /* Add the column to the view. */
     gtk_tree_view_append_column (GTK_TREE_VIEW (err->tree_view), column);
 
@@ -689,7 +687,7 @@ init_error_table(error_equiv_table *err, guint num_procs, GtkWidget *vbox)
         GINT_TO_POINTER(PROTOCOL_COLUMN), NULL);
 
     gtk_tree_view_column_set_sizing(column, GTK_TREE_VIEW_COLUMN_FIXED);
-    gtk_tree_view_column_set_min_width(column, 40);
+    gtk_tree_view_column_set_min_width(column, 80);
     gtk_tree_view_column_set_fixed_width(column, 100);
     gtk_tree_view_append_column (GTK_TREE_VIEW (err->tree_view), column);
 
@@ -699,8 +697,11 @@ init_error_table(error_equiv_table *err, guint num_procs, GtkWidget *vbox)
     gtk_tree_view_column_set_sort_column_id(column, SUMMARY_COLUMN);
     gtk_tree_view_column_set_resizable(column, TRUE);
     gtk_tree_view_column_set_sizing(column, GTK_TREE_VIEW_COLUMN_FIXED);
-    gtk_tree_view_column_set_min_width(column, 80);
-    gtk_tree_view_column_set_fixed_width(column, 230);
+    gtk_tree_view_column_set_min_width(column, 300);
+    gtk_tree_view_column_set_fixed_width(column,
+        700 /* window size */ -
+        (80 /* group */ + 100 /* protocol */ + 80 /* count */ +
+         24 /* border */ + 22 /* vbar */));
     gtk_tree_view_append_column (GTK_TREE_VIEW (err->tree_view), column);
 
     /* Last column.. Count. */
@@ -801,7 +802,6 @@ init_error_table_row(error_equiv_table *err, const expert_info_t *expert_data)
     g_snprintf(num, sizeof(num), "%d", expert_data->packet_num);
 #if 0
     This does not have a big performance improvment :(
-if GTK_CHECK_VERSION(2,10,0)
     gtk_tree_store_insert_with_values   (store,
                        &new_iter,   /* *iter */
                        &procedure->iter, /* *parent*/