X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fprop.c;h=44abdfe646bf0a5de2859380fa87d59b75dfd600;hb=df73dfa049b9d0bb81e09b27ecf678dce9b46301;hp=e055906879bb73fcf8c81fbfbd3e531f6ed847c1;hpb=c2c84c3f5ed75561d7d6502f787ab06bc7d984d2;p=chaz%2Fopenbox

diff --git a/openbox/prop.c b/openbox/prop.c
index e0559068..44abdfe6 100644
--- a/openbox/prop.c
+++ b/openbox/prop.c
@@ -27,7 +27,7 @@ Atoms prop_atoms;
 #define CREATE(var, name) (prop_atoms.var = \
                            XInternAtom(ob_display, name, FALSE))
 
-void prop_startup()
+void prop_startup(void)
 {
     CREATE(cardinal, "CARDINAL");
     CREATE(window, "WINDOW");
@@ -37,7 +37,7 @@ void prop_startup()
     CREATE(utf8, "UTF8_STRING");
 
     CREATE(manager, "MANAGER");
-     
+
     CREATE(wm_colormap_windows, "WM_COLORMAP_WINDOWS");
     CREATE(wm_protocols, "WM_PROTOCOLS");
     CREATE(wm_state, "WM_STATE");
@@ -94,7 +94,7 @@ void prop_startup()
 /*   CREATE(net_wm_pid, "_NET_WM_PID"); */
     CREATE(net_wm_allowed_actions, "_NET_WM_ALLOWED_ACTIONS");
     CREATE(net_wm_user_time, "_NET_WM_USER_TIME");
-    CREATE(net_wm_user_time_window, "_NET_WM_USER_TIME_WINDOW");
+/*    CREATE(net_wm_user_time_window, "_NET_WM_USER_TIME_WINDOW"); */
     CREATE(kde_net_wm_frame_strut, "_KDE_NET_WM_FRAME_STRUT");
     CREATE(net_frame_extents, "_NET_FRAME_EXTENTS");
 
@@ -135,6 +135,9 @@ void prop_startup()
     CREATE(net_wm_action_fullscreen, "_NET_WM_ACTION_FULLSCREEN");
     CREATE(net_wm_action_change_desktop, "_NET_WM_ACTION_CHANGE_DESKTOP");
     CREATE(net_wm_action_close, "_NET_WM_ACTION_CLOSE");
+    CREATE(net_wm_action_above, "_NET_WM_ACTION_ABOVE");
+    CREATE(net_wm_action_below, "_NET_WM_ACTION_BELOW");
+
     CREATE(net_wm_state_modal, "_NET_WM_STATE_MODAL");
 /*    CREATE(net_wm_state_sticky, "_NET_WM_STATE_STICKY");*/
     CREATE(net_wm_state_maximized_vert, "_NET_WM_STATE_MAXIMIZED_VERT");
@@ -147,7 +150,7 @@ void prop_startup()
     CREATE(net_wm_state_above, "_NET_WM_STATE_ABOVE");
     CREATE(net_wm_state_below, "_NET_WM_STATE_BELOW");
     CREATE(net_wm_state_demands_attention, "_NET_WM_STATE_DEMANDS_ATTENTION");
-  
+
     prop_atoms.net_wm_state_add = 1;
     prop_atoms.net_wm_state_remove = 0;
     prop_atoms.net_wm_state_toggle = 2;
@@ -168,9 +171,10 @@ void prop_startup()
 */
 
     CREATE(openbox_pid, "_OPENBOX_PID");
-    CREATE(openbox_config, "_OPENBOX_CONFIG");
-    CREATE(openbox_wm_state_undecorated, "_OB_WM_STATE_UNDECORATED");
-    CREATE(openbox_control, "_OPENBOX_CONTROL");
+    CREATE(ob_theme, "_OB_THEME");
+    CREATE(ob_wm_action_undecorate, "_OB_WM_ACTION_UNDECORATE");
+    CREATE(ob_wm_state_undecorated, "_OB_WM_STATE_UNDECORATED");
+    CREATE(ob_control, "_OB_CONTROL");
 }
 
 #include <X11/Xutil.h>
@@ -358,7 +362,7 @@ gboolean prop_get_string_utf8(Window win, Atom prop, gchar **ret)
     gchar *raw;
     gchar *str;
     guint num;
-     
+
     if (get_all(win, prop, prop_atoms.utf8, 8, (guchar**)&raw, &num)) {
         str = g_strndup(raw, num); /* grab the first string from the list */
         g_free(raw);