aniani/profanity
1
0
Fork 0
mirror of https://github.com/profanity-im/profanity.git synced 2024-11-03 19:37:16 -05:00
Code

Renamed functions in theme

Browse Source
This commit is contained in:
James Booth 2012-12-08 22:34:16 +00:00
parent 731dabd712
commit 4c243722c6
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/command.c
View File

@ -1223,7 +1223,7 @@ _cmd_prefs(gchar **args, struct cmd_help_t help)
static gboolean static gboolean
_cmd_theme(gchar **args, struct cmd_help_t help) _cmd_theme(gchar **args, struct cmd_help_t help)
{ {
if (theme_change(args[0])) { if (theme_load(args[0])) {
ui_load_colours(); ui_load_colours();
prefs_set_theme(args[0]); prefs_set_theme(args[0]);
cons_show("Loaded theme: %s", args[0]); cons_show("Loaded theme: %s", args[0]);

2
src/profanity.c
View File

@ -511,7 +511,7 @@ _init(const int disable_tls, char *log_level)
prefs_load(); prefs_load();
accounts_load(); accounts_load();
gchar *theme = prefs_get_theme(); gchar *theme = prefs_get_theme();
theme_load(theme); theme_init(theme);
g_free(theme); g_free(theme);
ui_init(); ui_init();
jabber_init(disable_tls); jabber_init(disable_tls);

4
src/theme.c
View File

@ -94,7 +94,7 @@ static void _set_colour(gchar *val, NCURSES_COLOR_T *pref,
static void _load_colours(void); static void _load_colours(void);
void void
theme_load(const char * const theme_name) theme_init(const char * const theme_name)
{ {
log_info("Loading theme"); log_info("Loading theme");
theme = g_key_file_new(); theme = g_key_file_new();
@ -113,7 +113,7 @@ theme_load(const char * const theme_name)
} }
gboolean gboolean
theme_change(const char * const theme_name) theme_load(const char * const theme_name)
{ {
// use default theme // use default theme
if (strcmp(theme_name, "default") == 0) { if (strcmp(theme_name, "default") == 0) {

4
src/theme.h
View File

@ -58,9 +58,9 @@
#define COLOUR_TYPING COLOR_PAIR(60) #define COLOUR_TYPING COLOR_PAIR(60)
#define COLOUR_GONE COLOR_PAIR(61) #define COLOUR_GONE COLOR_PAIR(61)
void theme_load(const char * const theme_name); void theme_init(const char * const theme_name);
void theme_init_colours(void); void theme_init_colours(void);
gboolean theme_change(const char * const theme_name); gboolean theme_load(const char * const theme_name);
void theme_close(void); void theme_close(void);
#endif #endif