Wireshark-dev: Re: [Wireshark-dev] [Wireshark-commits] rev 34392: /trunk-1.4/ /trunk-1.4/epan/d
Date Index · Thread Index · Other Months · All Mailing Lists
Date Prev · Date Next · Thread Prev · Thread Next
From: Gerald Combs <gerald@xxxxxxxxxxxxx>
Date: Tue, 12 Oct 2010 17:56:09 -0700
Stig Bjørlykke wrote:
> On Wed, Oct 6, 2010 at 2:30 AM,  <gerald@xxxxxxxxxxxxx> 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?