aniani/profanity
1
1
Fork 0
mirror of https://github.com/profanity-im/profanity.git synced 2025-01-03 14:57:42 -05:00
Code

Only overwrite preferences with theme when them loaded, not on startup

Browse Source
This commit is contained in:
James Booth 2014-11-30 21:25:13 +00:00
parent aec7afd06a
commit 5875dcfd53
1 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/config/theme.c
View File

@ -130,17 +130,32 @@ static void _load_preferences(void);
static gchar * _get_themes_dir(void); static gchar * _get_themes_dir(void);
void _theme_list_dir(const gchar * const dir, GSList **result); void _theme_list_dir(const gchar * const dir, GSList **result);
static GString * _theme_find(const char * const theme_name); static GString * _theme_find(const char * const theme_name);
static gboolean _theme_load_file(const char * const theme_name);
void void
theme_init(const char * const theme_name) theme_init(const char * const theme_name)
{ {
if (!theme_load(theme_name) && !theme_load("default")) { if (!_theme_load_file(theme_name) && !_theme_load_file("default")) {
log_error("Theme initialisation failed"); log_error("Theme initialisation failed");
} else {
_load_colours();
} }
} }
gboolean gboolean
theme_load(const char * const theme_name) theme_load(const char * const theme_name)
{
if (_theme_load_file(theme_name)) {
_load_colours();
_load_preferences();
return TRUE;
} else {
return FALSE;
}
}
static gboolean
_theme_load_file(const char * const theme_name)
{ {
// use default theme // use default theme
if (theme_name == NULL || strcmp(theme_name, "default") == 0) { if (theme_name == NULL || strcmp(theme_name, "default") == 0) {
@ -170,8 +185,6 @@ theme_load(const char * const theme_name)
NULL); NULL);
} }
_load_colours();
_load_preferences();
return TRUE; return TRUE;
} }