commit f34ea0700048c27319a2256408171adda32a7580

Author: Colin Clark <colin.clark@cclark.uk>

Date:   Sat Jan 9 11:35:41 2021 +0000

    Fix #829: segfault with clutter-gtk

    https://github.com/BestImageViewer/geeqie/issues/829

    This fix might cause other problems which might be cured by calling:

    LIBGL_ALWAYS_INDIRECT=1 geeqie

    or, worst case:

    geeqie --disable-clutter

diff --git a/src/main.c b/src/main.c

index f497240d..4af654fe 100644

--- a/src/main.c

+++ b/src/main.c

@@ -904,11 +904,6 @@ gint main(gint argc, gchar *argv[])

 #ifdef HAVE_GTHREAD

 #if !GLIB_CHECK_VERSION(2,32,0)

 	g_thread_init(NULL);

-#endif

-#ifdef HAVE_CLUTTER

-/* FIXME: see below */

-	putenv("LIBGL_ALWAYS_INDIRECT=1");

-	XInitThreads();

 #endif

 	gdk_threads_init();

 	gdk_threads_enter();

commit 2bb3245787c9caab6b881a1b09cee8b9dcd43269

Author: Colin Clark <colin.clark@cclark.uk>

Date:   Tue Jun 22 11:42:34 2021 +0100

    Ref #559: Geeqie won't start if clutter fails to init

    https://github.com/BestImageViewer/geeqie/issues/559

    Use Zenity to display a GUI message in addition to the console error.

diff --git a/src/main.c b/src/main.c

index a70b7fa0..fd3343ee 100644

--- a/src/main.c

+++ b/src/main.c

@@ -42,6 +42,7 @@

 #include "layout.h"

 #include "layout_image.h"

 #include "layout_util.h"

+#include "misc.h"

 #include "options.h"

 #include "remote.h"

 #include "secure_save.h"

@@ -1035,6 +1036,7 @@ gint main(gint argc, gchar *argv[])

 		if (gtk_clutter_init(&argc, &argv) != CLUTTER_INIT_SUCCESS)

 			{

 			log_printf("Can't initialize clutter-gtk.\nStart Geeqie with the option \"geeqie --disable-clutter\"");

+			runcmd("zenity --error --title=\"Geeqie\" --text \"Can't initialize clutter-gtk.\n\nStart Geeqie with the option:\n geeqie --disable-clutter\" --width=300");

 			exit(1);

 			}

 		}