From 754ad86e3d83fa78680d07368eb5ec5ae3dea57f Mon Sep 17 00:00:00 2001
From: James Booth <boothj5@gmail.com>
Date: Thu, 16 Jan 2014 19:06:32 +0000
Subject: Inlined _title_bar_draw_title and _title_bar_draw_presence

---
 src/ui/titlebar.c | 32 ++++++++------------------------
 1 file changed, 8 insertions(+), 24 deletions(-)

(limited to 'src/ui')

diff --git a/src/ui/titlebar.c b/src/ui/titlebar.c
index 052c6a6b..2ba38208 100644
--- a/src/ui/titlebar.c
+++ b/src/ui/titlebar.c
@@ -35,9 +35,6 @@ static GTimer *typing_elapsed;
 
 static contact_presence_t current_presence;
 
-static void _title_bar_draw_title(void);
-static void _title_bar_draw_presence(void);
-
 static void
 _create_title_bar(void)
 {
@@ -165,15 +162,15 @@ static void
 _title_bar_draw(void)
 {
     werase(win);
-    _title_bar_draw_title();
-    _title_bar_draw_presence();
-    wrefresh(win);
-    inp_put_back();
-}
 
-static void
-_title_bar_draw_presence(void)
-{
+    // show title
+    wmove(win, 0, 0);
+    int i;
+    for (i = 0; i < 45; i++)
+        waddch(win, ' ');
+    mvwprintw(win, 0, 0, " %s", current_title);
+
+    // show presence
     int cols = getmaxx(stdscr);
 
     wattron(win, COLOUR_TITLE_BRACKET);
@@ -210,19 +207,6 @@ _title_bar_draw_presence(void)
     inp_put_back();
 }
 
-static void
-_title_bar_draw_title(void)
-{
-    wmove(win, 0, 0);
-    int i;
-    for (i = 0; i < 45; i++)
-        waddch(win, ' ');
-    mvwprintw(win, 0, 0, " %s", current_title);
-
-    wrefresh(win);
-    inp_put_back();
-}
-
 void
 titlebar_init_module(void)
 {
-- 
cgit 1.4.1-2-gfad0