nilix/openbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

make the client destructor a GDestroyNotify

Browse source
This commit is contained in:
Dana Jansens 2003-09-03 08:10:51 +00:00
parent 2573b51904
commit 5e5fdb1666
4 changed files with 9 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
openbox/client.c
View file

@ -60,12 +60,12 @@ void client_shutdown()
{ {
} }
void client_add_destructor(ObClientDestructorFunc func) void client_add_destructor(GDestroyNotify func)
{ {
client_destructors = g_slist_prepend(client_destructors, (gpointer)func); client_destructors = g_slist_prepend(client_destructors, (gpointer)func);
} }
void client_remove_destructor(ObClientDestructorFunc func) void client_remove_destructor(GDestroyNotify func)
{ {
client_destructors = g_slist_remove(client_destructors, (gpointer)func); client_destructors = g_slist_remove(client_destructors, (gpointer)func);
} }
@ -423,7 +423,7 @@ void client_unmanage(ObClient *self)
} }
for (it = client_destructors; it; it = g_slist_next(it)) { for (it = client_destructors; it; it = g_slist_next(it)) {
ObClientDestructorFunc func = (ObClientDestructorFunc) it->data; GDestroyNotify func = (GDestroyNotify) it->data;
func(self); func(self);
} }

6
openbox/client.h
View file

@ -243,10 +243,8 @@ extern GList *client_list;
void client_startup(); void client_startup();
void client_shutdown(); void client_shutdown();
typedef void (*ObClientDestructorFunc)(ObClient *c); void client_add_destructor(GDestroyNotify func);
void client_remove_destructor(GDestroyNotify func);
void client_add_destructor(ObClientDestructorFunc func);
void client_remove_destructor(ObClientDestructorFunc func);
/*! Manages all existing windows */ /*! Manages all existing windows */
void client_manage_all(); void client_manage_all();

4
openbox/menu.c
View file

@ -55,11 +55,11 @@ static gboolean menu_open(gchar *file, xmlDocPtr *doc, xmlNodePtr *node)
return loaded; return loaded;
} }
static void client_dest(ObClient *c) static void client_dest(gpointer client)
{ {
/* menus can be associated with a client, so close any that are since /* menus can be associated with a client, so close any that are since
we are disappearing now */ we are disappearing now */
menu_frame_hide_all_client(c); menu_frame_hide_all_client(client);
} }
void menu_startup() void menu_startup()

4
openbox/moveresize.c
View file

@ -28,9 +28,9 @@ static ObCorner lockcorner;
static Popup *popup = NULL; static Popup *popup = NULL;
static void client_dest(ObClient *c) static void client_dest(gpointer client)
{ {
if (moveresize_client == c) if (moveresize_client == client)
moveresize_end(TRUE); moveresize_end(TRUE);
} }