diff options
Diffstat (limited to 'src/Window.cc')
-rw-r--r-- | src/Window.cc | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/src/Window.cc b/src/Window.cc index 488a37b..032c4cd 100644 --- a/src/Window.cc +++ b/src/Window.cc | |||
@@ -22,7 +22,7 @@ | |||
22 | // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER | 22 | // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER |
23 | // DEALINGS IN THE SOFTWARE. | 23 | // DEALINGS IN THE SOFTWARE. |
24 | 24 | ||
25 | // $Id: Window.cc,v 1.181 2003/05/19 15:39:06 rathnor Exp $ | 25 | // $Id: Window.cc,v 1.182 2003/05/19 22:43:48 fluxgen Exp $ |
26 | 26 | ||
27 | #include "Window.hh" | 27 | #include "Window.hh" |
28 | 28 | ||
@@ -1023,8 +1023,7 @@ void FluxboxWindow::getMWMHints() { | |||
1023 | Atom atom_return; | 1023 | Atom atom_return; |
1024 | unsigned long num, len; | 1024 | unsigned long num, len; |
1025 | Atom motif_wm_hints = XInternAtom(display, "_MOTIF_WM_HINTS", False); | 1025 | Atom motif_wm_hints = XInternAtom(display, "_MOTIF_WM_HINTS", False); |
1026 | if (!XGetWindowProperty(display, m_client->window(), | 1026 | if (!m_client->property(motif_wm_hints, 0, |
1027 | motif_wm_hints, 0, | ||
1028 | PropMwmHintsElements, false, | 1027 | PropMwmHintsElements, false, |
1029 | motif_wm_hints, &atom_return, | 1028 | motif_wm_hints, &atom_return, |
1030 | &format, &num, &len, | 1029 | &format, &num, &len, |
@@ -1835,12 +1834,11 @@ void FluxboxWindow::restoreAttributes() { | |||
1835 | FbAtoms *fbatoms = FbAtoms::instance(); | 1834 | FbAtoms *fbatoms = FbAtoms::instance(); |
1836 | 1835 | ||
1837 | BlackboxAttributes *net; | 1836 | BlackboxAttributes *net; |
1838 | if (XGetWindowProperty(display, m_client->window(), | 1837 | if (m_client->property(fbatoms->getFluxboxAttributesAtom(), 0l, |
1839 | fbatoms->getFluxboxAttributesAtom(), 0l, | ||
1840 | PropBlackboxAttributesElements, false, | 1838 | PropBlackboxAttributesElements, false, |
1841 | fbatoms->getFluxboxAttributesAtom(), &atom_return, &foo, | 1839 | fbatoms->getFluxboxAttributesAtom(), &atom_return, &foo, |
1842 | &nitems, &ulfoo, (unsigned char **) &net) == | 1840 | &nitems, &ulfoo, (unsigned char **) &net) && |
1843 | Success && net && nitems == (unsigned)PropBlackboxAttributesElements) { | 1841 | net && nitems == (unsigned)PropBlackboxAttributesElements) { |
1844 | m_blackbox_attrib.flags = net->flags; | 1842 | m_blackbox_attrib.flags = net->flags; |
1845 | m_blackbox_attrib.attrib = net->attrib; | 1843 | m_blackbox_attrib.attrib = net->attrib; |
1846 | m_blackbox_attrib.workspace = net->workspace; | 1844 | m_blackbox_attrib.workspace = net->workspace; |