Merge branch 'backport' into work

Conflicts:

	openbox/client.c

diff --cc .gitignore
index 3f68a41191af3f8468a065ecda14f3a0b90ecf8f,38043304486caec60cc4baf37465c7f611822a70..9e6bcb6b4d2d19443cdb9823bf528ad1ef4a2239
--- 1/.gitignore
--- 2/.gitignore
+++ b/.gitignore
@@@ -48,9 -48,9 +48,10 @@@ po/en@boldquot.insert-heade
  po/en@quot.insert-header
  po/remove-potcdate.sed
  *.gmo
 -render/obrender-3.0.pc
 +render/obrender-4.0.pc
 +obt/obt-4.0.pc
  tools/gnome-panel-control/gnome-panel-control
+ tools/gdm-control/gdm-control
  version.h
  .libs
  .deps

diff --cc openbox/client.c
index e9443d4914e256ac5647e7ef2dafd261c7ca13b8,585379ec802399cf93561e24e414578ca0aa990e..a055e6329176328f04053fae18c96e6b0019cda5
--- 1/openbox/client.c
--- 2/openbox/client.c
+++ b/openbox/client.c
@@@ -414,19 -494,22 +414,27 @@@ void client_manage(Window window, ObPro
                    activate ? "yes" : "no");
      if (activate) {
          gboolean raise = FALSE;
-         gboolean relative_focused = FALSE;
+         gboolean relative_focused;
+         gboolean parent_focused;
  
+         parent_focused = (focus_client != NULL &&
+                           client_search_focus_parent(self));
          relative_focused = (focus_client != NULL &&
-                             client_search_focus_tree_full(self) != NULL &&
-                             client_search_focus_group_full(self) != NULL);
- 
+                             (client_search_focus_tree_full(self) != NULL ||
+                              client_search_focus_group_full(self) != NULL));
  
 -
          /* This is focus stealing prevention */
          ob_debug_type(OB_DEBUG_FOCUS,
                        "Want to focus new window 0x%x at time %u "
 -                      "launched at %u (last user interaction time %u)\n",
 +                      "launched at %u (last user interaction time %u)",
                        self->window, map_time, launch_time,
                        event_last_user_time);
++        ob_debug_type(OB_DEBUG_FOCUS,
++                      "Current focus_client: %s",
++                      (focus_client ? focus_client->title : "(none)"));
++        ob_debug_type(OB_DEBUG_FOCUS,
++                      "parent focuesed: %d  relative focused: %d",
++                      parent_focused, relative_focused);
  
          if (menu_frame_visible || moveresize_in_progress) {
              activate = FALSE;
@@@ -463,7 -547,8 +472,8 @@@
                  activate = FALSE;
                  ob_debug_type(OB_DEBUG_FOCUS,
                                "Not focusing the window because the user is "
-                               "working in another window");
+                               "working in another window that is not "
 -                              "its parent\n");
++                              "its parent");
              }
              /* If the new window is a transient (and its relatives aren't
                 focused) */

diff --cc openbox/client.h
Simple merge

diff --cc render/image.c
Simple merge