1
0
mirror of https://github.com/profanity-im/profanity.git synced 2024-12-04 14:46:46 -05:00

Merge remote-tracking branch 'origin/ctrl-w' into ctrl-w

This commit is contained in:
James Booth 2014-12-01 22:14:09 +00:00
commit b704fb1777

View File

@ -60,7 +60,9 @@ static GTimer *typing_elapsed;
static void _title_bar_draw(void); static void _title_bar_draw(void);
static void _show_contact_presence(void); static void _show_contact_presence(void);
static void _show_self_presence(void); static void _show_self_presence(void);
#ifdef HAVE_LIBOTR
static void _show_privacy(void); static void _show_privacy(void);
#endif
void void
create_title_bar(void) create_title_bar(void)
@ -259,6 +261,7 @@ _show_self_presence(void)
wattroff(win, bracket_attrs); wattroff(win, bracket_attrs);
} }
#ifdef HAVE_LIBOTR
static void static void
_show_privacy(void) _show_privacy(void)
{ {
@ -320,6 +323,7 @@ _show_privacy(void)
} }
} }
} }
#endif
static void static void
_show_contact_presence(void) _show_contact_presence(void)
@ -363,4 +367,4 @@ _show_contact_presence(void)
wprintw(win, "]"); wprintw(win, "]");
wattroff(win, bracket_attrs); wattroff(win, bracket_attrs);
} }
} }