Merge branch 'master' into chaz

[chaz/openbox] / openbox / group.c

diff --git a/openbox/group.c b/openbox/group.c
index 937ebfd7ce3a1ff333a3321a02f6b1218aadd321..0712bf48d2e64eaf4ef0283b1e4cd2a6849f3de8 100644 (file)
--- a/openbox/group.c
+++ b/openbox/group.c
@@ -1,7 +1,7 @@
 /* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
 
    group.c for the Openbox window manager
-   Copyright (c) 2003        Ben Jansens
+   Copyright (c) 2003-2007   Dana 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
@@ -19,17 +19,17 @@
 #include "group.h"
 #include "client.h"
 
-GHashTable *group_map = NULL;
+static GHashTable *group_map;
 
-static guint map_hash(Window *w) { return *w; }
-static gboolean map_key_comp(Window *w1, Window *w2) { return *w1 == *w2; }
+static guint window_hash(Window *w) { return *w; }
+static gboolean window_comp(Window *w1, Window *w2) { return *w1 == *w2; }
 
 void group_startup(gboolean reconfig)
 {
     if (reconfig) return;
 
-    group_map = g_hash_table_new((GHashFunc)map_hash,
-                                 (GEqualFunc)map_key_comp);
+    group_map = g_hash_table_new((GHashFunc)window_hash,
+                                 (GEqualFunc)window_comp);
 }
 
 void group_shutdown(gboolean reconfig)
@@ -45,7 +45,7 @@ ObGroup *group_add(Window leader, ObClient *client)
 
     self = g_hash_table_lookup(group_map, &leader);
     if (self == NULL) {
-        self = g_new(ObGroup, 1);
+        self = g_slice_new(ObGroup);
         self->leader = leader;
         self->members = NULL;
         g_hash_table_insert(group_map, &self->leader, self);
@@ -61,6 +61,6 @@ void group_remove(ObGroup *self, ObClient *client)
     self->members = g_slist_remove(self->members, client);
     if (self->members == NULL) {
         g_hash_table_remove(group_map, &self->leader);
-        g_free(self);
+        g_slice_free(ObGroup, self);
     }
 }