M src/WinClient.cc → src/WinClient.cc

@@ -19,7 +19,7 @@ // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: WinClient.cc,v 1.20 2003/07/28 15:06:34 rathnor Exp $
+// $Id: WinClient.cc,v 1.21 2003/07/28 15:46:00 rathnor Exp $
 
 #include "WinClient.hh"
 
@@ -67,6 +67,7 @@ updateMWMHints();
     updateWMHints();
     updateWMNormalHints();
     updateWMClassHint();
+    updateWMProtocols();
     updateTitle();
     updateIconTitle();
     Fluxbox::instance()->saveWindowSearch(win, this);
@@ -574,7 +575,7 @@ else
         return m_win->setCurrentClient(*this, true);
 }
 
-void WinClient::getWMProtocols() {
+void WinClient::updateWMProtocols() {
     Atom *proto = 0;
     int num_return = 0;
     FbAtoms *fbatoms = FbAtoms::instance();

M src/WinClient.hh → src/WinClient.hh

@@ -19,7 +19,7 @@ // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: WinClient.hh,v 1.11 2003/07/28 15:06:34 rathnor Exp $
+// $Id: WinClient.hh,v 1.12 2003/07/28 15:46:00 rathnor Exp $
 
 #ifndef WINCLIENT_HH
 #define WINCLIENT_HH
@@ -57,7 +57,7 @@ /// @return class member of class structure
     const std::string &getWMClassClass() const;
     /// updates from wm class hints
     void updateWMClassHint();
-    void getWMProtocols();
+    void updateWMProtocols();
 
     inline const std::string &getTitle() const { return m_title; }
     void updateTitle();

M src/Window.cc → src/Window.cc

@@ -22,7 +22,7 @@ // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: Window.cc,v 1.213 2003/07/28 15:06:34 rathnor Exp $
+// $Id: Window.cc,v 1.214 2003/07/28 15:46:00 rathnor Exp $
 
 #include "Window.hh"
 
@@ -420,13 +420,13 @@ 
     functions.resize = functions.move = functions.iconify = functions.maximize = true;
     decorations.close = false;
 
-    functions.close = m_client->isClosable();
-
     if (m_client->getBlackboxHint() != 0)
         getBlackboxHints();
     else
         getMWMHints();
     
+    functions.close = m_client->isClosable();
+
     //!!
     // fetch client size and placement
     XWindowAttributes wattrib;
@@ -2254,7 +2254,7 @@ }
 
     default:
         if (atom == FbAtoms::instance()->getWMProtocolsAtom()) {
-            m_client->getWMProtocols();
+            m_client->updateWMProtocols();
             //!!TODO  check this area            
             // reset window actions
             setupWindow();