From bb81bef5353138e4f8d80387c2a76650f79e4fb6 Mon Sep 17 00:00:00 2001
From: Anders <anders.broman@ericsson.com>
Date: Mon, 16 Apr 2018 17:20:34 +0200
Subject: glib: Get rid of GLIB_CHECK_VERSION as we now require 2.32.0

Change-Id: Ie95cf37f9cd283545693e290340a7489cc989c95
Reviewed-on: https://code.wireshark.org/review/26970
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
---
 ui/filter_files.c                | 1 -
 ui/make-taps.c                   | 1 -
 ui/profile.c                     | 1 -
 ui/qt/compiled_filter_output.cpp | 4 ----
 ui/recent.c                      | 1 -
 5 files changed, 8 deletions(-)

(limited to 'ui')

diff --git a/ui/filter_files.c b/ui/filter_files.c
index 1a30f2fffe..ffad66b14e 100644
--- a/ui/filter_files.c
+++ b/ui/filter_files.c
@@ -17,7 +17,6 @@
 
 #include <wsutil/file_util.h>
 #include <wsutil/filesystem.h>
-#include <wsutil/glib-compat.h>
 #include <wsutil/report_message.h>
 
 #include "ui/filter_files.h"
diff --git a/ui/make-taps.c b/ui/make-taps.c
index e1ad4431c6..a5ff48668c 100644
--- a/ui/make-taps.c
+++ b/ui/make-taps.c
@@ -12,7 +12,6 @@
 #include <stdio.h>
 #include <string.h>
 #include <glib.h>
-#include <wsutil/glib-compat.h>
 
 #define ARRAY_RESERVED_SIZE     128
 #define STRING_RESERVED_SIZE    (8 * 1024)
diff --git a/ui/profile.c b/ui/profile.c
index 16fba49857..c870fff811 100644
--- a/ui/profile.c
+++ b/ui/profile.c
@@ -23,7 +23,6 @@
 #include "ui/recent.h"
 
 #include <wsutil/file_util.h>
-#include <wsutil/glib-compat.h>
 
 static GList *current_profiles = NULL;
 static GList *edited_profiles = NULL;
diff --git a/ui/qt/compiled_filter_output.cpp b/ui/qt/compiled_filter_output.cpp
index 1e6661b8ca..ba516bcf02 100644
--- a/ui/qt/compiled_filter_output.cpp
+++ b/ui/qt/compiled_filter_output.cpp
@@ -41,12 +41,8 @@ CompiledFilterOutput::CompiledFilterOutput(QWidget *parent, QStringList &intList
     close_bt->setDefault(true);
 
     interface_list_ = ui->interfaceList;
-#if GLIB_CHECK_VERSION(2,31,0)
     pcap_compile_mtx = g_new(GMutex,1);
     g_mutex_init(pcap_compile_mtx);
-#else
-    pcap_compile_mtx = g_mutex_new();
-#endif
 #ifdef HAVE_LIBPCAP
     compileFilter();
 #endif
diff --git a/ui/recent.c b/ui/recent.c
index 9417d4e922..e3dc0a72be 100644
--- a/ui/recent.c
+++ b/ui/recent.c
@@ -28,7 +28,6 @@
 #include "ui/simple_dialog.h"
 
 #include <wsutil/file_util.h>
-#include <wsutil/glib-compat.h>
 
 #define RECENT_KEY_MAIN_TOOLBAR_SHOW          "gui.toolbar_main_show"
 #define RECENT_KEY_FILTER_TOOLBAR_SHOW        "gui.filter_toolbar_show"
-- 
cgit v1.2.3