[gerald@xxxxxxxxxxxxx]

http://anonsvn.wireshark.org/viewvc/viewvc.cgi?view=rev&revision=38000

User: gerald
Date: 2011/07/13 12:29 PM

Log:
 Copy over revisions from the trunk:
 
   ------------------------------------------------------------------------
   r37845 | guy | 2011-06-30 11:08:42 -0700 (Thu, 30 Jun 2011) | 2 lines
   Changed paths:
      M /trunk/epan/libwireshark.def
 
   Export tvb_get_unicode_string().
   ------------------------------------------------------------------------
   r37853 | cmaynard | 2011-07-01 12:00:14 -0700 (Fri, 01 Jul 2011) | 3 lines
   Changed paths:
      M /trunk/epan/dissectors/packet-tcp.c
 
   Initialize the TCP windows to the maximum value instead of 0 to avoid false zero window conditions, especially at the beginning of a capture or if only one side of a conversation is captured.  This resolves bug 4716: https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4716.
   ------------------------------------------------------------------------
   r37854 | cmaynard | 2011-07-01 12:17:02 -0700 (Fri, 01 Jul 2011) | 3 lines
   Changed paths:
      M /trunk/epan/dissectors/packet-tcp.c
 
   In decode_tcp_ports(), don't abort processing zero window probe packets, even if the payload is only a single byte.  Also, for the keep-alives, display any payload that might be present.
   ------------------------------------------------------------------------
   r37867 | wmeier | 2011-07-02 12:50:41 -0700 (Sat, 02 Jul 2011) | 14 lines
   Changed paths:
      M /trunk/gtk/file_import_dlg.c
 
   Fix: Wireshark crashes after repeating "File -> Import -> Cancel"
   https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6080
 
   Apparently gtk_radio_button_get_group() must be called after
   each addition to the group before the 'group' GSList pointer can be used
   again in, for example, a call to get_radio_button_new_with_label().
 
   (Where does it say this in the GTK docs ? It does make sense, tho, given
   the way GSLists work).
 
   We'll use gtk_radio_button_new_with_label_from_widget() instead to let GTK
   handle the grouping.
   ------------------------------------------------------------------------
   r37869 | wmeier | 2011-07-02 14:00:56 -0700 (Sat, 02 Jul 2011) | 13 lines
   Changed paths:
      M /trunk/gtk/iax2_analysis.c
 
   Fix incorrect usage of gtk_radio_button_new_with_label()/gtk_radio_button_get_group();
   Use gtk_radio_button_new_with_label_from_widget().
 
   Essentially: gtk_radio_button_get_group() must be called after each gtk_radio_button_new...()
   before using the 'group' GSList pointer in another call to gtk_radio_button_new...().
 
   In these cases the incorrect usage appears to only have resulted in allowing multiple
   radio buttons to be activated simultaneously.
 
   (In at least one case elsewhere, the incorrect usage resulted in a Wireshark crash).
   ------------------------------------------------------------------------
   r37870 | wmeier | 2011-07-02 14:06:51 -0700 (Sat, 02 Jul 2011) | 2 lines
   Changed paths:
      M /trunk/gtk/iax2_analysis.c
 
   Remove 3 lines of code no longer needed after SVN #37869
   ------------------------------------------------------------------------
   r37871 | wmeier | 2011-07-02 14:36:25 -0700 (Sat, 02 Jul 2011) | 13 lines
   Changed paths:
      M /trunk/gtk/rtp_analysis.c
 
   Log:
    Fix incorrect usage of gtk_radio_button_new_with_label()/gtk_radio_button_get_group();
    Use gtk_radio_button_new_with_label_from_widget().
 
    Essentially: gtk_radio_button_get_group() must be called after each gtk_radio_button_new...()
    before using the 'group' GSList pointer in another call to gtk_radio_button_new...().
 
    In these cases the incorrect usage appears to only have resulted in allowing multiple
    radio buttons to be activated simultaneously.
 
    (In at least one case elsewhere, the incorrect usage resulted in a Wireshark crash).
   ------------------------------------------------------------------------
 
 
 Copy over by hand:
 
   ------------------------------------------------------------------------
   r37830 | stig | 2011-06-29 03:42:29 -0700 (Wed, 29 Jun 2011) | 3 lines
   Changed paths:
      M /trunk/epan/prefs.c
      M /trunk/epan/prefs.h
      M /trunk/gtk/capture_dlg.c
      M /trunk/gtk/prefs_capture.c
 
   Added a preference to turn of capture filter syntax check.
   This can be used to disable the effect in bug 5356.
   ------------------------------------------------------------------------
 
 
 Update the release notes.

Directory: /trunk-1.6/epan/dissectors/
  Changes    Path            Action
  +8 -5      packet-tcp.c    Modified

Directory: /trunk-1.6/docbook/
  Changes    Path                 Action
  +30 -0     release-notes.xml    Modified

Directory: /trunk-1.6/epan/
  Changes    Path                Action
  +1 -0      libwireshark.def    Modified
  +10 -0     prefs.c             Modified
  +1 -0      prefs.h             Modified
  +6 -6      proto.c             Modified

Directory: /trunk-1.6/gtk/
  Changes    Path                 Action
  +2 -0      capture_dlg.c        Modified
  +8 -14     file_import_dlg.c    Modified
  +8 -17     iax2_analysis.c      Modified
  +12 -2     prefs_capture.c      Modified
  +8 -17     rtp_analysis.c       Modified