From: Mikael Magnusson <mikachu@gmail.com>
Date: Sun, 20 Sep 2009 13:50:13 +0000 (+0200)
Subject: Merge branch 'backport' into work
X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fopenbox;a=commitdiff_plain;h=a92c209fc1845cf3f3acdfa3f9e8f0930fd53eb3

Merge branch 'backport' into work
---

a92c209fc1845cf3f3acdfa3f9e8f0930fd53eb3
diff --cc openbox/event.c
index e2fd411f,71fed413..3f5c1543
--- a/openbox/event.c
+++ b/openbox/event.c
@@@ -1526,6 -1517,13 +1526,13 @@@ static void event_handle_client(ObClien
                 reconfigure the window if it needs to. emacs will update its
                 normal hints every time it receives a conigurenotify */
              client_reconfigure(client, FALSE);
 -        } else if (msgtype == prop_atoms.motif_wm_hints) {
++        } else if (msgtype == OBT_PROP_ATOM(MOTIF_WM_HINTS)) {
+             client_get_mwm_hints(client);
+             /* This can override some mwm hints */
+             client_get_type_and_transientness(client);
+ 
+             /* Apply the changes to the window */
+             client_setup_decor_and_functions(client, TRUE);
          } else if (msgtype == XA_WM_HINTS) {
              client_update_wmhints(client);
          } else if (msgtype == XA_WM_TRANSIENT_FOR) {