mirror of
https://github.com/irssi/irssi.git
synced 2024-12-04 14:46:39 -05:00
Always save theme to ~/.irssi/ no matter where it was read from.
git-svn-id: http://svn.irssi.org/repos/irssi/trunk@1323 dbcabf3a-b0e7-0310-adc4-f8d773084564
This commit is contained in:
parent
7118830573
commit
9a5b97164e
@ -938,27 +938,15 @@ static void theme_save(THEME_REC *theme)
|
|||||||
|
|
||||||
g_hash_table_foreach(theme->modules, (GHFunc) module_save, config);
|
g_hash_table_foreach(theme->modules, (GHFunc) module_save, config);
|
||||||
|
|
||||||
ok = TRUE;
|
/* always save the theme to ~/.irssi/ */
|
||||||
path = g_strdup(theme->path);
|
|
||||||
if (config_write(config, NULL, 0660) == -1) {
|
|
||||||
/* we probably tried to save to global directory
|
|
||||||
where we didn't have access.. try saving it to
|
|
||||||
home dir instead. */
|
|
||||||
char *str;
|
|
||||||
|
|
||||||
/* check that we really didn't try to save
|
|
||||||
it to home dir.. */
|
|
||||||
g_free(path);
|
|
||||||
path = g_strdup_printf("%s/.irssi/%s", g_get_home_dir(),
|
path = g_strdup_printf("%s/.irssi/%s", g_get_home_dir(),
|
||||||
g_basename(theme->path));
|
g_basename(theme->path));
|
||||||
str = strrchr(path, '/');
|
ok = config_write(config, path, 0660) == 0;
|
||||||
if (strncmp(theme->path, path, (int) (path-str)) == 0 ||
|
|
||||||
config_write(config, path, 0660) == -1)
|
|
||||||
ok = FALSE;
|
|
||||||
}
|
|
||||||
printformat(NULL, NULL, MSGLEVEL_CLIENTNOTICE,
|
printformat(NULL, NULL, MSGLEVEL_CLIENTNOTICE,
|
||||||
ok ? TXT_THEME_SAVED : TXT_THEME_SAVE_FAILED,
|
ok ? TXT_THEME_SAVED : TXT_THEME_SAVE_FAILED,
|
||||||
path, config_last_error(config));
|
path, config_last_error(config));
|
||||||
|
|
||||||
g_free(path);
|
g_free(path);
|
||||||
config_close(config);
|
config_close(config);
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user