http://anonsvn.wireshark.org/viewvc/viewvc.cgi?view=rev&revision=33423
User: gerald
Date: 2010/07/02 03:29 PM
Log:
Copy over revisions from the trunk:
------------------------------------------------------------------------
r33380 | gerald | 2010-06-29 16:50:51 -0700 (Tue, 29 Jun 2010) | 2 lines
Changed paths:
M /trunk/epan/dissectors/packet-gtp.c
M /trunk/epan/dissectors/packet-gtp.h
Add End Marker back in.
------------------------------------------------------------------------
r33384 | etxrab | 2010-06-30 12:38:26 -0700 (Wed, 30 Jun 2010) | 5 lines
Changed paths:
M /trunk/file.c
Reverting
http://anonsvn.wireshark.org/viewvc?view=rev&revision=29861
seems to fix the scrolling in live captures issue.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4891
------------------------------------------------------------------------
r33398 | stig | 2010-07-01 04:31:24 -0700 (Thu, 01 Jul 2010) | 2 lines
Changed paths:
M /trunk/gtk/new_packet_list.c
Remove some double GTK_TREE_VIEW casts.
------------------------------------------------------------------------
r33400 | stig | 2010-07-01 07:33:36 -0700 (Thu, 01 Jul 2010) | 6 lines
Changed paths:
M /trunk/gtk/new_packet_list.c
Recreate the packet list on DND columns.
This is a quick'n'dirty fix and not optimal, but it fixes the problems we
have with DND columns. We have to rewrite new_packet_list_recreate() to
handle both new, delete and reorder columns.
------------------------------------------------------------------------
r33410 | guy | 2010-07-01 21:11:04 -0700 (Thu, 01 Jul 2010) | 3 lines
Changed paths:
M /trunk/capture_sync.c
Have sync_pipe_wait_for_child() return the child's exit status on
Windows, just as we do on UN*X.
------------------------------------------------------------------------
r33411 | guy | 2010-07-02 01:39:08 -0700 (Fri, 02 Jul 2010) | 3 lines
Changed paths:
M /trunk/capture_sync.c
Attempt to detect when dumpcap dies due to an exception and report that
appropriately.
------------------------------------------------------------------------
r33412 | guy | 2010-07-02 01:41:19 -0700 (Fri, 02 Jul 2010) | 2 lines
Changed paths:
M /trunk/capture_sync.c
Include <Winbase.h> to get error statuses.
------------------------------------------------------------------------
r33413 | guy | 2010-07-02 01:52:35 -0700 (Fri, 02 Jul 2010) | 6 lines
Changed paths:
M /trunk/capture_sync.c
STATUS_UNWIND_CONSOLIDATE "should not happen", so don't include it -
we'd have to include some other headers to get it defined.
Get rid of the include of Winbase.h - it doesn't define
STATUS_UNWIND_CONSOLIDATE, and it's not necessary.
------------------------------------------------------------------------
Copy over with manual intervention:
------------------------------------------------------------------------
r33399 | stig | 2010-07-01 05:21:29 -0700 (Thu, 01 Jul 2010) | 5 lines
Changed paths:
M /trunk/gtk/main.c
M /trunk/gtk/new_packet_list.c
M /trunk/gtk/new_packet_list.h
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.
------------------------------------------------------------------------
Directory: /trunk-1.4/epan/dissectors/
Changes Path Action
+1 -0 packet-gtp.c Modified
+1 -0 packet-gtp.h Modified
Directory: /trunk-1.4/gtk/
Changes Path Action
+60 -8 new_packet_list.c Modified
Directory: /trunk-1.4/
Changes Path Action
+59 -1 capture_sync.c Modified
+0 -5 file.c Modified