consistant glib type usage

[chaz/openbox] / openbox / prop.h

diff --git a/openbox/prop.h b/openbox/prop.h
index 01ca939a00e582ab0fef833124cf44647984f8d6..ca603d6db356d23b840964644c697bbced088219 100644 (file)
--- a/openbox/prop.h
+++ b/openbox/prop.h
@@ -1,4 +1,4 @@
-/* -*- indent-tabs-mode: t; tab-width: 4; c-basic-offset: 4; -*-
+/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
 
    prop.h for the Openbox window manager
    Copyright (c) 2003        Ben Jansens
@@ -151,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;
@@ -163,7 +163,7 @@ typedef struct Atoms {
     /* Openbox specific atoms */
      
     Atom openbox_pid;
-    Atom openbox_premax;
+    Atom ob_wm_state_undecorated;
 } Atoms;
 Atoms prop_atoms;
 
@@ -172,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))