Re: [Wireshark-commits] rev 34392: /trunk-1.4/ /trunk-1.4/epan/dfilter/: dfilter-macro.c /trunk-1.4/epan/dissectors/: packet-gsm_map.c packet-gtp.c packet-tcp.c packet-tcp.h /trunk-1.4/docbook/: release-notes.xml /trunk-1.4/epan/: ...

[Gerald Combs <gerald () wireshark org>]

Stig Bjørlykke wrote:
> On Wed, Oct 6, 2010 at 2:30 AM,  <gerald () wireshark org> wrote:
> > Log:
> >  Copy over revisions from the trunk:
>
> Gerald:
> I think we got a merge accident when adding the fixes for bug 5002.
> The changes for revision 34030 is not listed in the log, and the
> change in gtk/main.c has been added in the wrong place.  The correct
> place for macros_post_update() is after prefs_apply_all() in
> change_configuration_profile(), not after prefs_apply_all() in main().
>
> We now get two warnings at startup, and changing profile may crash
> wireshark if using a macro.
>
> (wireshark:64388): GLib-GObject-WARNING **: invalid (NULL) pointer instance
> (wireshark:64388): GLib-GObject-CRITICAL **: g_signal_emit_by_name:
> assertion `G_TYPE_CHECK_INSTANCE (instance)' failed

New rule: Never backport late in the afternoon.

Can you try r34494 in the 1.4 trunk?
___________________________________________________________________________
Sent via:    Wireshark-dev mailing list <wireshark-dev () wireshark org>
Archives:    http://www.wireshark.org/lists/wireshark-dev
Unsubscribe: https://wireshark.org/mailman/options/wireshark-dev
             mailto:wireshark-dev-request () wireshark org?subject=unsubscribe