Commit fe8a946e authored by Michael Natterer's avatar Michael Natterer Committed by Michael Natterer

deprecate GtkDestroyNotify.

2008-06-18  Michael Natterer  <mitch@imendio.com>

	* gtk/gtktypeutils.h: deprecate GtkDestroyNotify.

	* gtk/gtkactiongroup.[ch]
	* gtk/gtkcombobox.[ch]
	* gtk/gtkcontainer.[ch]
	* gtk/gtkliststore.[ch]
	* gtk/gtkmain.[ch]
	* gtk/gtkmenu.c
	* gtk/gtkstock.[ch]
	* gtk/gtktreedatalist.[ch]
	* gtk/gtktreemodelfilter.[ch]
	* gtk/gtktreemodelsort.[ch]
	* gtk/gtktreeprivate.h
	* gtk/gtktreeselection.[ch]
	* gtk/gtktreesortable.[ch]
	* gtk/gtktreestore.[ch]
	* gtk/gtktreeview.[ch]
	* gtk/gtktreeviewcolumn.[ch]: s/GtkDestroyNotify/GDestroyNotify/g.


svn path=/trunk/; revision=20448
parent 060948a4
2008-06-18 Michael Natterer <mitch@imendio.com>
* gtk/gtktypeutils.h: deprecate GtkDestroyNotify.
* gtk/gtkactiongroup.[ch]
* gtk/gtkcombobox.[ch]
* gtk/gtkcontainer.[ch]
* gtk/gtkliststore.[ch]
* gtk/gtkmain.[ch]
* gtk/gtkmenu.c
* gtk/gtkstock.[ch]
* gtk/gtktreedatalist.[ch]
* gtk/gtktreemodelfilter.[ch]
* gtk/gtktreemodelsort.[ch]
* gtk/gtktreeprivate.h
* gtk/gtktreeselection.[ch]
* gtk/gtktreesortable.[ch]
* gtk/gtktreestore.[ch]
* gtk/gtktreeview.[ch]
* gtk/gtktreeviewcolumn.[ch]: s/GtkDestroyNotify/GDestroyNotify/g.
2008-06-18 Michael Natterer <mitch@imendio.com> 2008-06-18 Michael Natterer <mitch@imendio.com>
* tests/testgtk.c: some more undeprecation. * tests/testgtk.c: some more undeprecation.
......
...@@ -56,7 +56,7 @@ struct _GtkActionGroupPrivate ...@@ -56,7 +56,7 @@ struct _GtkActionGroupPrivate
GtkTranslateFunc translate_func; GtkTranslateFunc translate_func;
gpointer translate_data; gpointer translate_data;
GtkDestroyNotify translate_notify; GDestroyNotify translate_notify;
}; };
enum enum
...@@ -1247,9 +1247,9 @@ gtk_action_group_add_radio_actions_full (GtkActionGroup *action_group ...@@ -1247,9 +1247,9 @@ gtk_action_group_add_radio_actions_full (GtkActionGroup *action_group
* @action_group: a #GtkActionGroup * @action_group: a #GtkActionGroup
* @func: a #GtkTranslateFunc * @func: a #GtkTranslateFunc
* @data: data to be passed to @func and @notify * @data: data to be passed to @func and @notify
* @notify: a #GtkDestroyNotify function to be called when @action_group is * @notify: a #GDestroyNotify function to be called when @action_group is
* destroyed and when the translation function is changed again * destroyed and when the translation function is changed again
* *
* Sets a function to be used for translating the @label and @tooltip of * Sets a function to be used for translating the @label and @tooltip of
* #GtkActionGroupEntry<!-- -->s added by gtk_action_group_add_actions(). * #GtkActionGroupEntry<!-- -->s added by gtk_action_group_add_actions().
* *
...@@ -1262,7 +1262,7 @@ void ...@@ -1262,7 +1262,7 @@ void
gtk_action_group_set_translate_func (GtkActionGroup *action_group, gtk_action_group_set_translate_func (GtkActionGroup *action_group,
GtkTranslateFunc func, GtkTranslateFunc func,
gpointer data, gpointer data,
GtkDestroyNotify notify) GDestroyNotify notify)
{ {
g_return_if_fail (GTK_IS_ACTION_GROUP (action_group)); g_return_if_fail (GTK_IS_ACTION_GROUP (action_group));
......
...@@ -161,7 +161,7 @@ void gtk_action_group_add_radio_actions_full (GtkActionGroup ...@@ -161,7 +161,7 @@ void gtk_action_group_add_radio_actions_full (GtkActionGroup
void gtk_action_group_set_translate_func (GtkActionGroup *action_group, void gtk_action_group_set_translate_func (GtkActionGroup *action_group,
GtkTranslateFunc func, GtkTranslateFunc func,
gpointer data, gpointer data,
GtkDestroyNotify notify); GDestroyNotify notify);
void gtk_action_group_set_translation_domain (GtkActionGroup *action_group, void gtk_action_group_set_translation_domain (GtkActionGroup *action_group,
const gchar *domain); const gchar *domain);
G_CONST_RETURN gchar *gtk_action_group_translate_string (GtkActionGroup *action_group, G_CONST_RETURN gchar *gtk_action_group_translate_string (GtkActionGroup *action_group,
......
...@@ -123,7 +123,7 @@ struct _GtkComboBoxPrivate ...@@ -123,7 +123,7 @@ struct _GtkComboBoxPrivate
GtkTreeViewRowSeparatorFunc row_separator_func; GtkTreeViewRowSeparatorFunc row_separator_func;
gpointer row_separator_data; gpointer row_separator_data;
GtkDestroyNotify row_separator_destroy; GDestroyNotify row_separator_destroy;
gchar *tearoff_title; gchar *tearoff_title;
}; };
...@@ -5640,7 +5640,7 @@ void ...@@ -5640,7 +5640,7 @@ void
gtk_combo_box_set_row_separator_func (GtkComboBox *combo_box, gtk_combo_box_set_row_separator_func (GtkComboBox *combo_box,
GtkTreeViewRowSeparatorFunc func, GtkTreeViewRowSeparatorFunc func,
gpointer data, gpointer data,
GtkDestroyNotify destroy) GDestroyNotify destroy)
{ {
g_return_if_fail (GTK_IS_COMBO_BOX (combo_box)); g_return_if_fail (GTK_IS_COMBO_BOX (combo_box));
......
...@@ -112,7 +112,7 @@ GtkTreeViewRowSeparatorFunc gtk_combo_box_get_row_separator_func (GtkComboBox ...@@ -112,7 +112,7 @@ GtkTreeViewRowSeparatorFunc gtk_combo_box_get_row_separator_func (GtkComboBox
void gtk_combo_box_set_row_separator_func (GtkComboBox *combo_box, void gtk_combo_box_set_row_separator_func (GtkComboBox *combo_box,
GtkTreeViewRowSeparatorFunc func, GtkTreeViewRowSeparatorFunc func,
gpointer data, gpointer data,
GtkDestroyNotify destroy); GDestroyNotify destroy);
/* convenience -- text */ /* convenience -- text */
GtkWidget *gtk_combo_box_new_text (void); GtkWidget *gtk_combo_box_new_text (void);
......
...@@ -1512,7 +1512,7 @@ gtk_container_foreach_full (GtkContainer *container, ...@@ -1512,7 +1512,7 @@ gtk_container_foreach_full (GtkContainer *container,
GtkCallback callback, GtkCallback callback,
GtkCallbackMarshal marshal, GtkCallbackMarshal marshal,
gpointer callback_data, gpointer callback_data,
GtkDestroyNotify notify) GDestroyNotify notify)
{ {
g_return_if_fail (GTK_IS_CONTAINER (container)); g_return_if_fail (GTK_IS_CONTAINER (container));
......
...@@ -129,7 +129,7 @@ void gtk_container_foreach_full (GtkContainer *container, ...@@ -129,7 +129,7 @@ void gtk_container_foreach_full (GtkContainer *container,
GtkCallback callback, GtkCallback callback,
GtkCallbackMarshal marshal, GtkCallbackMarshal marshal,
gpointer callback_data, gpointer callback_data,
GtkDestroyNotify notify); GDestroyNotify notify);
#endif /* GTK_DISABLE_DEPRECATED */ #endif /* GTK_DISABLE_DEPRECATED */
GList* gtk_container_get_children (GtkContainer *container); GList* gtk_container_get_children (GtkContainer *container);
......
...@@ -111,11 +111,11 @@ static void gtk_list_store_set_sort_func (GtkTreeSortable *so ...@@ -111,11 +111,11 @@ static void gtk_list_store_set_sort_func (GtkTreeSortable *so
gint sort_column_id, gint sort_column_id,
GtkTreeIterCompareFunc func, GtkTreeIterCompareFunc func,
gpointer data, gpointer data,
GtkDestroyNotify destroy); GDestroyNotify destroy);
static void gtk_list_store_set_default_sort_func (GtkTreeSortable *sortable, static void gtk_list_store_set_default_sort_func (GtkTreeSortable *sortable,
GtkTreeIterCompareFunc func, GtkTreeIterCompareFunc func,
gpointer data, gpointer data,
GtkDestroyNotify destroy); GDestroyNotify destroy);
static gboolean gtk_list_store_has_default_sort_func (GtkTreeSortable *sortable); static gboolean gtk_list_store_has_default_sort_func (GtkTreeSortable *sortable);
...@@ -392,7 +392,7 @@ gtk_list_store_finalize (GObject *object) ...@@ -392,7 +392,7 @@ gtk_list_store_finalize (GObject *object)
if (list_store->default_sort_destroy) if (list_store->default_sort_destroy)
{ {
GtkDestroyNotify d = list_store->default_sort_destroy; GDestroyNotify d = list_store->default_sort_destroy;
list_store->default_sort_destroy = NULL; list_store->default_sort_destroy = NULL;
d (list_store->default_sort_data); d (list_store->default_sort_data);
...@@ -1831,7 +1831,7 @@ gtk_list_store_set_sort_func (GtkTreeSortable *sortable, ...@@ -1831,7 +1831,7 @@ gtk_list_store_set_sort_func (GtkTreeSortable *sortable,
gint sort_column_id, gint sort_column_id,
GtkTreeIterCompareFunc func, GtkTreeIterCompareFunc func,
gpointer data, gpointer data,
GtkDestroyNotify destroy) GDestroyNotify destroy)
{ {
GtkListStore *list_store = (GtkListStore *) sortable; GtkListStore *list_store = (GtkListStore *) sortable;
...@@ -1847,13 +1847,13 @@ static void ...@@ -1847,13 +1847,13 @@ static void
gtk_list_store_set_default_sort_func (GtkTreeSortable *sortable, gtk_list_store_set_default_sort_func (GtkTreeSortable *sortable,
GtkTreeIterCompareFunc func, GtkTreeIterCompareFunc func,
gpointer data, gpointer data,
GtkDestroyNotify destroy) GDestroyNotify destroy)
{ {
GtkListStore *list_store = (GtkListStore *) sortable; GtkListStore *list_store = (GtkListStore *) sortable;
if (list_store->default_sort_destroy) if (list_store->default_sort_destroy)
{ {
GtkDestroyNotify d = list_store->default_sort_destroy; GDestroyNotify d = list_store->default_sort_destroy;
list_store->default_sort_destroy = NULL; list_store->default_sort_destroy = NULL;
d (list_store->default_sort_data); d (list_store->default_sort_data);
......
...@@ -57,7 +57,7 @@ struct _GtkListStore ...@@ -57,7 +57,7 @@ struct _GtkListStore
gint length; gint length;
GtkTreeIterCompareFunc default_sort_func; GtkTreeIterCompareFunc default_sort_func;
gpointer default_sort_data; gpointer default_sort_data;
GtkDestroyNotify default_sort_destroy; GDestroyNotify default_sort_destroy;
guint columns_dirty : 1; guint columns_dirty : 1;
}; };
......
...@@ -127,14 +127,14 @@ struct _GtkQuitFunction ...@@ -127,14 +127,14 @@ struct _GtkQuitFunction
GtkCallbackMarshal marshal; GtkCallbackMarshal marshal;
GtkFunction function; GtkFunction function;
gpointer data; gpointer data;
GtkDestroyNotify destroy; GDestroyNotify destroy;
}; };
struct _GtkClosure struct _GtkClosure
{ {
GtkCallbackMarshal marshal; GtkCallbackMarshal marshal;
gpointer data; gpointer data;
GtkDestroyNotify destroy; GDestroyNotify destroy;
}; };
struct _GtkKeySnooperData struct _GtkKeySnooperData
...@@ -1867,7 +1867,7 @@ gtk_quit_add_full (guint main_level, ...@@ -1867,7 +1867,7 @@ gtk_quit_add_full (guint main_level,
GtkFunction function, GtkFunction function,
GtkCallbackMarshal marshal, GtkCallbackMarshal marshal,
gpointer data, gpointer data,
GtkDestroyNotify destroy) GDestroyNotify destroy)
{ {
static guint quit_id = 1; static guint quit_id = 1;
GtkQuitFunction *quitf; GtkQuitFunction *quitf;
...@@ -1985,7 +1985,7 @@ gtk_timeout_add_full (guint32 interval, ...@@ -1985,7 +1985,7 @@ gtk_timeout_add_full (guint32 interval,
GtkFunction function, GtkFunction function,
GtkCallbackMarshal marshal, GtkCallbackMarshal marshal,
gpointer data, gpointer data,
GtkDestroyNotify destroy) GDestroyNotify destroy)
{ {
if (marshal) if (marshal)
{ {
...@@ -2024,7 +2024,7 @@ gtk_idle_add_full (gint priority, ...@@ -2024,7 +2024,7 @@ gtk_idle_add_full (gint priority,
GtkFunction function, GtkFunction function,
GtkCallbackMarshal marshal, GtkCallbackMarshal marshal,
gpointer data, gpointer data,
GtkDestroyNotify destroy) GDestroyNotify destroy)
{ {
if (marshal) if (marshal)
{ {
...@@ -2078,7 +2078,7 @@ gtk_input_add_full (gint source, ...@@ -2078,7 +2078,7 @@ gtk_input_add_full (gint source,
GdkInputFunction function, GdkInputFunction function,
GtkCallbackMarshal marshal, GtkCallbackMarshal marshal,
gpointer data, gpointer data,
GtkDestroyNotify destroy) GDestroyNotify destroy)
{ {
if (marshal) if (marshal)
{ {
......
...@@ -167,7 +167,7 @@ guint gtk_quit_add_full (guint main_level, ...@@ -167,7 +167,7 @@ guint gtk_quit_add_full (guint main_level,
GtkFunction function, GtkFunction function,
GtkCallbackMarshal marshal, GtkCallbackMarshal marshal,
gpointer data, gpointer data,
GtkDestroyNotify destroy); GDestroyNotify destroy);
void gtk_quit_remove (guint quit_handler_id); void gtk_quit_remove (guint quit_handler_id);
void gtk_quit_remove_by_data (gpointer data); void gtk_quit_remove_by_data (gpointer data);
#ifndef GTK_DISABLE_DEPRECATED #ifndef GTK_DISABLE_DEPRECATED
...@@ -178,7 +178,7 @@ guint gtk_timeout_add_full (guint32 interval, ...@@ -178,7 +178,7 @@ guint gtk_timeout_add_full (guint32 interval,
GtkFunction function, GtkFunction function,
GtkCallbackMarshal marshal, GtkCallbackMarshal marshal,
gpointer data, gpointer data,
GtkDestroyNotify destroy); GDestroyNotify destroy);
void gtk_timeout_remove (guint timeout_handler_id); void gtk_timeout_remove (guint timeout_handler_id);
guint gtk_idle_add (GtkFunction function, guint gtk_idle_add (GtkFunction function,
...@@ -190,7 +190,7 @@ guint gtk_idle_add_full (gint priority, ...@@ -190,7 +190,7 @@ guint gtk_idle_add_full (gint priority,
GtkFunction function, GtkFunction function,
GtkCallbackMarshal marshal, GtkCallbackMarshal marshal,
gpointer data, gpointer data,
GtkDestroyNotify destroy); GDestroyNotify destroy);
void gtk_idle_remove (guint idle_handler_id); void gtk_idle_remove (guint idle_handler_id);
void gtk_idle_remove_by_data (gpointer data); void gtk_idle_remove_by_data (gpointer data);
guint gtk_input_add_full (gint source, guint gtk_input_add_full (gint source,
...@@ -198,7 +198,7 @@ guint gtk_input_add_full (gint source, ...@@ -198,7 +198,7 @@ guint gtk_input_add_full (gint source,
GdkInputFunction function, GdkInputFunction function,
GtkCallbackMarshal marshal, GtkCallbackMarshal marshal,
gpointer data, gpointer data,
GtkDestroyNotify destroy); GDestroyNotify destroy);
void gtk_input_remove (guint input_handler_id); void gtk_input_remove (guint input_handler_id);
#endif /* GTK_DISABLE_DEPRECATED */ #endif /* GTK_DISABLE_DEPRECATED */
......
...@@ -1033,8 +1033,9 @@ gtk_menu_attach_to_widget (GtkMenu *menu, ...@@ -1033,8 +1033,9 @@ gtk_menu_attach_to_widget (GtkMenu *menu,
{ {
list = g_list_prepend (list, menu); list = g_list_prepend (list, menu);
} }
g_object_set_data_full (G_OBJECT (attach_widget), I_(ATTACHED_MENUS), list, (GtkDestroyNotify) g_list_free); g_object_set_data_full (G_OBJECT (attach_widget), I_(ATTACHED_MENUS), list,
(GDestroyNotify) g_list_free);
if (GTK_WIDGET_STATE (menu) != GTK_STATE_NORMAL) if (GTK_WIDGET_STATE (menu) != GTK_STATE_NORMAL)
gtk_widget_set_state (GTK_WIDGET (menu), GTK_STATE_NORMAL); gtk_widget_set_state (GTK_WIDGET (menu), GTK_STATE_NORMAL);
...@@ -1086,7 +1087,8 @@ gtk_menu_detach (GtkMenu *menu) ...@@ -1086,7 +1087,8 @@ gtk_menu_detach (GtkMenu *menu)
list = g_object_steal_data (G_OBJECT (data->attach_widget), ATTACHED_MENUS); list = g_object_steal_data (G_OBJECT (data->attach_widget), ATTACHED_MENUS);
list = g_list_remove (list, menu); list = g_list_remove (list, menu);
if (list) if (list)
g_object_set_data_full (G_OBJECT (data->attach_widget), I_(ATTACHED_MENUS), list, (GtkDestroyNotify) g_list_free); g_object_set_data_full (G_OBJECT (data->attach_widget), I_(ATTACHED_MENUS), list,
(GDestroyNotify) g_list_free);
else else
g_object_set_data (G_OBJECT (data->attach_widget), I_(ATTACHED_MENUS), NULL); g_object_set_data (G_OBJECT (data->attach_widget), I_(ATTACHED_MENUS), NULL);
......
...@@ -47,7 +47,7 @@ struct _GtkStockTranslateFunc ...@@ -47,7 +47,7 @@ struct _GtkStockTranslateFunc
{ {
GtkTranslateFunc func; GtkTranslateFunc func;
gpointer data; gpointer data;
GtkDestroyNotify notify; GDestroyNotify notify;
}; };
static void static void
...@@ -410,7 +410,7 @@ static const GtkStockItem builtin_items [] = ...@@ -410,7 +410,7 @@ static const GtkStockItem builtin_items [] =
* @domain: the translation domain for which @func shall be used * @domain: the translation domain for which @func shall be used
* @func: a #GtkTranslateFunc * @func: a #GtkTranslateFunc
* @data: data to pass to @func * @data: data to pass to @func
* @notify: a #GtkDestroyNotify that is called when @data is * @notify: a #GDestroyNotify that is called when @data is
* no longer needed * no longer needed
* *
* Sets a function to be used for translating the @label of * Sets a function to be used for translating the @label of
...@@ -426,7 +426,7 @@ void ...@@ -426,7 +426,7 @@ void
gtk_stock_set_translate_func (const gchar *domain, gtk_stock_set_translate_func (const gchar *domain,
GtkTranslateFunc func, GtkTranslateFunc func,
gpointer data, gpointer data,
GtkDestroyNotify notify) GDestroyNotify notify)
{ {
GtkStockTranslateFunc *translate; GtkStockTranslateFunc *translate;
gchar *domainname; gchar *domainname;
......
...@@ -66,7 +66,7 @@ void gtk_stock_item_free (GtkStockItem *item); ...@@ -66,7 +66,7 @@ void gtk_stock_item_free (GtkStockItem *item);
void gtk_stock_set_translate_func (const gchar *domain, void gtk_stock_set_translate_func (const gchar *domain,
GtkTranslateFunc func, GtkTranslateFunc func,
gpointer data, gpointer data,
GtkDestroyNotify notify); GDestroyNotify notify);
/* Stock IDs (not all are stock items; some are images only) */ /* Stock IDs (not all are stock items; some are images only) */
#define GTK_STOCK_DIALOG_AUTHENTICATION \ #define GTK_STOCK_DIALOG_AUTHENTICATION \
......
...@@ -483,7 +483,7 @@ _gtk_tree_data_list_header_free (GList *list) ...@@ -483,7 +483,7 @@ _gtk_tree_data_list_header_free (GList *list)
if (header->destroy) if (header->destroy)
{ {
GtkDestroyNotify d = header->destroy; GDestroyNotify d = header->destroy;
header->destroy = NULL; header->destroy = NULL;
d (header->data); d (header->data);
...@@ -515,7 +515,7 @@ _gtk_tree_data_list_set_header (GList *header_list, ...@@ -515,7 +515,7 @@ _gtk_tree_data_list_set_header (GList *header_list,
gint sort_column_id, gint sort_column_id,
GtkTreeIterCompareFunc func, GtkTreeIterCompareFunc func,
gpointer data, gpointer data,
GtkDestroyNotify destroy) GDestroyNotify destroy)
{ {
GList *list = header_list; GList *list = header_list;
GtkTreeDataSortHeader *header = NULL; GtkTreeDataSortHeader *header = NULL;
...@@ -543,7 +543,7 @@ _gtk_tree_data_list_set_header (GList *header_list, ...@@ -543,7 +543,7 @@ _gtk_tree_data_list_set_header (GList *header_list,
if (header->destroy) if (header->destroy)
{ {
GtkDestroyNotify d = header->destroy; GDestroyNotify d = header->destroy;
header->destroy = NULL; header->destroy = NULL;
d (header->data); d (header->data);
......
...@@ -47,7 +47,7 @@ typedef struct _GtkTreeDataSortHeader ...@@ -47,7 +47,7 @@ typedef struct _GtkTreeDataSortHeader
gint sort_column_id; gint sort_column_id;
GtkTreeIterCompareFunc func; GtkTreeIterCompareFunc func;
gpointer data; gpointer data;
GtkDestroyNotify destroy; GDestroyNotify destroy;
} GtkTreeDataSortHeader; } GtkTreeDataSortHeader;
GtkTreeDataList *_gtk_tree_data_list_alloc (void); GtkTreeDataList *_gtk_tree_data_list_alloc (void);
...@@ -77,6 +77,6 @@ GList *_gtk_tree_data_list_set_header (GList * ...@@ -77,6 +77,6 @@ GList *_gtk_tree_data_list_set_header (GList *
gint sort_column_id, gint sort_column_id,
GtkTreeIterCompareFunc func, GtkTreeIterCompareFunc func,
gpointer data, gpointer data,
GtkDestroyNotify destroy); GDestroyNotify destroy);
#endif /* __GTK_TREE_DATA_LIST_H__ */ #endif /* __GTK_TREE_DATA_LIST_H__ */
...@@ -91,13 +91,13 @@ struct _GtkTreeModelFilterPrivate ...@@ -91,13 +91,13 @@ struct _GtkTreeModelFilterPrivate
GtkTreeModelFilterVisibleFunc visible_func; GtkTreeModelFilterVisibleFunc visible_func;
gpointer visible_data; gpointer visible_data;
GtkDestroyNotify visible_destroy; GDestroyNotify visible_destroy;
gint modify_n_columns; gint modify_n_columns;
GType *modify_types; GType *modify_types;
GtkTreeModelFilterModifyFunc modify_func; GtkTreeModelFilterModifyFunc modify_func;
gpointer modify_data; gpointer modify_data;
GtkDestroyNotify modify_destroy; GDestroyNotify modify_destroy;
gint visible_column; gint visible_column;
...@@ -2890,7 +2890,7 @@ void ...@@ -2890,7 +2890,7 @@ void
gtk_tree_model_filter_set_visible_func (GtkTreeModelFilter *filter, gtk_tree_model_filter_set_visible_func (GtkTreeModelFilter *filter,
GtkTreeModelFilterVisibleFunc func, GtkTreeModelFilterVisibleFunc func,
gpointer data, gpointer data,
GtkDestroyNotify destroy) GDestroyNotify destroy)
{ {
g_return_if_fail (GTK_IS_TREE_MODEL_FILTER (filter)); g_return_if_fail (GTK_IS_TREE_MODEL_FILTER (filter));
g_return_if_fail (func != NULL); g_return_if_fail (func != NULL);
...@@ -2898,7 +2898,7 @@ gtk_tree_model_filter_set_visible_func (GtkTreeModelFilter *filter, ...@@ -2898,7 +2898,7 @@ gtk_tree_model_filter_set_visible_func (GtkTreeModelFilter *filter,
if (filter->priv->visible_func) if (filter->priv->visible_func)
{ {
GtkDestroyNotify d = filter->priv->visible_destroy; GDestroyNotify d = filter->priv->visible_destroy;
filter->priv->visible_destroy = NULL; filter->priv->visible_destroy = NULL;
d (filter->priv->visible_data); d (filter->priv->visible_data);
...@@ -2936,7 +2936,7 @@ gtk_tree_model_filter_set_modify_func (GtkTreeModelFilter *filter, ...@@ -2936,7 +2936,7 @@ gtk_tree_model_filter_set_modify_func (GtkTreeModelFilter *filter,
GType *types, GType *types,
GtkTreeModelFilterModifyFunc func, GtkTreeModelFilterModifyFunc func,
gpointer data, gpointer data,
GtkDestroyNotify destroy) GDestroyNotify destroy)
{ {
g_return_if_fail (GTK_IS_TREE_MODEL_FILTER (filter)); g_return_if_fail (GTK_IS_TREE_MODEL_FILTER (filter));
g_return_if_fail (func != NULL); g_return_if_fail (func != NULL);
...@@ -2944,7 +2944,7 @@ gtk_tree_model_filter_set_modify_func (GtkTreeModelFilter *filter, ...@@ -2944,7 +2944,7 @@ gtk_tree_model_filter_set_modify_func (GtkTreeModelFilter *filter,
if (filter->priv->modify_destroy) if (filter->priv->modify_destroy)
{ {
GtkDestroyNotify d = filter->priv->modify_destroy; GDestroyNotify d = filter->priv->modify_destroy;
filter->priv->modify_destroy = NULL; filter->priv->modify_destroy = NULL;
d (filter->priv->modify_data); d (filter->priv->modify_data);
......
...@@ -75,13 +75,13 @@ GtkTreeModel *gtk_tree_model_filter_new (GtkTreeModel ...@@ -75,13 +75,13 @@ GtkTreeModel *gtk_tree_model_filter_new (GtkTreeModel
void gtk_tree_model_filter_set_visible_func (GtkTreeModelFilter *filter, void gtk_tree_model_filter_set_visible_func (GtkTreeModelFilter *filter,
GtkTreeModelFilterVisibleFunc func, GtkTreeModelFilterVisibleFunc func,
gpointer data, gpointer data,
GtkDestroyNotify destroy); GDestroyNotify destroy);
void gtk_tree_model_filter_set_modify_func (GtkTreeModelFilter *filter, void gtk_tree_model_filter_set_modify_func (GtkTreeModelFilter *filter,
gint n_columns, gint n_columns,
GType *types, GType *types,
GtkTreeModelFilterModifyFunc func, GtkTreeModelFilterModifyFunc func,
gpointer data, gpointer data,
GtkDestroyNotify destroy); GDestroyNotify destroy);
void gtk_tree_model_filter_set_visible_column (GtkTreeModelFilter *filter, void gtk_tree_model_filter_set_visible_column (GtkTreeModelFilter *filter,
gint column); gint column);
......
...@@ -201,11 +201,11 @@ static void gtk_tree_model_sort_set_sort_func (GtkTreeSortable ...@@ -201,11 +201,11 @@ static void gtk_tree_model_sort_set_sort_func (GtkTreeSortable
gint sort_column_id, gint sort_column_id,
GtkTreeIterCompareFunc func, GtkTreeIterCompareFunc func,
gpointer data, gpointer data,
GtkDestroyNotify destroy); GDestroyNotify destroy);
static void gtk_tree_model_sort_set_default_sort_func (GtkTreeSortable *sortable, static void gtk_tree_model_sort_set_default_sort_func (GtkTreeSortable *sortable,
GtkTreeIterCompareFunc func, GtkTreeIterCompareFunc func,
gpointer data, gpointer data,
GtkDestroyNotify destroy); GDestroyNotify destroy);
static gboolean gtk_tree_model_sort_has_default_sort_func (GtkTreeSortable *sortable); static gboolean gtk_tree_model_sort_has_default_sort_func (GtkTreeSortable *sortable);
/* Private functions (sort funcs, level handling and other utils) */ /* Private functions (sort funcs, level handling and other utils) */
...@@ -1356,7 +1356,7 @@ gtk_tree_model_sort_set_sort_func (GtkTreeSortable *sortable, ...@@ -1356,7 +1356,7 @@ gtk_tree_model_sort_set_sort_func (GtkTreeSortable *sortable,
gint sort_column_id, gint sort_column_id,
GtkTreeIterCompareFunc func, GtkTreeIterCompareFunc func,
gpointer data, gpointer data,
GtkDestroyNotify destroy) GDestroyNotify destroy)
{ {
GtkTreeModelSort *tree_model_sort = (GtkTreeModelSort *) sortable; GtkTreeModelSort *tree_model_sort = (GtkTreeModelSort *) sortable;
...@@ -1372,13 +1372,13 @@ static void ...@@ -1372,13 +1372,13 @@ static void
gtk_tree_model_sort_set_default_sort_func (GtkTreeSortable *sortable, gtk_tree_model_sort_set_default_sort_func (GtkTreeSortable *sortable,
GtkTreeIterCompareFunc func, GtkTreeIterCompareFunc func,
gpointer data, gpointer data,
GtkDestroyNotify destroy) GDestroyNotify destroy)
{ {
GtkTreeModelSort *tree_model_sort = (GtkTreeModelSort *)sortable; GtkTreeModelSort *tree_model_sort = (GtkTreeModelSort *)sortable;
if (tree_model_sort->default_sort_destroy) if (tree_model_sort->default_sort_destroy)
{ {
GtkDestroyNotify d = tree_model_sort->default_sort_destroy; GDestroyNotify d = tree_model_sort->default_sort_destroy;
tree_model_sort->default_sort_destroy = NULL; tree_model_sort->default_sort_destroy = NULL;
d (tree_model_sort->default_sort_data); d (tree_model_sort->default_sort_data);
...@@ -2398,7 +2398,7 @@ gtk_tree_model_sort_reset_default_sort_func (GtkTreeModelSort *tree_model_sort) ...@@ -2398,7 +2398,7 @@ gtk_tree_model_sort_reset_default_sort_func (GtkTreeModelSort *tree_model_sort)