# HG changeset patch
# User Tomasz Mon <desowin@gmail.com>
# Date 1198595007 -3600
# Node ID a5779105e6d2b18ed72e52d9e856e03bb97d5e04
# Parent  5853d43e539a861f50ef62c979c54a5d9e3871ff
on ctrl-tab switch only between visible windows (Bugzilla #14)

diff -r 5853d43e539a -r a5779105e6d2 src/audacious/ui_equalizer.c
--- a/src/audacious/ui_equalizer.c	Tue Dec 25 19:15:44 2007 +0900
+++ b/src/audacious/ui_equalizer.c	Tue Dec 25 16:03:27 2007 +0100
@@ -288,7 +288,10 @@
                       gpointer data)
 {
     if (event->keyval == GDK_Tab && event->state & GDK_CONTROL_MASK) {
-	playlistwin_show();
+        if (cfg.playlist_visible)
+            gtk_window_present(GTK_WINDOW(playlistwin));
+        else if (cfg.player_visible)
+            gtk_window_present(GTK_WINDOW(mainwin));
         return TRUE;
     }
 
diff -r 5853d43e539a -r a5779105e6d2 src/audacious/ui_main.c
--- a/src/audacious/ui_main.c	Tue Dec 25 19:15:44 2007 +0900
+++ b/src/audacious/ui_main.c	Tue Dec 25 16:03:27 2007 +0100
@@ -982,8 +982,12 @@
         mainwin_minimize_cb();
         break;
     case GDK_Tab:
-        if (event->state & GDK_CONTROL_MASK)
-	    equalizerwin_real_show();
+        if (event->state & GDK_CONTROL_MASK) {
+            if (cfg.equalizer_visible)
+                gtk_window_present(GTK_WINDOW(equalizerwin));
+            else if (cfg.playlist_visible)
+                gtk_window_present(GTK_WINDOW(playlistwin));
+        }
         break;
     case GDK_c:
 	if (event->state & GDK_CONTROL_MASK) {
diff -r 5853d43e539a -r a5779105e6d2 src/audacious/ui_playlist.c
--- a/src/audacious/ui_playlist.c	Tue Dec 25 19:15:44 2007 +0900
+++ b/src/audacious/ui_playlist.c	Tue Dec 25 16:03:27 2007 +0100
@@ -1268,8 +1268,12 @@
         mainwin_minimize_cb();
         break;
     case GDK_Tab:
-        if (event->state & GDK_CONTROL_MASK)
-            gtk_window_present(GTK_WINDOW(mainwin));
+        if (event->state & GDK_CONTROL_MASK) {
+            if (cfg.player_visible)
+                gtk_window_present(GTK_WINDOW(mainwin));
+            else if (cfg.equalizer_visible)
+                gtk_window_present(GTK_WINDOW(equalizerwin));
+        }
         break;
     default:
         return FALSE;