From 71abcf734348ee7ae0d40084f2b211dc0d2d963a Mon Sep 17 00:00:00 2001
From: mathias <mathias>
Date: Wed, 1 Dec 2004 14:45:32 +0000
Subject: deiconifyMode: Follow is the new/old default (as it was before
 deiconifyMode was introduced)

---
 src/IconButton.cc  | 10 +++++-----
 src/IconbarTool.cc |  6 +++---
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/IconButton.cc b/src/IconButton.cc
index 0ed516d..459b4be 100644
--- a/src/IconButton.cc
+++ b/src/IconButton.cc
@@ -76,10 +76,6 @@ public:
     void execute() {
         if(m_win.isIconic() || !m_win.isFocused()) {
             switch(m_tool.deiconifyMode()) {
-            case IconbarTool::FOLLOW:
-                m_win.screen().changeWorkspaceID(m_win.workspaceNumber());
-                m_win.raiseAndFocus();
-                break;
             case IconbarTool::SEMIFOLLOW:
                 if (m_win.isIconic()) {
                     m_win.screen().sendToWorkspace(m_win.screen().currentWorkspaceID(), &m_win);
@@ -89,9 +85,13 @@ public:
                 }
                 break;
             case IconbarTool::CURRENT:
-            default:
                 m_win.screen().sendToWorkspace(m_win.screen().currentWorkspaceID(), &m_win);
                 break;
+            case IconbarTool::FOLLOW:
+            default:
+                m_win.screen().changeWorkspaceID(m_win.workspaceNumber());
+                m_win.raiseAndFocus();
+                break;
             };
 
        } else
diff --git a/src/IconbarTool.cc b/src/IconbarTool.cc
index 6aff9b8..83ff8af 100644
--- a/src/IconbarTool.cc
+++ b/src/IconbarTool.cc
@@ -88,11 +88,11 @@ std::string FbTk::Resource<IconbarTool::DeiconifyMode>::getString() {
     case IconbarTool::SEMIFOLLOW:
         return std::string("SemiFollow");
         break;
-    case IconbarTool::FOLLOW:
-        return std::string("Follow");
+    case IconbarTool::CURRENT:
+        return std::string("Current");
         break;
     };
-    return std::string("Current");
+    return std::string("Follow");
 }
 
 template<>
-- 
cgit v0.11.2