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

[ion3.git] / ioncore / global.h

diff --git a/ioncore/global.h b/ioncore/global.h
index 37569104b812575552ccab5799951413a944f044..b23dce272789da027a58c2cff62827e63cdbe854 100644 (file)
--- a/ioncore/global.h
+++ b/ioncore/global.h
@@ -1,7 +1,7 @@
 /*
  * ion/ioncore/global.h
  *
- * Copyright (c) Tuomo Valkonen 1999-2006. 
+ * 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
@@ -17,6 +17,8 @@
 #include <X11/Xutil.h>
 #include <X11/Xresource.h>
 
+#include <libtu/stringstore.h>
+
 #include "rootwin.h"
 #include "screen.h"
 #include "window.h"
@@ -37,6 +39,7 @@ enum{
 
 INTRSTRUCT(WGlobal);
 
+
 DECLSTRUCT(WGlobal){
     int argc;
     char **argv;
@@ -85,6 +88,22 @@ DECLSTRUCT(WGlobal){
     bool enc_utf8; /* mb encoding is utf8? */
     
     const char *sm_client_id;
+    
+    struct{
+        StringId activated,
+                 inactivated,
+                 activity,
+                 sub_activity,
+                 name,
+                 unset_manager,
+                 set_manager,
+                 tag,
+                 set_return,
+                 unset_return,
+                 pseudoactivated,
+                 pseudoinactivated,
+                 deinit;
+    } notifies;
 };