From 8087053f496ae2bb8c68e56bdcf3dd1eaf8c2827 Mon Sep 17 00:00:00 2001
From: James Booth <boothj5@gmail.com>
Date: Tue, 27 Oct 2015 20:40:42 +0000
Subject: Removed ui_ev_focus_win

---
 src/ui/core.c     | 18 +++++++++++-------
 src/ui/inputwin.c |  6 +++---
 2 files changed, 14 insertions(+), 10 deletions(-)

(limited to 'src/ui')

diff --git a/src/ui/core.c b/src/ui/core.c
index a804c53c..0b941b70 100644
--- a/src/ui/core.c
+++ b/src/ui/core.c
@@ -756,6 +756,10 @@ ui_switch_win(ProfWin *window)
 {
     assert(window != NULL);
 
+    if (wins_is_current(window)) {
+        return;
+    }
+
     ProfWin *old_current = wins_get_current();
     if (old_current->type == WIN_MUC_CONFIG) {
         ProfMucConfWin *confwin = (ProfMucConfWin*)old_current;
@@ -927,7 +931,7 @@ void
 ui_create_xmlconsole_win(void)
 {
     ProfWin *window = wins_new_xmlconsole();
-    ui_ev_focus_win(window);
+    ui_switch_win(window);
 }
 
 void
@@ -935,7 +939,7 @@ ui_open_xmlconsole_win(void)
 {
     ProfXMLWin *xmlwin = wins_get_xmlconsole();
     if (xmlwin) {
-        ui_ev_focus_win((ProfWin*)xmlwin);
+        ui_switch_win((ProfWin*)xmlwin);
     }
 }
 
@@ -969,7 +973,7 @@ ui_room_join(const char *const roomjid, gboolean focus)
 
 
     if (focus) {
-        ui_ev_focus_win(window);
+        ui_switch_win(window);
     } else {
         int num = wins_get_num(window);
         status_bar_active(num);
@@ -983,7 +987,7 @@ void
 ui_switch_to_room(const char *const roomjid)
 {
     ProfWin *window = (ProfWin*)wins_get_muc(roomjid);
-    ui_ev_focus_win(window);
+    ui_switch_win(window);
 }
 
 void
@@ -2162,7 +2166,7 @@ ui_handle_room_configuration(const char *const roomjid, DataForm *form)
     ProfMucConfWin *confwin = (ProfMucConfWin*)window;
     assert(confwin->memcheck == PROFCONFWIN_MEMCHECK);
 
-    ui_ev_focus_win(window);
+    ui_switch_win(window);
     ui_show_form(confwin);
 
     win_print(window, '-', 0, NULL, 0, 0, "", "");
@@ -2214,11 +2218,11 @@ ui_handle_room_config_submit_result(const char *const roomjid)
         }
 
         if (muc_window) {
-            ui_ev_focus_win((ProfWin*)muc_window);
+            ui_switch_win((ProfWin*)muc_window);
             win_print(muc_window, '!', 0, NULL, 0, THEME_ROOMINFO, "", "Room configuration successful");
         } else {
             ProfWin *console = wins_get_console();
-            ui_ev_focus_win(console);
+            ui_switch_win(console);
             cons_show("Room configuration successful: %s", roomjid);
         }
     } else {
diff --git a/src/ui/inputwin.c b/src/ui/inputwin.c
index 78cbfab3..21f945f3 100644
--- a/src/ui/inputwin.c
+++ b/src/ui/inputwin.c
@@ -466,7 +466,7 @@ _go_to_win(int i)
 {
     ProfWin *window = wins_get_by_num(i);
     if (window) {
-        ui_ev_focus_win(window);
+        ui_switch_win(window);
     }
 }
 
@@ -545,7 +545,7 @@ _inp_rl_altleft_handler(int count, int key)
 {
     ProfWin *window = wins_get_previous();
     if (window) {
-        ui_ev_focus_win(window);
+        ui_switch_win(window);
     }
     return 0;
 }
@@ -555,7 +555,7 @@ _inp_rl_altright_handler(int count, int key)
 {
     ProfWin *window = wins_get_next();
     if (window) {
-        ui_ev_focus_win(window);
+        ui_switch_win(window);
     }
     return 0;
 }
-- 
cgit 1.4.1-2-gfad0