Wireshark-commits: [Wireshark-commits] master 77ae30f: gtk: fix compilation with GTK+ before 2.18

From: Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>
Date: Thu, 1 Sep 2016 08:28:20 +0000 (UTC)
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=77ae30ffc598a56e71e0f57e151d0b6801110b03
Submitter: Peter Wu (peter@xxxxxxxxxxxxx)
Changed: branch: master
Repository: wireshark

Commits:

77ae30f by Peter Wu (peter@xxxxxxxxxxxxx):

    gtk: fix compilation with GTK+ before 2.18
    
    Removed in v1.99.2rc0-399-g43f09e6, but some includes are still needed.
    
    Basically I looked for the functions defined in the
    ui/gtk/old-gtk-compat.h header file that were in files below ui/gtk/.
    Then I matched it against the removed part in the above commit and added
    the header back at its old place. In two other cases, the header was
    only needed for Windows.
    
    If the above commit did not reference the file, I checked which function
    was in use and added the header on top, removing redundant conditionals.
    
    Reported and tested by a user of GTK+ 2.12.12 on top of v2.0.5.
    
    Change-Id: I649eec1e5531070f88c99d893c4920306f56d849
    Reviewed-on: https://code.wireshark.org/review/17371
    Petri-Dish: Peter Wu <peter@xxxxxxxxxxxxx>
    Tested-by: Petri Dish Buildbot <buildbot-no-reply@xxxxxxxxxxxxx>
    Reviewed-by: Peter Wu <peter@xxxxxxxxxxxxx>
    

Actions performed:

    from  717ca58   ipv6: fix build with old 32-bit glib headers (master only)
    adds  77ae30f   gtk: fix compilation with GTK+ before 2.18


Summary of changes:
 ui/gtk/color_edit_dlg.c              |    1 +
 ui/gtk/compare_stat.c                |    1 +
 ui/gtk/conversations_table.c         |    1 +
 ui/gtk/dcerpc_stat.c                 |    1 +
 ui/gtk/dfilter_expr_dlg.c            |    1 +
 ui/gtk/dlg_utils.c                   |    1 +
 ui/gtk/expert_comp_dlg.c             |    1 +
 ui/gtk/expert_comp_table.c           |    1 +
 ui/gtk/export_sslkeys.c              |    1 +
 ui/gtk/fileset_dlg.c                 |    5 +----
 ui/gtk/filter_dlg.c                  |    1 +
 ui/gtk/filter_utils.c                |    1 +
 ui/gtk/flow_graph.c                  |    1 +
 ui/gtk/funnel_stat.c                 |    1 +
 ui/gtk/lbm_uimflow_dlg.c             |    5 +----
 ui/gtk/mac_lte_stat_dlg.c            |    1 +
 ui/gtk/mcast_stream_dlg.c            |    1 +
 ui/gtk/packet_list_store.c           |    1 +
 ui/gtk/packet_panes.c                |    1 +
 ui/gtk/print_dlg.c                   |    1 +
 ui/gtk/response_time_delay_table.c   |    2 ++
 ui/gtk/rlc_lte_stat_dlg.c            |    2 ++
 ui/gtk/rpc_stat.c                    |    1 +
 ui/gtk/rtp_stream_dlg.c              |    1 +
 ui/gtk/sctp_byte_graph_dlg.c         |    1 +
 ui/gtk/sctp_stat_dlg.c               |    1 +
 ui/gtk/service_response_time_table.c |    2 ++
 ui/gtk/simple_dialog.c               |    2 ++
 ui/gtk/simple_stattable.c            |    2 ++
 ui/gtk/stats_tree_stat.c             |    2 ++
 ui/gtk/wlan_stat_dlg.c               |    1 +
 31 files changed, 37 insertions(+), 8 deletions(-)