aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorstig <stig@f5534014-38df-0310-8fa8-9805f1628bb7>2010-07-05 09:05:27 +0000
committerstig <stig@f5534014-38df-0310-8fa8-9805f1628bb7>2010-07-05 09:05:27 +0000
commit581ab0c1d8b2d164acaf323ce381666449169c62 (patch)
treee50a07dc3e18a6b61c6b6900c0f8408d209856e5
parentf391f466e54fcfec44d1d3f5c10a440a645e2b78 (diff)
Revert COL_DSCP_VALUE back to value set in packet-ip.c.
Right justify COL_DSCP_VALUE (and COL_DCE_CALL as in the old packet list). git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33430 f5534014-38df-0310-8fa8-9805f1628bb7
-rw-r--r--epan/prefs.c1
-rw-r--r--gtk/main_packet_list.c1
-rw-r--r--gtk/new_packet_list.c2
3 files changed, 3 insertions, 1 deletions
diff --git a/epan/prefs.c b/epan/prefs.c
index 49b9c20e7f..532a843247 100644
--- a/epan/prefs.c
+++ b/epan/prefs.c
@@ -1859,7 +1859,6 @@ try_convert_to_custom_column(gpointer *el_data)
{ COL_BSSGP_TLLI, "bssgp.tlli" },
{ COL_HPUX_SUBSYS, "nettl.subsys" },
{ COL_HPUX_DEVID, "nettl.devid" },
- { COL_DSCP_VALUE, "ip.dsfield.dscp" },
{ COL_FR_DLCI, "fr.dlci" },
{ COL_REL_CONV_TIME, "tcp.time_relative" },
{ COL_DELTA_CONV_TIME, "tcp.time_delta" },
diff --git a/gtk/main_packet_list.c b/gtk/main_packet_list.c
index dcfae185d5..9b8bbf82ab 100644
--- a/gtk/main_packet_list.c
+++ b/gtk/main_packet_list.c
@@ -190,6 +190,7 @@ right_justify_column (gint col)
case COL_PACKET_LENGTH:
case COL_CUMULATIVE_BYTES:
case COL_DCE_CALL:
+ case COL_DSCP_VALUE:
right_justify = TRUE;
break;
diff --git a/gtk/new_packet_list.c b/gtk/new_packet_list.c
index db254241a3..3198df9f77 100644
--- a/gtk/new_packet_list.c
+++ b/gtk/new_packet_list.c
@@ -156,6 +156,8 @@ right_justify_column (gint col)
case COL_NUMBER:
case COL_PACKET_LENGTH:
case COL_CUMULATIVE_BYTES:
+ case COL_DCE_CALL:
+ case COL_DSCP_VALUE:
right_justify = TRUE;
break;