add copyright headers, adjust --version output to include copyright, and --help outpu...

[chaz/openbox] / openbox / group.c

diff --git a/openbox/group.c b/openbox/group.c
index 69d2ccb2a9126b18ee621916a8de2b359072db10..d9c1a04bfac66b437c2e35a888898cf75b5d58d1 100644 (file)
--- a/openbox/group.c
+++ b/openbox/group.c
@@ -1,3 +1,21 @@
+/* -*- indent-tabs-mode: t; tab-width: 4; c-basic-offset: 4; -*-
+
+   group.c for the Openbox window manager
+   Copyright (c) 2003        Ben 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"
 
@@ -6,37 +24,39 @@ GHashTable *group_map = NULL;
 static guint map_hash(Window *w) { return *w; }
 static gboolean map_key_comp(Window *w1, Window *w2) { return *w1 == *w2; }
 
-void group_startup()
+void group_startup(gboolean reconfig)
 {
+    if (reconfig) return;
+
     group_map = g_hash_table_new((GHashFunc)map_hash,
                                  (GEqualFunc)map_key_comp);
 }
 
-void group_shutdown()
+void group_shutdown(gboolean reconfig)
 {
+    if (reconfig) return;
+
     g_hash_table_destroy(group_map);
 }
 
-Group *group_add(Window leader, Client *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);
-        g_message("NEW GROUP FOR %lx", leader);
-    } else
-        g_message("REUSING GROUP FOR %lx", leader);
+    }
 
     self->members = g_slist_append(self->members, client);
 
     return self;
 }
 
-void group_remove(Group *self, Client *client)
+void group_remove(ObGroup *self, ObClient *client)
 {
     self->members = g_slist_remove(self->members, client);
     if (self->members == NULL) {