[gerald@xxxxxxxxxxxxx]

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

User: gerald
Date: 2013/05/20 02:46 PM

Log:
 Copy over revisions from the trunk:
 
   ------------------------------------------------------------------------
   r49104 | etxrab | 2013-05-01 01:34:40 -0700 (Wed, 01 May 2013) | 1 line
   Changed paths:
      M /trunk/asn1/c1222/packet-c1222-template.c
      M /trunk/epan/dissectors/packet-c1222.c
 
   Make C12.22 work over UDP.
   ------------------------------------------------------------------------
   r49133 | etxrab | 2013-05-01 22:16:09 -0700 (Wed, 01 May 2013) | 4 lines
   Changed paths:
      M /trunk/epan/dissectors/packet-gmhdr.c
 
   From Sandeep Dahiya:
   Extend the value_string that show the platform from where the packet was captured.
 
   https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8624
   ------------------------------------------------------------------------
   r49169 | jmayer | 2013-05-05 02:07:09 -0700 (Sun, 05 May 2013) | 47 lines
   Changed paths:
      M /trunk/ui/gtk/filter_dlg.c
 
   Revert 49166: It breaks compilation:
 
   [ 82%] Building C object ui/gtk/CMakeFiles/gtkui.dir/filter_dlg.c.o
   /home/jmayer/work/wireshark/svn/trunk/ui/gtk/filter_dlg.c: In function ‘color_filter_te’:
   /home/jmayer/work/wireshark/svn/trunk/ui/gtk/filter_dlg.c:1258:5: error: enum conversion when passing argument 2 of ‘gtk_widget_modify_bg’ is invalid in C++ [-Werror=c++-compat]
        gtk_widget_modify_bg(w, GTK_STATE_FLAG_NORMAL, &bg);
        ^
   In file included from /usr/include/gtk-3.0/gtk/gtkaction.h:38:0,
                    from /usr/include/gtk-3.0/gtk/gtkactiongroup.h:38,
                    from /usr/include/gtk-3.0/gtk/gtkapplication.h:29,
                    from /usr/include/gtk-3.0/gtk/gtkwindow.h:35,
                    from /usr/include/gtk-3.0/gtk/gtkdialog.h:35,
                    from /usr/include/gtk-3.0/gtk/gtkaboutdialog.h:32,
                    from /usr/include/gtk-3.0/gtk/gtk.h:33,
                    from /home/jmayer/work/wireshark/svn/trunk/ui/gtk/filter_dlg.c:29:
   /usr/include/gtk-3.0/gtk/gtkwidget.h:813:13: note: expected ‘GtkStateType’ but argument is of type ‘int’
    void        gtk_widget_modify_bg          (GtkWidget            *widget,
                ^
   /home/jmayer/work/wireshark/svn/trunk/ui/gtk/filter_dlg.c:1258:5: error: passing argument 3 of ‘gtk_widget_modify_bg’ from incompatible pointer type [-Werror]
        gtk_widget_modify_bg(w, GTK_STATE_FLAG_NORMAL, &bg);
        ^
   In file included from /usr/include/gtk-3.0/gtk/gtkaction.h:38:0,
                    from /usr/include/gtk-3.0/gtk/gtkactiongroup.h:38,
                    from /usr/include/gtk-3.0/gtk/gtkapplication.h:29,
                    from /usr/include/gtk-3.0/gtk/gtkwindow.h:35,
                    from /usr/include/gtk-3.0/gtk/gtkdialog.h:35,
                    from /usr/include/gtk-3.0/gtk/gtkaboutdialog.h:32,
                    from /usr/include/gtk-3.0/gtk/gtk.h:33,
                    from /home/jmayer/work/wireshark/svn/trunk/ui/gtk/filter_dlg.c:29:
   /usr/include/gtk-3.0/gtk/gtkwidget.h:813:13: note: expected ‘const struct GdkColor *’ but argument is of type ‘struct GdkRGBA *’
    void        gtk_widget_modify_bg          (GtkWidget            *widget,
                ^
   cc1: all warnings being treated as errors
   make[2]: *** [ui/gtk/CMakeFiles/gtkui.dir/filter_dlg.c.o] Error 1
 
   Also note that
   https://developer.gnome.org/gtk3/3.6/GtkWidget.html#gtk-widget-modify-bg
   states:
   gtk_widget_modify_bg has been deprecated since version 3.0 and should not be used in newly-written code. Use gtk_widget_override_background_color() instead
 
   Of course we are not the only ones who have problems with that replacement:
   http://gtk.10911.n7.nabble.com/button-background-color-in-gtk3-td14268.html
   which ends with a sort of ugly solution without the deprecated function.
   ------------------------------------------------------------------------
   r49148 | martinm | 2013-05-03 10:52:31 -0700 (Fri, 03 May 2013) | 3 lines
   Changed paths:
      M /trunk/epan/dissectors/Makefile.common
      A /trunk/epan/dissectors/packet-ixiatrailer.c
 
   Add a dissector for the Ixia Anue encoding of timestamps in the ethernet
   trailer.
   ------------------------------------------------------------------------
   r49149 | martinm | 2013-05-03 11:28:58 -0700 (Fri, 03 May 2013) | 2 lines
   Changed paths:
      M /trunk/epan/dissectors/packet-ixiatrailer.c
 
   Remove unnecessary lines from handoff function.
   ------------------------------------------------------------------------
   r49155 | alagoutte | 2013-05-04 01:12:12 -0700 (Sat, 04 May 2013) | 1 line
   Changed paths:
      M /trunk/epan/CMakeLists.txt
 
   Add a dissector for the Ixia Anue encoding to CMakeList too
   ------------------------------------------------------------------------
   r49171 | martinm | 2013-05-05 04:32:00 -0700 (Sun, 05 May 2013) | 2 lines
   Changed paths:
      M /trunk/epan/dissectors/packet-ixiatrailer.c
 
   Remove an unnecessary header include.
   ------------------------------------------------------------------------

Directory: /trunk-1.10/asn1/c1222/
  Changes    Path                       Action
  +5 -2      packet-c1222-template.c    Modified

Directory: /trunk-1.10/epan/dissectors/
  Changes    Path                    Action
  +1 -0      Makefile.common         Modified
  +10 -7     packet-c1222.c          Modified
  +3 -0      packet-gmhdr.c          Modified
  +195 -0    packet-ixiatrailer.c    Added

Directory: /trunk-1.10/epan/
  Changes    Path              Action
  +1 -0      CMakeLists.txt    Modified

Directory: /trunk-1.10/ui/gtk/
  Changes    Path            Action
  +1 -1      filter_dlg.c    Modified