[svn-upgrade] Integrating new upstream version, ion3 (20070506)

[ion3.git] / ioncore / ioncore.c

diff --git a/ioncore/ioncore.c b/ioncore/ioncore.c
index 49da6c715f4dc04d7f3c80fd8e1a416c31bfff41..097801d342f2f9c1136c504f423f0846887eb841 100644 (file)
--- a/ioncore/ioncore.c
+++ b/ioncore/ioncore.c
@@ -3,10 +3,7 @@
  *
  * Copyright (c) Tuomo Valkonen 1999-2007. 
  *
- * Ion is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation; either version 2.1 of the License, or
- * (at your option) any later version.
+ * See the included file LICENSE for details.
  */
 
 #include <stdlib.h>
@@ -58,6 +55,7 @@
 #include "llist.h"
 #include "exec.h"
 #include "screen-notify.h"
+#include "key.h"
 
 
 #include "../version.h"
@@ -273,6 +271,7 @@ static bool init_hooks()
     INIT_HOOK_(clientwin_mapped_hook);
     INIT_HOOK_(clientwin_unmapped_hook);
     INIT_HOOK_(clientwin_property_change_hook);
+    INIT_HOOK_(ioncore_submap_ungrab_hook);
     
     INIT_HOOK_(region_notify_hook);
     ADD_HOOK_(region_notify_hook, ioncore_frame_quasiactivation_notify);
@@ -504,6 +503,7 @@ static bool ioncore_init_x(const char *display, int stflags)
     ioncore_g.atom_wm_window_role=XInternAtom(dpy, "WM_WINDOW_ROLE", False);
     ioncore_g.atom_checkcode=XInternAtom(dpy, "_ION_CWIN_RESTART_CHECKCODE", False);
     ioncore_g.atom_selection=XInternAtom(dpy, "_ION_SELECTION_STRING", False);
+    ioncore_g.atom_dockapp_hack=XInternAtom(dpy, "_ION_DOCKAPP_HACK", False);
     ioncore_g.atom_mwm_hints=XInternAtom(dpy, "_MOTIF_WM_HINTS", False);
 
     ioncore_init_xim();