diff --git a/configure.ac b/configure.ac index c9a21065..bd5d145c 100644 --- a/configure.ac +++ b/configure.ac @@ -205,7 +205,7 @@ AC_SUBST([GTKMM_CFLAGS]) dnl Check for glibmm minimum required version. -PKG_CHECK_MODULES([GLIBMM], [glibmm-2.4 >= 2.14.0]) +PKG_CHECK_MODULES([GLIBMM], [glibmm-2.4 >= 2.32.0]) need_cxx_compile_stdcxx_11=no diff --git a/src/main.cc b/src/main.cc index d3583175..2c37ec99 100644 --- a/src/main.cc +++ b/src/main.cc @@ -17,13 +17,12 @@ #include "GParted_Core.h" #include "Win_GParted.h" +#include #include #include int main( int argc, char *argv[] ) { - //initialize thread system - Glib::thread_init() ; GParted::GParted_Core::mainthread = Glib::Thread::self(); Gtk::Main kit( argc, argv ) ; diff --git a/tests/test_PipeCapture.cc b/tests/test_PipeCapture.cc index 3a8882fe..886ea7fc 100644 --- a/tests/test_PipeCapture.cc +++ b/tests/test_PipeCapture.cc @@ -412,18 +412,14 @@ TEST_F( PipeCaptureTest, LineDisciplineSkipCtrlAB ) } // namespace GParted -// Custom Google Test main() which also initialises the Glib threading system for -// distributions with glib/glibmm before version 2.32. -// References: +// Custom Google Test main(). +// Reference: // * Google Test, Primer, Writing the main() Function -// * Deprecated thread API, g_thread_init() -// https://developer.gnome.org/glib/stable/glib-Deprecated-Thread-APIs.html#g-thread-init +// https://github.com/google/googletest/blob/master/googletest/docs/primer.md#writing-the-main-function int main( int argc, char **argv ) { printf("Running main() from %s\n", __FILE__ ); testing::InitGoogleTest( &argc, argv ); - Glib::thread_init(); - return RUN_ALL_TESTS(); }