diff options
| author | Kovarththanan Rajaratnam <kovarththanan.rajaratnam@gmail.com> | 2009-09-07 16:05:37 +0000 |
|---|---|---|
| committer | Kovarththanan Rajaratnam <kovarththanan.rajaratnam@gmail.com> | 2009-09-07 16:05:37 +0000 |
| commit | 72c9662da6a474c89d96d2d0160d5a24ed4129c1 (patch) | |
| tree | 42b2d7c425c4fa565b484a7c0b63f8b0257782bc /gtk | |
| parent | ea0ab046e0116f46cefcda47dcc75e40066b784d (diff) | |
ntroduce some seasonal address name lookup functions which we use when NEW_PACKET_LIST is defined. This change partially reverts some parts of r29768, which didn't seem to work because it assumed that get_addr_name() would always return a seasonal string. This wasn't the case if the adddress type was AT_STRINGZ.
svn path=/trunk/; revision=29771
Diffstat (limited to 'gtk')
| -rw-r--r-- | gtk/packet_list_store.c | 35 |
1 files changed, 18 insertions, 17 deletions
diff --git a/gtk/packet_list_store.c b/gtk/packet_list_store.c index af60de21c2..32f8b3553a 100644 --- a/gtk/packet_list_store.c +++ b/gtk/packet_list_store.c @@ -672,23 +672,24 @@ packet_list_change_record(PacketList *packet_list, guint row, gint col, column_i switch (cfile.cinfo.col_fmt[col]) { case COL_DEF_SRC: - case COL_RES_SRC: /* COL_DEF_SRC is currently just like COL_RES_SRC */ - case COL_UNRES_SRC: - case COL_DEF_DL_SRC: - case COL_RES_DL_SRC: - case COL_UNRES_DL_SRC: - case COL_DEF_NET_SRC: - case COL_RES_NET_SRC: - case COL_UNRES_NET_SRC: - case COL_DEF_DST: - case COL_RES_DST: /* COL_DEF_DST is currently just like COL_RES_DST */ - case COL_UNRES_DST: - case COL_DEF_DL_DST: - case COL_RES_DL_DST: - case COL_UNRES_DL_DST: - case COL_DEF_NET_DST: - case COL_RES_NET_DST: - case COL_UNRES_NET_DST: + case COL_RES_SRC: /* COL_DEF_SRC is currently just like COL_RES_SRC */ + case COL_UNRES_SRC: + case COL_DEF_DL_SRC: + case COL_RES_DL_SRC: + case COL_UNRES_DL_SRC: + case COL_DEF_NET_SRC: + case COL_RES_NET_SRC: + case COL_UNRES_NET_SRC: + case COL_DEF_DST: + case COL_RES_DST: /* COL_DEF_DST is currently just like COL_RES_DST */ + case COL_UNRES_DST: + case COL_DEF_DL_DST: + case COL_RES_DL_DST: + case COL_UNRES_DL_DST: + case COL_DEF_NET_DST: + case COL_RES_NET_DST: + case COL_UNRES_NET_DST: + g_assert(cinfo->col_data[col] != cinfo->col_buf[col]); /* This is a constant string, so we don't have to copy it */ record->fdata->col_text[col] = (gchar *) cinfo->col_data[col]; record->fdata->col_text_len[col] = (guint) strlen(record->fdata->col_text[col]); |