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

Implemented suggested changes

Browse Source
This commit is contained in:
DarN
2021-04-26 20:47:32 +02:00
committed by GitHub
parent 6bcf3bab7c
commit a4d4b66679
1 changed files with 28 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/wmtheme.c
+28 -28
View File
@@ -44,9 +44,9 @@ static void printOpenbox(FFinstance* instance)
const char* deName = ffGetSessionDesktop();
if(strcmp(deName, (const char*)"LXQt") == 0)
if(strcasecmp(deName, (const char*)"LXQt") == 0)
ffStrbufAppendS(&absolutePath, ".config/openbox/lxqt-rc.xml");
else if(strcmp(deName, (const char*)"LXDE") == 0)
else if(strcasecmp(deName, (const char*)"LXDE") == 0)
ffStrbufAppendS(&absolutePath, ".config/openbox/lxde-rc.xml");
else
ffStrbufAppendS(&absolutePath, ".config/openbox/rc.xml");
@@ -55,48 +55,48 @@ static void printOpenbox(FFinstance* instance)
size_t len = 0;
FILE* file = fopen(absolutePath.chars, "r");
if(file == NULL)
return; // handle errors in higher functions
while(getline(&line, &len, file) != -1)
if(file != NULL)
{
if(strstr(line, "<theme>") != 0)
break;
}
while(getline(&line, &len, file) != -1)
{
if(strstr(line, "<name>") != 0)
while(getline(&line, &len, file) != -1)
{
const char* delStrs[] = {"<name>", "</name>"};
ffStrbufAppendS(&theme, line);
ffStrbufRemoveStringsA(&theme, 2, delStrs);
ffStrbufTrimRight(&theme, '\n');
ffStrbufTrim(&theme, ' ');
if(strstr(line, "<theme>") != 0)
break;
}
else if(strstr(line, "</theme>") != 0) // sanity check
break;
break;
}
fclose(file);
if(line != NULL) {
free(line);
while(getline(&line, &len, file) != -1)
{
if(strstr(line, "<name>") != 0)
{
ffStrbufAppendS(&theme, line);
ffStrbufRemoveStrings(&theme, 2, "<name>", "</name>");
ffStrbufTrimRight(&theme, '\n');
ffStrbufTrim(&theme, ' ');
break;
}
else if(strstr(line, "</theme>") != 0) // sanity check
break;
}
if(line != NULL)
free(line);
fclose(file);
}
else
ffPrintError(instance, FF_WMTHEME_MODULE_NAME, 0, &instance->config.wmThemeKey, &instance->config.wmThemeFormat, FF_WMTHEME_NUM_FORMAT_ARGS, "Couldn't open \"%s\"", absolutePath.chars);
if(theme.length == 0)
{
ffPrintError(instance, FF_WMTHEME_MODULE_NAME, 0, &instance->config.wmThemeKey, &instance->config.wmThemeFormat, FF_WMTHEME_NUM_FORMAT_ARGS, "Couldn't find theme name in \"%s\"", absolutePath.chars);
ffStrbufDestroy(&absolutePath);
ffStrbufDestroy(&theme);
ffStrbufDestroy(&absolutePath);
return;
}
printWMTheme(instance, theme.chars);
ffStrbufDestroy(&absolutePath);
ffStrbufDestroy(&theme);
ffStrbufDestroy(&absolutePath);
}
void ffPrintWMTheme(FFinstance* instance)