From 97ae9e9d285af87b88381f4db4c583a2910199da Mon Sep 17 00:00:00 2001 From: Linus Dierheimer Date: Sat, 1 May 2021 17:19:17 +0200 Subject: [PATCH] fixed dconf bug --- src/common/dconf.c | 8 ++++---- src/common/detectWMDE.c | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/common/dconf.c b/src/common/dconf.c index 0a7b08e34..46bb2f144 100644 --- a/src/common/dconf.c +++ b/src/common/dconf.c @@ -71,16 +71,16 @@ const char* ffDConfGetValue(FFinstance* instance, const char* key) return NULL; } - GVariant*(*ffdconf_client_read)(DConfClient*, const gchar*) = dlsym(dconf.library, "dconf_client_read"); - if(ffdconf_client_read == NULL) + dconf.ffdconf_client_new = dlsym(dconf.library, "dconf_client_read"); + if(dconf.ffdconf_client_read == NULL) { pthread_mutex_unlock(&mutex); dlclose(dconf.library); return NULL; } - DConfClient* dconfClient = dconf.ffdconf_client_new(); - if(dconfClient == NULL) + dconf.dconfClient = dconf.ffdconf_client_new(); + if(dconf.dconfClient == NULL) { pthread_mutex_unlock(&mutex); dlclose(dconf.library); diff --git a/src/common/detectWMDE.c b/src/common/detectWMDE.c index 015aa421a..3d4d377b2 100644 --- a/src/common/detectWMDE.c +++ b/src/common/detectWMDE.c @@ -280,7 +280,7 @@ static inline void getWMDE(FFWMDEResult* result) getDE(result, &procData); if(result->wmProtocolName.length == 0 && procData.protocolHint != FF_PROTOCOL_HINT_UNKNOWN) - getSessionType(result, procData.protocolHint); + getSessionTypeFallback(result, procData.protocolHint); if(procData.proc != NULL) closedir(procData.proc);