Merge branch 'backport' into 3.4-working

Conflicts:

	openbox/actions/all.h

diff --cc Makefile.am
index f959d8aa43c5969f5e6a1ae23643c67614815385,5c312c729f6d4e59ba13e101298d62a80454cd22..996c8ce09aa70380d62d3e784fe3e68c3a621cde
--- 1/Makefile.am
--- 2/Makefile.am
+++ b/Makefile.am
@@@ -173,9 -173,9 +173,8 @@@ openbox_openbox_SOURCES = 
        openbox/actions/fullscreen.c \
        openbox/actions/growtoedge.c \
        openbox/actions/iconify.c \
 -      openbox/actions/if.c \
        openbox/actions/kill.c \
        openbox/actions/layer.c \
-       openbox/actions/session.c \
        openbox/actions/lower.c \
        openbox/actions/maximize.c \
        openbox/actions/move.c \

diff --cc openbox/actions/all.c
Simple merge

diff --cc openbox/actions/all.h
index d6676a42a741673375a8cca462a9e7e1d7eff43c,5f3f573f247a967e3c1e19f3b5c85b29a8584b7b..c84322f85a3ef8fe651d405c3ed8baa7250c873b
--- 1/openbox/actions/all.h
--- 2/openbox/actions/all.h
+++ b/openbox/actions/all.h
@@@ -1,44 -1,43 +1,43 @@@
  #ifndef __actions_all_h
  #define __actions_all_h
  
 -void action_all_startup();
 +void action_all_startup(void);
  
 -void action_execute_startup();
 -void action_debug_startup();
 -void action_showmenu_startup();
 -void action_showdesktop_startup();
 -void action_reconfigure_startup();
 -void action_exit_startup();
 -void action_restart_startup();
 -void action_cyclewindows_startup();
 -void action_breakchroot_startup();
 -void action_close_startup();
 -void action_move_startup();
 -void action_focus_startup();
 -void action_raise_startup();
 -void action_lower_startup();
 -void action_raiselower_startup();
 -void action_unfocus_startup();
 -void action_iconify_startup();
 -void action_fullscreen_startup();
 -void action_maximize_startup();
 -void action_moveresizeto_startup();
 -void action_moverelative_startup();
 -void action_shade_startup();
 -void action_kill_startup();
 -void action_omnipresent_startup();
 -void action_directionalwindows_startup();
 -void action_resize_startup();
 -void action_decorations_startup();
 -void action_desktop_startup();
 -void action_resizerelative_startup();
 -void action_addremovedesktop_startup();
 -void action_dockautohide_startup();
 -void action_layer_startup();
 -void action_movetoedge_startup();
 -void action_growtoedge_startup();
 -void action_if_startup();
 -void action_focustobottom_startup();
 +void action_execute_startup(void);
 +void action_debug_startup(void);
 +void action_showmenu_startup(void);
 +void action_showdesktop_startup(void);
 +void action_reconfigure_startup(void);
 +void action_exit_startup(void);
 +void action_restart_startup(void);
- void action_session_startup(void);
 +void action_cyclewindows_startup(void);
 +void action_breakchroot_startup(void);
 +void action_close_startup(void);
 +void action_move_startup(void);
 +void action_focus_startup(void);
 +void action_raise_startup(void);
 +void action_lower_startup(void);
 +void action_raiselower_startup(void);
 +void action_unfocus_startup(void);
 +void action_iconify_startup(void);
 +void action_fullscreen_startup(void);
 +void action_maximize_startup(void);
 +void action_moveresizeto_startup(void);
 +void action_moverelative_startup(void);
 +void action_shade_startup(void);
 +void action_kill_startup(void);
 +void action_omnipresent_startup(void);
 +void action_directionalwindows_startup(void);
 +void action_resize_startup(void);
 +void action_decorations_startup(void);
 +void action_desktop_startup(void);
 +void action_resizerelative_startup(void);
 +void action_addremovedesktop_startup(void);
 +void action_dockautohide_startup(void);
 +void action_layer_startup(void);
 +void action_movetoedge_startup(void);
 +void action_growtoedge_startup(void);
 +void action_focustobottom_startup(void);
 +void action_shadelowerraise_startup(void);
  
  #endif

diff --cc openbox/session.c
index c9196a2e0bb0312f65751c522f7069875b206631,14018478ae183df6beda9a5af2015edaeec4ee2a..4e6dd817f8ad5dec73f3cf8d56dc88138b09a4c0
--- 1/openbox/session.c
--- 2/openbox/session.c
+++ b/openbox/session.c
@@@ -155,8 -156,13 +156,13 @@@ void session_shutdown(gboolean permanen
      }
  }
  
+ gboolean session_connected(void)
+ {
+     return !!sm_conn;
+ }
+ 
  /*! Connect to the session manager and set up our callback functions */
 -static gboolean session_connect()
 +static gboolean session_connect(void)
  {
      SmcCallbacks cb;
      gchar *oldid;