obt returns libxml2 structures directly, so anyone linking against it better also...

[chaz/openbox] / obt / prop.c

diff --git a/obt/prop.c b/obt/prop.c
index 6eedce5dada7348dd2ba340a731b2f98609f20dd..bef9c9996d4d091707d7cf9ed4b0016c6da7025d 100644 (file)
--- a/obt/prop.c
+++ b/obt/prop.c
@@ -33,7 +33,7 @@ gboolean prop_started = FALSE;
 #define CREATE(var) CREATE_NAME(var, #var)
 #define CREATE_(var) CREATE_NAME(var, "_" #var)
 
-void obt_prop_startup()
+void obt_prop_startup(void)
 {
     if (prop_started) return;
     prop_started = TRUE;
@@ -62,7 +62,9 @@ void obt_prop_startup()
     CREATE(WM_CLIENT_MACHINE);
     CREATE(WM_COMMAND);
     CREATE(WM_CLIENT_LEADER);
+    CREATE(WM_TRANSIENT_FOR);
     CREATE_(MOTIF_WM_HINTS);
+    CREATE_(MOTIF_WM_INFO);
 
     CREATE(SM_CLIENT_ID);
 
@@ -123,6 +125,7 @@ void obt_prop_startup()
     CREATE_(NET_WM_WINDOW_TYPE_SPLASH);
     CREATE_(NET_WM_WINDOW_TYPE_DIALOG);
     CREATE_(NET_WM_WINDOW_TYPE_NORMAL);
+    CREATE_(NET_WM_WINDOW_TYPE_POPUP_MENU);
 
     prop_atoms[OBT_PROP_NET_WM_MOVERESIZE_SIZE_TOPLEFT] = 0;
     prop_atoms[OBT_PROP_NET_WM_MOVERESIZE_SIZE_TOP] = 1;
@@ -183,9 +186,16 @@ void obt_prop_startup()
 
     CREATE_(OPENBOX_PID);
     CREATE_(OB_THEME);
+    CREATE_(OB_CONFIG_FILE);
     CREATE_(OB_WM_ACTION_UNDECORATE);
     CREATE_(OB_WM_STATE_UNDECORATED);
     CREATE_(OB_CONTROL);
+    CREATE_(OB_VERSION);
+    CREATE_(OB_APP_ROLE);
+    CREATE_(OB_APP_TITLE);
+    CREATE_(OB_APP_NAME);
+    CREATE_(OB_APP_CLASS);
+    CREATE_(OB_APP_TYPE);
 }
 
 Atom obt_prop_atom(ObtPropAtom a)
@@ -416,7 +426,8 @@ void obt_prop_set_string_locale(Window win, Atom prop, const gchar *val)
     obt_prop_set_strings_locale(win, prop, s);
 }
 
-void obt_prop_set_strings_locale(Window win, Atom prop, const gchar **strs)
+void obt_prop_set_strings_locale(Window win, Atom prop,
+                                 const gchar *const *strs)
 {
     gint i, count;
     gchar **lstrs;
@@ -446,10 +457,11 @@ void obt_prop_set_string_utf8(Window win, Atom prop, const gchar *val)
                     PropModeReplace, (const guchar*)val, strlen(val));
 }
 
-void obt_prop_set_strings_utf8(Window win, Atom prop, const gchar **strs)
+void obt_prop_set_strings_utf8(Window win, Atom prop,
+                               const gchar *const *strs)
 {
     GString *str;
-    gchar const **s;
+    gchar const *const *s;
 
     str = g_string_sized_new(0);
     for (s = strs; *s; ++s) {