Swap ThemeFind() and ThemePathFind() names
Seems more reasonable.
This commit is contained in:
parent
6796b87dff
commit
cefd067f7d
4
src/E.h
4
src/E.h
|
@ -549,9 +549,9 @@ void StartupWindowsOpen(void);
|
|||
void StartupBackgroundsDestroy(void);
|
||||
|
||||
/* theme.c */
|
||||
char *ThemeFind(const char *theme);
|
||||
char *ThemePathFind(const char *theme);
|
||||
char *ThemePathName(const char *path);
|
||||
void ThemePathFind(void);
|
||||
void ThemeFind(void);
|
||||
char **ThemesList(int *num);
|
||||
|
||||
/*
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
/*
|
||||
* Copyright (C) 2000-2007 Carsten Haitzler, Geoff Harrison and various contributors
|
||||
* Copyright (C) 2004-2015 Kim Woelders
|
||||
* Copyright (C) 2004-2018 Kim Woelders
|
||||
*
|
||||
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
* of this software and associated documentation files (the "Software"), to
|
||||
|
@ -240,7 +240,7 @@ main(int argc, char **argv)
|
|||
LangInit();
|
||||
|
||||
/* The theme path must now be available for config file loading. */
|
||||
ThemePathFind();
|
||||
ThemeFind();
|
||||
|
||||
/* Set the Environment variables */
|
||||
Esetenv("EVERSION", e_wm_version);
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
/*
|
||||
* Copyright (C) 2000-2007 Carsten Haitzler, Geoff Harrison and various contributors
|
||||
* Copyright (C) 2004-2014 Kim Woelders
|
||||
* Copyright (C) 2004-2018 Kim Woelders
|
||||
*
|
||||
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
* of this software and associated documentation files (the "Software"), to
|
||||
|
@ -374,7 +374,7 @@ _SoundConfigLoad(void)
|
|||
|
||||
Efree(Mode_sound.theme_path);
|
||||
if (Conf_sound.theme)
|
||||
Mode_sound.theme_path = ThemeFind(Conf_sound.theme);
|
||||
Mode_sound.theme_path = ThemePathFind(Conf_sound.theme);
|
||||
else
|
||||
Mode_sound.theme_path = NULL;
|
||||
|
||||
|
|
|
@ -269,7 +269,7 @@ _ThemeExtract(const char *path)
|
|||
}
|
||||
|
||||
char *
|
||||
ThemeFind(const char *theme)
|
||||
ThemePathFind(const char *theme)
|
||||
{
|
||||
static const char *const default_themes[] = {
|
||||
"DEFAULT", "winter", "BrushedMetal-Tigert", "ShinyMetal", NULL
|
||||
|
@ -337,7 +337,7 @@ ThemeFind(const char *theme)
|
|||
}
|
||||
|
||||
void
|
||||
ThemePathFind(void)
|
||||
ThemeFind(void)
|
||||
{
|
||||
char *name, *path, *s;
|
||||
|
||||
|
@ -354,7 +354,7 @@ ThemePathFind(void)
|
|||
Mode.theme.variant = Estrdup(s);
|
||||
}
|
||||
|
||||
path = ThemeFind(name);
|
||||
path = ThemePathFind(name);
|
||||
|
||||
if (!path && (!name || strcmp(name, "-")))
|
||||
{
|
||||
|
@ -456,7 +456,7 @@ ThemesIpc(const char *params)
|
|||
|
||||
IpcPrintf("Name: %s\n", (Conf.theme.name) ? Conf.theme.name : "-");
|
||||
IpcPrintf("Full: %s\n", Mode.theme.path);
|
||||
path = ThemeFind(NULL);
|
||||
path = ThemePathFind(NULL);
|
||||
IpcPrintf("Default: %s\n", path);
|
||||
Efree(path);
|
||||
IpcPrintf("Path: %s\n", Mode.theme.paths);
|
||||
|
|
Loading…
Reference in New Issue