jrd/irssi
1
0
Fork 0
forked from PsychoticNinja/irssi
Code Issues Pull Requests Projects Releases Wiki Activity

/SET theme - complains if theme isn't found. Setting theme's name to

Browse Source 
"xxx.theme" now works, too many people tried it with the .theme suffix :)


git-svn-id: http://svn.irssi.org/repos/irssi/trunk@1102 dbcabf3a-b0e7-0310-adc4-f8d773084564
This commit is contained in:
Timo Sirainen 2001-01-11 09:14:21 +00:00 committed by cras
parent ebdaa110f1
commit 091e06387b
1 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/fe-common/core/themes.c
View File

@ -617,14 +617,24 @@ static THEME_REC *theme_find(const char *name)
return NULL; return NULL;
} }
THEME_REC *theme_load(const char *name) THEME_REC *theme_load(const char *setname)
{ {
THEME_REC *theme; THEME_REC *theme;
struct stat statbuf; struct stat statbuf;
char *fname; char *fname, *name, *p;
name = g_strdup(setname);
p = strrchr(name, '.');
if (p != NULL && strcmp(p, ".theme") == 0) {
/* remove the trailing .theme */
*p = '\0';
}
theme = theme_find(name); theme = theme_find(name);
if (theme != NULL) return theme; if (theme != NULL) {
g_free(name);
return theme;
}
/* check home dir */ /* check home dir */
fname = g_strdup_printf("%s/.irssi/%s.theme", g_get_home_dir(), name); fname = g_strdup_printf("%s/.irssi/%s.theme", g_get_home_dir(), name);
@ -635,6 +645,7 @@ THEME_REC *theme_load(const char *name)
if (stat(fname, &statbuf) != 0) { if (stat(fname, &statbuf) != 0) {
/* theme not found */ /* theme not found */
g_free(fname); g_free(fname);
g_free(name);
return NULL; return NULL;
} }
} }
@ -643,6 +654,7 @@ THEME_REC *theme_load(const char *name)
theme_read(theme, theme->path, NULL); theme_read(theme, theme->path, NULL);
g_free(fname); g_free(fname);
g_free(name);
return theme; return theme;
} }
@ -999,7 +1011,12 @@ static void read_settings(void)
theme = settings_get_str("theme"); theme = settings_get_str("theme");
if (strcmp(current_theme->name, theme) != 0) { if (strcmp(current_theme->name, theme) != 0) {
rec = theme_load(theme); rec = theme_load(theme);
if (rec != NULL) current_theme = rec; if (rec != NULL)
current_theme = rec;
else {
printformat(NULL, NULL, MSGLEVEL_CLIENTERROR,
TXT_THEME_NOT_FOUND, theme);
}
} }
} }