Restore the behaviour of active_window to go to the window with most recent activity

between the ones with highest data level, and make actlist_sort = level match this 
ordering.


git-svn-id: http://svn.irssi.org/repos/irssi/trunk@4798 dbcabf3a-b0e7-0310-adc4-f8d773084564

2 files changed, 4 insertions, 8 deletions

diff --git a/src/fe-common/core/window-commands.c b/src/fe-common/core/window-commands.c
index ecc4f285..3e262f4d 100644
--- a/src/fe-common/core/window-commands.c
+++ b/src/fe-common/core/window-commands.c
@@ -249,11 +249,11 @@ static WINDOW_REC *window_highest_activity(WINDOW_REC *window)
 {
 	WINDOW_REC *rec, *max_win;
 	GSList *tmp;
-	int max_act, max_ref, through;
+	int max_act, through;
 
 	g_return_val_if_fail(window != NULL, NULL);
 
-	max_win = NULL; max_act = 0; max_ref = 0; through = FALSE;
+	max_win = NULL; max_act = 0; through = FALSE;
 
 	tmp = g_slist_find(windows, window);
 	for (;; tmp = tmp->next) {
@@ -267,12 +267,9 @@ static WINDOW_REC *window_highest_activity(WINDOW_REC *window)
 
 		rec = tmp->data;
 
-		if (rec->data_level > 0 &&
-		    (rec->data_level > max_act ||
-		     (rec->data_level == max_act && rec->refnum < max_ref))) {
+		if (rec->data_level > 0 && max_act < rec->data_level) {
 			max_act = rec->data_level;
 			max_win = rec;
-			max_ref = rec->refnum;
 		}
 	}
 
diff --git a/src/fe-text/statusbar-items.c b/src/fe-text/statusbar-items.c
index bf4e5b98..b2340949 100644
--- a/src/fe-text/statusbar-items.c
+++ b/src/fe-text/statusbar-items.c
@@ -154,8 +154,7 @@ static void item_act(SBAR_ITEM_REC *item, int get_size_only)
 
 static int window_level_cmp(WINDOW_REC *w1, WINDOW_REC *w2)
 {
-	if (w1->data_level > w2->data_level ||
-	    (w1->data_level == w2->data_level && w1->refnum < w2->refnum))
+	if (w1->data_level >= w2->data_level)
 		return -1;
 	else
 		return 1;