From 0e256a21a59addb55a6b81f25c7d3bebe10af5d2 Mon Sep 17 00:00:00 2001 From: Dan Winship Date: Wed, 25 Mar 2009 10:50:40 -0400 Subject: [PATCH] Use GDestroyNotify instead of custom type, for better introspectability --- src/core/keybindings.c | 2 +- src/include/keybindings.h | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/core/keybindings.c b/src/core/keybindings.c index cb9cc6306..6c1beadde 100644 --- a/src/core/keybindings.c +++ b/src/core/keybindings.c @@ -3452,7 +3452,7 @@ gboolean meta_keybindings_set_custom_handler (const gchar *name, MetaKeyHandlerFunc handler, gpointer user_data, - MetaKeyHandlerDataFreeFunc free_data) + GDestroyNotify free_data) { MetaKeyHandler *key_handler = find_handler (key_handlers, name); diff --git a/src/include/keybindings.h b/src/include/keybindings.h index 2619cdd83..d6c808471 100644 --- a/src/include/keybindings.h +++ b/src/include/keybindings.h @@ -23,8 +23,6 @@ #include "display.h" #include "common.h" -typedef void (* MetaKeyHandlerDataFreeFunc) (gpointer user_data); - typedef void (* MetaKeyHandlerFunc) (MetaDisplay *display, MetaScreen *screen, MetaWindow *window, @@ -39,7 +37,7 @@ typedef struct MetaKeyHandlerFunc default_func; gint data, flags; gpointer user_data; - MetaKeyHandlerDataFreeFunc user_data_free_func; + GDestroyNotify user_data_free_func; } MetaKeyHandler; struct _MetaKeyBinding @@ -56,7 +54,7 @@ struct _MetaKeyBinding gboolean meta_keybindings_set_custom_handler (const gchar *name, MetaKeyHandlerFunc handler, gpointer user_data, - MetaKeyHandlerDataFreeFunc free_data); + GDestroyNotify free_data); void meta_keybindings_switch_window (MetaDisplay *display, MetaScreen *screen,