From: Mikael Magnusson <mikachu@gmail.com>
Date: Sun, 20 Sep 2009 14:04:08 +0000 (+0200)
Subject: Merge branch 'work' into wip/mikabox
X-Git-Tag: mikabox-3.4.7.2~5
X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=4c11fc86671fa3e9278bb0b48e138e6f36299f60;p=mikachu%2Fopenbox.git

Merge branch 'work' into wip/mikabox

Conflicts:
	openbox/actions/all.c
	openbox/actions/all.h
---

4c11fc86671fa3e9278bb0b48e138e6f36299f60
diff --cc Makefile.am
index 828008e3,0c1b9b09..71a44795
--- a/Makefile.am
+++ b/Makefile.am
@@@ -209,11 -201,10 +209,12 @@@ openbox_openbox_SOURCES = 
  	openbox/actions/resize.c \
  	openbox/actions/resizerelative.c \
  	openbox/actions/restart.c \
 +	openbox/actions/sendkeyevent.c \
  	openbox/actions/shade.c \
+ 	openbox/actions/shadelowerraise.c \
  	openbox/actions/showdesktop.c \
  	openbox/actions/showmenu.c \
 +	openbox/actions/stop.c \
  	openbox/actions/unfocus.c \
  	openbox/actions.c \
  	openbox/actions.h \
diff --cc openbox/actions/all.c
index 8ee85d9a,952d756d..99b0de8b
--- a/openbox/actions/all.c
+++ b/openbox/actions/all.c
@@@ -41,8 -39,6 +41,10 @@@ void action_all_startup(void
      action_growtoedge_startup();
      action_if_startup();
      action_focustobottom_startup();
 +    action_sendkeyevent_startup();
 +    action_lock_startup();
 +    action_allclients_startup();
 +    action_stop_startup();
+     /* 3.4-compatibility */
+     action_shadelowerraise_startup();
  }
diff --cc openbox/actions/all.h
index 24db440b,1f520b93..b62e3160
--- a/openbox/actions/all.h
+++ b/openbox/actions/all.h
@@@ -42,9 -40,7 +42,11 @@@ void action_movetoedge_startup(void)
  void action_growtoedge_startup(void);
  void action_if_startup(void);
  void action_focustobottom_startup(void);
 +void action_sendkeyevent_startup(void);
 +void action_lock_startup(void);
 +void action_zenbu_startup(void);
 +void action_stop_startup(void);
+ /* 3.4-compatibility */
+ void action_shadelowerraise_startup(void);
  
  #endif
diff --cc openbox/client.c
index a0d7f9cf,a62aa5b6..6f13d9fe
--- a/openbox/client.c
+++ b/openbox/client.c
@@@ -442,11 -439,20 +441,11 @@@ void client_manage(Window window, ObPro
                        "Current focus_client: %s",
                        (focus_client ? focus_client->title : "(none)"));
          ob_debug_type(OB_DEBUG_FOCUS,
-                       "parent focuesed: %d  relative focused: %d",
+                       "parent focused: %d  relative focused: %d",
                        parent_focused, relative_focused);
  
 -        if (menu_frame_visible || moveresize_in_progress) {
 -            activate = FALSE;
 -            raise = TRUE;
 -            ob_debug_type(OB_DEBUG_FOCUS,
 -                          "Not focusing the window because the user is inside "
 -                          "an Openbox menu or is move/resizing a window and "
 -                          "we don't want to interrupt them");
 -        }
 -
          /* if it's on another desktop */
 -        else if (!(self->desktop == screen_desktop ||
 +        if (!(self->desktop == screen_desktop ||
                     self->desktop == DESKTOP_ALL) &&
                   /* the timestamp is from before you changed desktops */
                   launch_time && screen_desktop_user_time &&