From 4c243722c6b17ccafffaaba47d9c4e1a7e00ab56 Mon Sep 17 00:00:00 2001
From: James Booth <boothj5@gmail.com>
Date: Sat, 8 Dec 2012 22:34:16 +0000
Subject: [PATCH] Renamed functions in theme

---
 src/command.c   | 2 +-
 src/profanity.c | 2 +-
 src/theme.c     | 4 ++--
 src/theme.h     | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/command.c b/src/command.c
index 0606c12f..2b0d14bc 100644
--- a/src/command.c
+++ b/src/command.c
@@ -1223,7 +1223,7 @@ _cmd_prefs(gchar **args, struct cmd_help_t help)
 static gboolean
 _cmd_theme(gchar **args, struct cmd_help_t help)
 {
-    if (theme_change(args[0])) {
+    if (theme_load(args[0])) {
         ui_load_colours();
         prefs_set_theme(args[0]);
         cons_show("Loaded theme: %s", args[0]);
diff --git a/src/profanity.c b/src/profanity.c
index d0616d2d..2fdea3f6 100644
--- a/src/profanity.c
+++ b/src/profanity.c
@@ -511,7 +511,7 @@ _init(const int disable_tls, char *log_level)
     prefs_load();
     accounts_load();
     gchar *theme = prefs_get_theme();
-    theme_load(theme);
+    theme_init(theme);
     g_free(theme);
     ui_init();
     jabber_init(disable_tls);
diff --git a/src/theme.c b/src/theme.c
index bdbc91f8..47f678f4 100644
--- a/src/theme.c
+++ b/src/theme.c
@@ -94,7 +94,7 @@ static void _set_colour(gchar *val, NCURSES_COLOR_T *pref,
 static void _load_colours(void);
 
 void
-theme_load(const char * const theme_name)
+theme_init(const char * const theme_name)
 {
     log_info("Loading theme");
     theme = g_key_file_new();
@@ -113,7 +113,7 @@ theme_load(const char * const theme_name)
 }
 
 gboolean
-theme_change(const char * const theme_name)
+theme_load(const char * const theme_name)
 {
     // use default theme
     if (strcmp(theme_name, "default") == 0) {
diff --git a/src/theme.h b/src/theme.h
index ca1c2245..8de1ace1 100644
--- a/src/theme.h
+++ b/src/theme.h
@@ -58,9 +58,9 @@
 #define COLOUR_TYPING           COLOR_PAIR(60)
 #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);
-gboolean theme_change(const char * const theme_name);
+gboolean theme_load(const char * const theme_name);
 void theme_close(void);
 
 #endif