Fetch filter and copy summary from correct column after DND columns.

This does not recreate the internal structures, but we we fix the problem
with fetching wrong data.  Printing still uses the configured column order.

svn path=/trunk/; revision=33399

1 files changed, 16 insertions, 5 deletions

diff --git a/gtk/new_packet_list.c b/gtk/new_packet_list.c
index ac75738d74..e5430a49c1 100644
--- a/gtk/new_packet_list.c
+++ b/gtk/new_packet_list.c
@@ -1316,14 +1316,25 @@ new_packet_list_unignore_all_frames_cb(GtkWidget *w _U_, gpointer data _U_)
 	ignore_all_frames(FALSE);
 }
 
+guint
+new_packet_list_get_column_id (gint col_num)
+{
+  GtkTreeViewColumn *column = gtk_tree_view_get_column (GTK_TREE_VIEW(packetlist->view), col_num);
+  gint col_id = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(column), E_MPACKET_LIST_COL_KEY));
+
+  return col_id;
+}
+
 static gboolean
-get_col_text_from_record( PacketListRecord *record, gint col_num, gchar** cell_text){
+get_col_text_from_record( PacketListRecord *record, gint col_num, gchar** cell_text)
+{
+	gint col_id = new_packet_list_get_column_id (col_num);
 
-	if (col_based_on_frame_data(&cfile.cinfo, col_num)) {
-		col_fill_in_frame_data(record->fdata, &cfile.cinfo, col_num, FALSE);
-		*cell_text = g_strdup(cfile.cinfo.col_data[col_num]);
+	if (col_based_on_frame_data(&cfile.cinfo, col_id)) {
+		col_fill_in_frame_data(record->fdata, &cfile.cinfo, col_id, FALSE);
+		*cell_text = g_strdup(cfile.cinfo.col_data[col_id]);
 	}else
-		*cell_text = g_strdup(record->fdata->col_text[col_num]);
+		*cell_text = g_strdup(record->fdata->col_text[col_id]);
 
 	return TRUE;
 }