|
6 | 6 | #include "detection/gtk_qt/gtk_qt.h" |
7 | 7 | #include "detection/displayserver/displayserver.h" |
8 | 8 | #include "util/stringUtils.h" |
| 9 | +#include "util/mallocHelper.h" |
9 | 10 |
|
10 | 11 | static bool detectWMThemeFromConfigFile(const char* configFile, const char* themeRegex, const char* defaultValue, FFstrbuf* themeOrError) |
11 | 12 | { |
@@ -91,8 +92,8 @@ static bool detectMutter(FFstrbuf* themeOrError) |
91 | 92 |
|
92 | 93 | static bool detectMuffin(FFstrbuf* themeOrError) |
93 | 94 | { |
94 | | - const char* name = ffSettingsGet("/org/cinnamon/theme/name", "org.cinnamon.theme", NULL, "name", FF_VARIANT_TYPE_STRING).strValue; |
95 | | - const char* theme = ffSettingsGet("/org/cinnamon/desktop/wm/preferences/theme", "org.cinnamon.desktop.wm.preferences", NULL, "theme", FF_VARIANT_TYPE_STRING).strValue; |
| 95 | + FF_AUTO_FREE const char* name = ffSettingsGet("/org/cinnamon/theme/name", "org.cinnamon.theme", NULL, "name", FF_VARIANT_TYPE_STRING).strValue; |
| 96 | + FF_AUTO_FREE const char* theme = ffSettingsGet("/org/cinnamon/desktop/wm/preferences/theme", "org.cinnamon.desktop.wm.preferences", NULL, "theme", FF_VARIANT_TYPE_STRING).strValue; |
96 | 97 |
|
97 | 98 | if(name == NULL && theme == NULL) |
98 | 99 | { |
@@ -133,7 +134,7 @@ static bool detectXFWM4(FFstrbuf* themeOrError) |
133 | 134 | static bool detectOpenbox(const FFstrbuf* dePrettyName, FFstrbuf* themeOrError) |
134 | 135 | { |
135 | 136 | FF_STRBUF_AUTO_DESTROY absolutePath = ffStrbufCreateA(64); |
136 | | - const char *configFileSubpath = "openbox/rc.xml"; |
| 137 | + const char *configFileSubpath = "openbox/rc.xml"; |
137 | 138 | if (ffStrbufIgnCaseCompS(dePrettyName, "LXQt") == 0) |
138 | 139 | configFileSubpath = "openbox/lxqt-rc.xml"; |
139 | 140 | else if (ffStrbufIgnCaseCompS(dePrettyName, "LXDE") == 0) |
|
0 commit comments