Merge branch 'backport' into work

diff --cc openbox/client.c
Simple merge

diff --cc openbox/client.h
Simple merge

diff --cc openbox/event.c
index e2fd411f9f351ff830d9a35882bec13bd8a0bd2d,71fed41367461b9210066b365b01f3d4cbb9a0d7..3f5c154314896ae28fd7abde9bac3b9bb96c9888
--- 1/openbox/event.c
--- 2/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) {