Merge branch 'master' into pgp

This commit is contained in:
James Booth
2015-04-30 21:24:06 +01:00
4 changed files with 13 additions and 36 deletions

View File

@@ -281,13 +281,6 @@ ui_load_colours(void)
}
}
gboolean
ui_win_exists(int index)
{
ProfWin *window = wins_get_by_num(index);
return (window != NULL);
}
gboolean
ui_xmlconsole_exists(void)
{
@@ -882,7 +875,8 @@ ui_switch_win(ProfWin *win)
gboolean
ui_switch_win_num(const int i)
{
if (ui_win_exists(i)) {
ProfWin *window = wins_get_by_num(i);
if (window) {
ProfWin *old_current = wins_get_current();
if (old_current->type == WIN_MUC_CONFIG) {
ProfMucConfWin *confwin = (ProfMucConfWin*)old_current;
@@ -1257,12 +1251,6 @@ ui_current_win_is_otr(void)
}
}
int
ui_current_win_index(void)
{
return wins_get_current_num();
}
win_type_t
ui_win_type(int index)
{

View File

@@ -98,7 +98,6 @@ int ui_close_read_wins(void);
// current window actions
void ui_clear_current(void);
win_type_t ui_current_win_type(void);
int ui_current_win_index(void);
gboolean ui_current_win_is_otr(void);
ProfChatWin *ui_get_current_chat(void);
@@ -110,7 +109,6 @@ void ui_win_error_line(ProfWin *window, const char * const msg);
win_type_t ui_win_type(int index);
void ui_close_win(int index);
gboolean ui_win_exists(int index);
int ui_win_unread(int index);
char * ui_ask_password(void);