From: Dana Jansens <danakj@orodu.net>
Date: Sun, 2 Mar 2008 08:47:02 +0000 (-0500)
Subject: Merge branch 'backport' into 3.4-working
X-Git-Tag: release-3.4.7-pre2~10
X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=f3d40932a96fd92fc383ed212c753f83f8417d77;p=dana%2Fopenbox.git

Merge branch 'backport' into 3.4-working

Conflicts:

	openbox/actions/all.h
---

f3d40932a96fd92fc383ed212c753f83f8417d77
diff --cc Makefile.am
index c0822f8d,6a6f1754..c8ae71dd
--- a/Makefile.am
+++ b/Makefile.am
@@@ -172,8 -173,10 +173,9 @@@ 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.h
index c84322f8,4fbd6ff5..d6676a42
--- a/openbox/actions/all.h
+++ b/openbox/actions/all.h
@@@ -1,43 -1,44 +1,44 @@@
  #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_session_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