[Commits] [SCM] claws branch, gtk3, updated. 3.99.0-8-g25bba106a

[paul at claws-mail.org]

The branch, gtk3 has been updated
       via  25bba106ace6f702bfb7e7e074166d8df7e6d1e9 (commit)
      from  f286c28a6ee253828e18b5d46714b6b0306d364b (commit)

Summary of changes:
 src/main.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)


- Log -----------------------------------------------------------------
commit 25bba106ace6f702bfb7e7e074166d8df7e6d1e9
Author: paul <paul at claws-mail.org>
Date:   Fri Nov 27 18:26:48 2020 +0000

    fix wayland crash when built with startup-notification support

diff --git a/src/main.c b/src/main.c
index a4cea0161..4a00ab004 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1042,7 +1042,7 @@ int main(int argc, char *argv[])
 	lock_socket = prohibit_duplicate_launch();
 	if (lock_socket < 0) {
 #ifdef HAVE_STARTUP_NOTIFICATION
-		if(gtk_init_check(&argc, &argv))
+		if(gtk_init_check(&argc, &argv) && !strcmp(g_getenv("XDG_SESSION_TYPE"), "x11"))
 			startup_notification_complete(TRUE);
 #endif
 		return 0;
@@ -1570,7 +1570,8 @@ int main(int argc, char *argv[])
 	static_mainwindow = mainwin;
 
 #ifdef HAVE_STARTUP_NOTIFICATION
-	startup_notification_complete(FALSE);
+	if (!strcmp(g_getenv("XDG_SESSION_TYPE"), "x11"))
+		startup_notification_complete(FALSE);
 #endif
 #ifdef HAVE_LIBSM
 	sc_session_manager_connect(mainwin);

-----------------------------------------------------------------------


hooks/post-receive
-- 
Claws Mail