consistant glib type usage

[chaz/openbox] / openbox / prop.h

diff --git a/openbox/prop.h b/openbox/prop.h
index 5bfad5727ea2cd3c6c3d52a5d2a0527e8fa43c18..ca603d6db356d23b840964644c697bbced088219 100644 (file)
--- a/openbox/prop.h
+++ b/openbox/prop.h
@@ -1,3 +1,21 @@
+/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
+
+   prop.h for the Openbox window manager
+   Copyright (c) 2003        Ben Jansens
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   See the COPYING file for a copy of the GNU General Public License.
+*/
+
 #ifndef __atoms_h
 #define __atoms_h
 
@@ -56,6 +74,10 @@ typedef struct Atoms {
     Atom net_close_window;
     Atom net_wm_moveresize;
     Atom net_moveresize_window;
+
+    /* startup-notification extension */
+    Atom net_startup_id;
+
     /* application window properties */
     Atom net_wm_name;
     Atom net_wm_visible_name;
@@ -129,8 +151,8 @@ typedef struct Atoms {
 
     /* Extra atoms */
 
-    Atom kde_net_system_tray_windows;
-    Atom kde_net_wm_system_tray_window_for;
+    Atom kde_net_wm_frame_strut;
+    Atom kde_wm_change_state;
     Atom kde_net_wm_window_type_override;
 
     Atom kwm_win_icon;
@@ -141,7 +163,7 @@ typedef struct Atoms {
     /* Openbox specific atoms */
      
     Atom openbox_pid;
-    Atom openbox_premax;
+    Atom ob_wm_state_undecorated;
 } Atoms;
 Atoms prop_atoms;
 
@@ -150,21 +172,21 @@ void prop_startup();
 gboolean prop_get32(Window win, Atom prop, Atom type, guint32 *ret);
 gboolean prop_get_array32(Window win, Atom prop, Atom type, guint32 **ret,
                           guint *nret);
-gboolean prop_get_string_locale(Window win, Atom prop, char **ret);
-gboolean prop_get_string_utf8(Window win, Atom prop, char **ret);
-gboolean prop_get_strings_locale(Window win, Atom prop, char ***ret);
-gboolean prop_get_strings_utf8(Window win, Atom prop, char ***ret);
+gboolean prop_get_string_locale(Window win, Atom prop, gchar **ret);
+gboolean prop_get_string_utf8(Window win, Atom prop, gchar **ret);
+gboolean prop_get_strings_locale(Window win, Atom prop, gchar ***ret);
+gboolean prop_get_strings_utf8(Window win, Atom prop, gchar ***ret);
 
 void prop_set32(Window win, Atom prop, Atom type, guint32 val);
 void prop_set_array32(Window win, Atom prop, Atom type, guint32 *val,
                       guint num);
-void prop_set_string_utf8(Window win, Atom prop, char *val);
-void prop_set_strings_utf8(Window win, Atom prop, char **strs);
+void prop_set_string_utf8(Window win, Atom prop, gchar *val);
+void prop_set_strings_utf8(Window win, Atom prop, gchar **strs);
 
 void prop_erase(Window win, Atom prop);
 
-void prop_message(Window about, Atom messagetype, long data0, long data1,
-                 long data2, long data3, long mask);
+void prop_message(Window about, Atom messagetype, glong data0, glong data1,
+                 glong data2, glong data3, glong mask);
 
 #define PROP_GET32(win, prop, type, ret) \
     (prop_get32(win, prop_atoms.prop, prop_atoms.type, ret))