gui: Rename public gui theme functions.

Prefix all functions related to themes with "theme_".

diff --git a/gui.c b/gui.c
index 96132589157ab83810da14e3f96e768d80f518ae..c301f9ce0347a75b1cac68f4c15eff2e53678a23 100644 (file)
--- a/gui.c
+++ b/gui.c
@@ -1414,9 +1414,9 @@ static void com_refresh(void)
 static void change_theme(int next)
 {
        if (next)
 static void change_theme(int next)
 {
        if (next)

-               next_theme(&theme);
+               theme_next(&theme);

        else
        else

-               prev_theme(&theme);
+               theme_prev(&theme);

        /* This seems to be needed twice, why? */
        com_refresh();
        com_refresh();
        /* This seems to be needed twice, why? */
        com_refresh();
        com_refresh();


@@ -1519,7 +1519,7 @@ int main(int argc, char *argv[])
                fprintf(stderr, "invalid key map\n");
                exit(EXIT_FAILURE);
        }
                fprintf(stderr, "invalid key map\n");
                exit(EXIT_FAILURE);
        }

-       init_theme_or_die(conf.theme_arg, &theme);
+       theme_init(conf.theme_arg, &theme);

        setup_signal_handling();
        bot_win_rb = ringbuffer_new(RINGBUFFER_SIZE);
        setlocale(LC_CTYPE, "");
        setup_signal_handling();
        bot_win_rb = ringbuffer_new(RINGBUFFER_SIZE);
        setlocale(LC_CTYPE, "");

diff --git a/gui.h b/gui.h
index e6e4167f9bc5d5411b18dcbb6f8df91c35621177..13f50806db43c7bdc93da180e3ad61a3b9d71d63 100644 (file)
--- a/gui.h
+++ b/gui.h
@@ -29,9 +29,9 @@ struct gui_theme {
        struct stat_item_data data[NUM_STAT_ITEMS];
 };
 
        struct stat_item_data data[NUM_STAT_ITEMS];
 };
 

-void init_theme_or_die(const char *name, struct gui_theme *t);
-void next_theme(struct gui_theme *);
-void prev_theme(struct gui_theme *);
+void theme_init(const char *name, struct gui_theme *t);
+void theme_prev(struct gui_theme *t);
+void theme_next(struct gui_theme *t);

 #define LEFT 1
 #define RIGHT 2
 #define CENTER 3
 #define LEFT 1
 #define RIGHT 2
 #define CENTER 3

diff --git a/gui_theme.c b/gui_theme.c
index 5d3fac1c15a74d6d626cc53ef3478a050146052d..3963d35267e33307fc68867513a08c66ccfb591f 100644 (file)
--- a/gui_theme.c
+++ b/gui_theme.c
@@ -383,7 +383,7 @@ static void set_theme(int num, struct gui_theme *t)
        current_theme_num = num;
 }
 
        current_theme_num = num;
 }
 

-void init_theme_or_die(const char *name, struct gui_theme *t)
+void theme_init(const char *name, struct gui_theme *t)

 {
        int i;
 
 {
        int i;
 


@@ -398,12 +398,12 @@ void init_theme_or_die(const char *name, struct gui_theme *t)
        exit(EXIT_FAILURE);
 }
 
        exit(EXIT_FAILURE);
 }
 

-void prev_theme(struct gui_theme *t)
+void theme_prev(struct gui_theme *t)

 {
        return set_theme(++current_theme_num, t);
 }
 
 {
        return set_theme(++current_theme_num, t);
 }
 

-void next_theme(struct gui_theme *t)
+void theme_next(struct gui_theme *t)

 {
        return set_theme(--current_theme_num, t);
 }
 {
        return set_theme(--current_theme_num, t);
 }