about summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorJames Booth <boothj5@gmail.com>2014-01-16 18:04:25 +0000
committerJames Booth <boothj5@gmail.com>2014-01-16 18:04:25 +0000
commit0a04ef15104107ba043b7af5c21c63b39600f209 (patch)
tree745d1217605f85e95eba8b46eb95e755ad1f0012
parentaf1eab781010938ab433974a9a1223c861b700c2 (diff)
downloadprofani-tty-0a04ef15104107ba043b7af5c21c63b39600f209.tar.gz
Renamed title_bar_title -> title_bar_console
-rw-r--r--src/ui/core.c10
-rw-r--r--src/ui/titlebar.c6
-rw-r--r--src/ui/ui.h2
3 files changed, 9 insertions, 9 deletions
diff --git a/src/ui/core.c b/src/ui/core.c
index e0b934ae..36f6289b 100644
--- a/src/ui/core.c
+++ b/src/ui/core.c
@@ -551,7 +551,7 @@ _ui_switch_win(const int i)
         new_current->unread = 0;
 
         if (i == 1) {
-            title_bar_title();
+            title_bar_console();
             status_bar_current(1);
             status_bar_active(1);
         } else {
@@ -578,7 +578,7 @@ _ui_next_win(void)
     new_current->unread = 0;
 
     if (i == 1) {
-        title_bar_title();
+        title_bar_console();
         status_bar_current(1);
         status_bar_active(1);
     } else {
@@ -678,7 +678,7 @@ _ui_previous_win(void)
     new_current->unread = 0;
 
     if (i == 1) {
-        title_bar_title();
+        title_bar_console();
         status_bar_current(1);
         status_bar_active(1);
     } else {
@@ -704,18 +704,18 @@ _ui_close_current(void)
     int current_index = wins_get_current_num();
     status_bar_inactive(current_index);
     wins_close_current();
+    title_bar_console();
     status_bar_current(1);
     status_bar_active(1);
-    title_bar_title();
 }
 
 static void
 _ui_close_win(int index)
 {
     wins_close_by_num(index);
+    title_bar_console();
     status_bar_current(1);
     status_bar_active(1);
-    title_bar_title();
 
     wins_refresh_current();
 }
diff --git a/src/ui/titlebar.c b/src/ui/titlebar.c
index 8984519d..1a32f0ca 100644
--- a/src/ui/titlebar.c
+++ b/src/ui/titlebar.c
@@ -43,14 +43,14 @@ _create_title_bar(void)
 
     title_bar = newwin(1, cols, 0, 0);
     wbkgd(title_bar, COLOUR_TITLE_TEXT);
-    title_bar_title();
+    title_bar_console();
     title_bar_set_status(CONTACT_OFFLINE);
     wrefresh(title_bar);
     inp_put_back();
 }
 
 static void
-_title_bar_title(void)
+_title_bar_console(void)
 {
     werase(title_bar);
     recipient = NULL;
@@ -234,7 +234,7 @@ void
 titlebar_init_module(void)
 {
     create_title_bar = _create_title_bar;
-    title_bar_title = _title_bar_title;
+    title_bar_console = _title_bar_console;
     title_bar_resize = _title_bar_resize;
     title_bar_refresh = _title_bar_refresh;
     title_bar_show = _title_bar_show;
diff --git a/src/ui/ui.h b/src/ui/ui.h
index 4395b096..f0f03622 100644
--- a/src/ui/ui.h
+++ b/src/ui/ui.h
@@ -155,7 +155,7 @@ void (*create_input_window)(void);
 void (*title_bar_refresh)(void);
 void (*title_bar_resize)(void);
 void (*title_bar_show)(const char * const title);
-void (*title_bar_title)(void);
+void (*title_bar_console)(void);
 void (*title_bar_set_status)(contact_presence_t status);
 void (*title_bar_set_recipient)(const char * const from);
 void (*title_bar_set_typing)(gboolean is_typing);