M openbox/client.h → openbox/client.h

@@ -11,7 +11,7 @@ #include <glib.h>
 #include <X11/Xlib.h>
 
 struct Frame;
-struct Group;
+struct _ObGroup;
 
 typedef struct _ObClient     ObClient;
 typedef struct _ObClientIcon ObClientIcon;
@@ -81,14 +81,14 @@ /*! The number of unmap events to ignore on the window */
     int ignore_unmaps;
 
     /*! The id of the group the window belongs to */
-    struct Group *group;
+    struct _ObGroup *group;
     /*! Whether or not the client is a transient window. This is guaranteed to 
       be TRUE if transient_for != NULL, but not guaranteed to be FALSE if
       transient_for == NULL. */
     gboolean transient;
     /*! The client which this client is a transient (child) for.
       A value of TRAN_GROUP signifies that the window is a transient for all
-      members of its Group, and is not a valid pointer to be followed in this
+      members of its ObGroup, and is not a valid pointer to be followed in this
       case.
      */
     ObClient *transient_for;

M openbox/group.c → openbox/group.c

@@ -17,13 +17,13 @@ {
     g_hash_table_destroy(group_map);
 }
 
-Group *group_add(Window leader, ObClient *client)
+ObGroup *group_add(Window leader, ObClient *client)
 {
-    Group *self;
+    ObGroup *self;
 
     self = g_hash_table_lookup(group_map, &leader);
     if (self == NULL) {
-        self = g_new(Group, 1);
+        self = g_new(ObGroup, 1);
         self->leader = leader;
         self->members = NULL;
         g_hash_table_insert(group_map, &self->leader, self);
@@ -34,7 +34,7 @@ 
     return self;
 }
 
-void group_remove(Group *self, ObClient *client)
+void group_remove(ObGroup *self, ObClient *client)
 {
     self->members = g_slist_remove(self->members, client);
     if (self->members == NULL) {

M openbox/group.h → openbox/group.h

@@ -4,22 +4,25 @@ 
 #include <X11/Xlib.h>
 #include <glib.h>
 
+typedef struct _ObGroup ObGroup;
+
 struct _ObClient;
 
-typedef struct Group {
+struct _ObGroup
+{
     Window leader;
 
     /* list of clients */
     GSList *members;
-} Group;
+};
 
 extern GHashTable *group_map;
 
 void group_startup();
 void group_shutdown();
 
-Group *group_add(Window leader, struct _ObClient *client);
+ObGroup *group_add(Window leader, struct _ObClient *client);
 
-void group_remove(Group *self, struct _ObClient *client);
+void group_remove(ObGroup *self, struct _ObClient *client);
 
 #endif