use the right list in client_add_hide_notify, rename destructor to destroy_notify which is really what it is, and is more consistant now that there are 2 notifies

1 files changed, 13 insertions, 12 deletions

diff --git a/openbox/client.c b/openbox/client.c
index 112b8d8b..73696c89 100644
--- a/openbox/client.c
+++ b/openbox/client.c
@@ -64,7 +64,7 @@ typedef struct
 
 GList            *client_list          = NULL;
 
-static GSList *client_destructors      = NULL;
+static GSList *client_destroy_notifies = NULL;
 static GSList *client_hide_notifies    = NULL;
 
 static void client_get_all(ObClient *self, gboolean real);
@@ -92,7 +92,7 @@ static void client_present(ObClient *self, gboolean here, gboolean raise);
 static GSList *client_search_all_top_parents_internal(ObClient *self,
                                                       gboolean bylayer,
                                                       ObStackingLayer layer);
-static void client_call_callbacks(ObClient *self, GSList *list);
+static void client_call_notifies(ObClient *self, GSList *list);
 
 void client_startup(gboolean reconfig)
 {
@@ -106,7 +106,7 @@ void client_shutdown(gboolean reconfig)
     if (reconfig) return;
 }
 
-static void client_call_callbacks(ObClient *self, GSList *list)
+static void client_call_notifies(ObClient *self, GSList *list)
 {
     GSList *it;
 
@@ -116,23 +116,24 @@ static void client_call_callbacks(ObClient *self, GSList *list)
     }
 }
 
-void client_add_destructor(ObClientCallback func, gpointer data)
+void client_add_destroy_notify(ObClientCallback func, gpointer data)
 {
     ClientCallback *d = g_new(ClientCallback, 1);
     d->func = func;
     d->data = data;
-    client_destructors = g_slist_prepend(client_destructors, d);
+    client_destroy_notifies = g_slist_prepend(client_destroy_notifies, d);
 }
 
-void client_remove_destructor(ObClientCallback func)
+void client_remove_destroy_notify(ObClientCallback func)
 {
     GSList *it;
 
-    for (it = client_destructors; it; it = g_slist_next(it)) {
+    for (it = client_destroy_notifies; it; it = g_slist_next(it)) {
         ClientCallback *d = it->data;
         if (d->func == func) {
             g_free(d);
-            client_destructors = g_slist_delete_link(client_destructors, it);
+            client_destroy_notifies =
+                g_slist_delete_link(client_destroy_notifies, it);
             break;
         }
     }
@@ -143,7 +144,7 @@ void client_add_hide_notify(ObClientCallback func, gpointer data)
     ClientCallback *d = g_new(ClientCallback, 1);
     d->func = func;
     d->data = data;
-    client_hide_notifies = g_slist_prepend(client_destructors, d);
+    client_hide_notifies = g_slist_prepend(client_hide_notifies, d);
 }
 
 void client_remove_hide_notify(ObClientCallback func)
@@ -600,7 +601,7 @@ void client_unmanage(ObClient *self)
     if (STRUT_EXISTS(self->strut))
         screen_update_areas();
 
-    client_call_callbacks(self, client_destructors);
+    client_call_notifies(self, client_destroy_notifies);
 
     /* tell our parent(s) that we're gone */
     if (self->transient_for == OB_TRAN_GROUP) { /* transient of group */
@@ -2416,7 +2417,7 @@ void client_hide(ObClient *self)
     if (!client_should_show(self)) {
         frame_hide(self->frame);
 
-        client_call_callbacks(self, client_hide_notifies);
+        client_call_notifies(self, client_hide_notifies);
     }
 
     /* According to the ICCCM (sec 4.1.3.1) when a window is not visible, it
@@ -2435,7 +2436,7 @@ void client_showhide(ObClient *self)
     else {
         frame_hide(self->frame);
 
-        client_call_callbacks(self, client_hide_notifies);
+        client_call_notifies(self, client_hide_notifies);
     }
 
     /* According to the ICCCM (sec 4.1.3.1) when a window is not visible, it