fastfetch-cli/fastfetch
1
0
Fork 0
mirror of https://github.com/fastfetch-cli/fastfetch.git synced 2026-09-13 02:42:09 +02:00
Code Issues Packages Projects Releases 10 Wiki Activity

GTK dconf backend doesn't append already set values anymore

Browse Source
This commit is contained in:
Linus Dierheimer
2021-04-09 16:11:53 +02:00
parent 53c781aa21
commit 2b55a14c16
1 changed files with 28 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/common/calculateGtk.c
+28 -25
View File
@@ -12,6 +12,19 @@ static inline bool allPropertiesSet(FFstrbuf* themeNamePtr, FFstrbuf* iconsNameP
fontNamePtr->length > 0;
}
static inline void applyGTKDConfSettings(const gchar* themeName, FFstrbuf* themeNamePtr, const gchar* iconsName, FFstrbuf* iconsNamePtr, const gchar* fontName, FFstrbuf* fontNamePtr)
{
if(themeNamePtr->length == 0)
ffStrbufAppendS(themeNamePtr, themeName);
if(iconsNamePtr->length == 0)
ffStrbufAppendS(iconsNamePtr, iconsName);
if(fontNamePtr->length == 0)
ffStrbufAppendS(fontNamePtr, fontName);
}
static void parseGTKDConfSettings(FFinstance* instance, FFstrbuf* themeNamePtr, FFstrbuf* iconsNamePtr, FFstrbuf* fontNamePtr)
{
static pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER;
@@ -26,9 +39,7 @@ static void parseGTKDConfSettings(FFinstance* instance, FFstrbuf* themeNamePtr,
if(init)
{
ffStrbufAppendS(themeNamePtr, themeName);
ffStrbufAppendS(iconsNamePtr, iconsName);
ffStrbufAppendS(fontNamePtr, fontName);
applyGTKDConfSettings(themeName, themeNamePtr, iconsName, iconsNamePtr, fontName, fontNamePtr);
pthread_mutex_unlock(&mutex);
return;
}
@@ -85,10 +96,7 @@ static void parseGTKDConfSettings(FFinstance* instance, FFstrbuf* themeNamePtr,
dlclose(dconf);
ffStrbufAppendS(themeNamePtr, themeName);
ffStrbufAppendS(iconsNamePtr, iconsName);
ffStrbufAppendS(fontNamePtr, fontName);
applyGTKDConfSettings(themeName, themeNamePtr, iconsName, iconsNamePtr, fontName, fontNamePtr);
pthread_mutex_unlock(&mutex);
}
@@ -183,38 +191,33 @@ static void calculateGTKFromConfigDir(const char* configDir, const char* version
static void calculateGTK(FFinstance* instance, const char* version, FFstrbuf* themeNamePtr, FFstrbuf* iconsNamePtr, FFstrbuf* fontNamePtr)
{
static FFstrbuf configDir;
static bool configDirInit = false;
static pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER;
if(!configDirInit)
static FFstrbuf configDir;
static FFstrbuf xdgConfigDir;
static bool xdgIsDifferent;
static bool init = false;
pthread_mutex_lock(&mutex);
if(!init)
{
ffStrbufInitA(&configDir, 64);
ffStrbufAppendS(&configDir, instance->state.passwd->pw_dir);
ffStrbufAppendS(&configDir, "/.config/");
configDirInit = true;
}
static FFstrbuf xdgConfigDir;
static bool xdgConfigDirInit = false;
if(!xdgConfigDirInit)
{
ffStrbufInitA(&xdgConfigDir, 64);
ffStrbufAppendS(&xdgConfigDir, getenv("XDG_CONFIG_HOME"));
if(xdgConfigDir.length > 0 && xdgConfigDir.chars[xdgConfigDir.length - 1] != '/')
ffStrbufAppendC(&xdgConfigDir, '/');
xdgConfigDirInit = true;
}
static bool xdgIsDifferent;
static bool xdgIsDifferentInit = false;
if(!xdgIsDifferentInit)
{
xdgIsDifferent = ffStrbufComp(&configDir, &xdgConfigDir) != 0;
xdgConfigDirInit = true;
init = true;
}
pthread_mutex_unlock(&mutex);
if(xdgIsDifferent)
{
calculateGTKFromConfigDir(xdgConfigDir.chars, version, themeNamePtr, iconsNamePtr, fontNamePtr);