From 1f9d027bb617d151cd8ebc7f3bb42c0715e8b4ab Mon Sep 17 00:00:00 2001 From: Albrecht Schlosser Date: Wed, 30 Oct 2019 19:00:12 +0100 Subject: Fix typo and debug output when loading libgtk A recent commit changed the library name, supposedly unintended. While testing I found that the debug statements generated confusing output (both "selected GTK-3" and "selected GTK-2") when GTK-3 was available. --- src/drivers/X11/Fl_X11_System_Driver.cxx | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'src') diff --git a/src/drivers/X11/Fl_X11_System_Driver.cxx b/src/drivers/X11/Fl_X11_System_Driver.cxx index 412d64667..89902b463 100644 --- a/src/drivers/X11/Fl_X11_System_Driver.cxx +++ b/src/drivers/X11/Fl_X11_System_Driver.cxx @@ -529,7 +529,7 @@ bool Fl_X11_System_Driver::probe_for_GTK(int major, int minor, void **ptr_gtk) { *ptr_gtk = RTLD_DEFAULT; // Caution: NULL under linux, not-NULL under Darwin } else { // Try first with GTK3 - *ptr_gtk = Fl::system_driver()->dlopen("libgtk3.0.so"); + *ptr_gtk = Fl::system_driver()->dlopen("libgtk-3.so"); if (*ptr_gtk) { #ifdef DEBUG puts("selected GTK-3\n"); @@ -537,12 +537,13 @@ bool Fl_X11_System_Driver::probe_for_GTK(int major, int minor, void **ptr_gtk) { } else { // Try then with GTK2 *ptr_gtk = Fl::system_driver()->dlopen("libgtk-x11-2.0.so"); - } - if (*ptr_gtk) { #ifdef DEBUG - puts("selected GTK-2\n"); + if (*ptr_gtk) { + puts("selected GTK-2\n"); + } #endif - } else { + } + if (!(*ptr_gtk)) { #ifdef DEBUG puts("Failure to load libgtk"); #endif -- cgit v1.2.3