[Xcb-commit] icccm

[Julien Danjou]

 icccm/icccm.c     |    6 +++---
 icccm/xcb_icccm.h |    4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit c4d34e7d9ecf537e95c44b3de0861ead606befa9
Author: Julien Danjou <julien at danjou.info>
Date:   Mon Dec 29 17:57:55 2008 +0100

    icccm: change class hint struct fields name
    
    Signed-off-by: Julien Danjou <julien at danjou.info>

diff --git a/icccm/icccm.c b/icccm/icccm.c
index f711deb..a1d7502 100644
--- a/icccm/icccm.c
+++ b/icccm/icccm.c
@@ -250,13 +250,13 @@ xcb_get_wm_class_reply(xcb_connection_t *c, xcb_get_property_cookie_t cookie,
   }
 
   prop->_reply = reply;
-  prop->name = (char *) xcb_get_property_value(prop->_reply);
+  prop->instance_name = (char *) xcb_get_property_value(prop->_reply);
 
-  int name_len = strlen(prop->name);
+  int name_len = strlen(prop->instance_name);
   if(name_len == xcb_get_property_value_length(prop->_reply))
     name_len--;
 
-  prop->class = prop->name + name_len + 1;
+  prop->class_name = prop->instance_name + name_len + 1;
 
   return 1;
 }
diff --git a/icccm/xcb_icccm.h b/icccm/xcb_icccm.h
index 8a9e7be..745f920 100644
--- a/icccm/xcb_icccm.h
+++ b/icccm/xcb_icccm.h
@@ -304,9 +304,9 @@ void xcb_watch_wm_client_machine(xcb_property_handlers_t *prophs,
  */
 typedef struct {
   /** Instance name */
-  char *name;
+  char *instance_name;
   /** Class of application */
-  char *class;
+  char *class_name;
   /** Store reply to avoid memory allocation, should normally not be
       used directly */
   xcb_get_property_reply_t *_reply;