Merge branch 'master' into chaz

[chaz/openbox] / openbox / group.c

diff --git a/openbox/group.c b/openbox/group.c
index f6c86c5a5aa63552cf3c4abb43008351f5f7b4a2..0712bf48d2e64eaf4ef0283b1e4cd2a6849f3de8 100644 (file)
--- a/openbox/group.c
+++ b/openbox/group.c
@@ -1,19 +1,41 @@
+/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
+
+   group.c for the Openbox window manager
+   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
+   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.
+*/
+
 #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()
+void group_startup(gboolean reconfig)
 {
-    group_map = g_hash_table_new((GHashFunc)map_hash,
-                                 (GEqualFunc)map_key_comp);
+    if (reconfig) return;
+
+    group_map = g_hash_table_new((GHashFunc)window_hash,
+                                 (GEqualFunc)window_comp);
 }
 
-void group_shutdown()
+void group_shutdown(gboolean reconfig)
 {
+    if (reconfig) return;
+
     g_hash_table_destroy(group_map);
 }
 
@@ -23,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);
@@ -39,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);
     }
 }