diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | gtk/gtkclist.c | 8 | ||||
| -rw-r--r-- | gtk/gtkclist.h | 10 | ||||
| -rw-r--r-- | gtk/gtkctree.c | 12 | ||||
| -rw-r--r-- | gtk/gtkctree.h | 2 | ||||
| -rw-r--r-- | gtk/gtkitemfactory.c | 14 | ||||
| -rw-r--r-- | gtk/gtkitemfactory.h | 6 | ||||
| -rw-r--r-- | gtk/gtkobject.c | 34 | ||||
| -rw-r--r-- | gtk/gtkobject.h | 8 | ||||
| -rw-r--r-- | gtk/gtksignal.c | 2 | ||||
| -rw-r--r-- | gtk/gtksignal.h | 2 |
11 files changed, 57 insertions, 49 deletions
@@ -1,3 +1,11 @@ +2008-08-04 Michael Natterer <mitch@imendio.com> + + * gtk/gtkclist.[ch] + * gtk/gtkctree.[ch] + * gtk/gtkitemfactory.[ch] + * gtk/gtkobject.[ch] + * gtk/gtksignal.[ch]: s/GtkDestroyNotify/GDestroyNotify/g + 2008-08-04 Sven Neumann <sven@gimp.org> * gtk/gtklinkbutton.c (gtk_link_button_set_uri): update the link diff --git a/gtk/gtkclist.c b/gtk/gtkclist.c index 4c23fc351b..2d9eb1cfe8 100644 --- a/gtk/gtkclist.c +++ b/gtk/gtkclist.c @@ -3071,10 +3071,10 @@ gtk_clist_set_row_data (GtkCList *clist, } void -gtk_clist_set_row_data_full (GtkCList *clist, - gint row, - gpointer data, - GtkDestroyNotify destroy) +gtk_clist_set_row_data_full (GtkCList *clist, + gint row, + gpointer data, + GDestroyNotify destroy) { GtkCListRow *clist_row; diff --git a/gtk/gtkclist.h b/gtk/gtkclist.h index 06cbf66ef9..40a594d061 100644 --- a/gtk/gtkclist.h +++ b/gtk/gtkclist.h @@ -352,7 +352,7 @@ struct _GtkCListRow GtkStyle *style; gpointer data; - GtkDestroyNotify destroy; + GDestroyNotify destroy; guint fg_set : 1; guint bg_set : 1; @@ -699,10 +699,10 @@ void gtk_clist_set_row_data (GtkCList *clist, gpointer data); /* sets a data pointer for a given row with destroy notification */ -void gtk_clist_set_row_data_full (GtkCList *clist, - gint row, - gpointer data, - GtkDestroyNotify destroy); +void gtk_clist_set_row_data_full (GtkCList *clist, + gint row, + gpointer data, + GDestroyNotify destroy); /* returns the data set for a row */ gpointer gtk_clist_get_row_data (GtkCList *clist, diff --git a/gtk/gtkctree.c b/gtk/gtkctree.c index 3d1c105a4b..f95b3db0f2 100644 --- a/gtk/gtkctree.c +++ b/gtk/gtkctree.c @@ -3267,7 +3267,7 @@ row_delete (GtkCTree *ctree, if (ctree_row->row.destroy) { - GtkDestroyNotify dnotify = ctree_row->row.destroy; + GDestroyNotify dnotify = ctree_row->row.destroy; gpointer ddata = ctree_row->row.data; ctree_row->row.destroy = NULL; @@ -5131,12 +5131,12 @@ gtk_ctree_node_set_row_data (GtkCTree *ctree, } void -gtk_ctree_node_set_row_data_full (GtkCTree *ctree, - GtkCTreeNode *node, - gpointer data, - GtkDestroyNotify destroy) +gtk_ctree_node_set_row_data_full (GtkCTree *ctree, + GtkCTreeNode *node, + gpointer data, + GDestroyNotify destroy) { - GtkDestroyNotify dnotify; + GDestroyNotify dnotify; gpointer ddata; g_return_if_fail (GTK_IS_CTREE (ctree)); diff --git a/gtk/gtkctree.h b/gtk/gtkctree.h index e9cabffa7c..4e1551198a 100644 --- a/gtk/gtkctree.h +++ b/gtk/gtkctree.h @@ -392,7 +392,7 @@ void gtk_ctree_node_set_row_data (GtkCTree *ctree, void gtk_ctree_node_set_row_data_full (GtkCTree *ctree, GtkCTreeNode *node, gpointer data, - GtkDestroyNotify destroy); + GDestroyNotify destroy); gpointer gtk_ctree_node_get_row_data (GtkCTree *ctree, GtkCTreeNode *node); void gtk_ctree_node_moveto (GtkCTree *ctree, diff --git a/gtk/gtkitemfactory.c b/gtk/gtkitemfactory.c index 15a4bd3759..70c01a6223 100644 --- a/gtk/gtkitemfactory.c +++ b/gtk/gtkitemfactory.c @@ -1482,7 +1482,7 @@ gtk_item_factory_popup (GtkItemFactory *ifactory, * gtk_item_factory_popup_with_data: * @ifactory: a #GtkItemFactory of type #GTK_TYPE_MENU (see gtk_item_factory_new()) * @popup_data: data available for callbacks while the menu is posted - * @destroy: a #GtkDestroyNotify function to be called on @popup_data when + * @destroy: a #GDestroyNotify function to be called on @popup_data when * the menu is unposted * @x: the x position * @y: the y position @@ -1510,7 +1510,7 @@ gtk_item_factory_popup (GtkItemFactory *ifactory, void gtk_item_factory_popup_with_data (GtkItemFactory *ifactory, gpointer popup_data, - GtkDestroyNotify destroy, + GDestroyNotify destroy, guint x, guint y, guint mouse_button, @@ -1558,7 +1558,7 @@ gtk_item_factory_popup_with_data (GtkItemFactory *ifactory, * @ifactory: a #GtkItemFactory * @func: the #GtkTranslateFunc function to be used to translate path elements * @data: data to pass to @func and @notify - * @notify: a #GtkDestroyNotify function to be called when @ifactory is + * @notify: a #GDestroyNotify function to be called when @ifactory is * destroyed and when the translation function is changed again * * Sets a function to be used for translating the path elements before they @@ -1567,10 +1567,10 @@ gtk_item_factory_popup_with_data (GtkItemFactory *ifactory, * Deprecated: 2.4: Use #GtkUIManager instead. */ void -gtk_item_factory_set_translate_func (GtkItemFactory *ifactory, - GtkTranslateFunc func, - gpointer data, - GtkDestroyNotify notify) +gtk_item_factory_set_translate_func (GtkItemFactory *ifactory, + GtkTranslateFunc func, + gpointer data, + GDestroyNotify notify) { g_return_if_fail (ifactory != NULL); diff --git a/gtk/gtkitemfactory.h b/gtk/gtkitemfactory.h index bd9332f523..0e71f4886a 100644 --- a/gtk/gtkitemfactory.h +++ b/gtk/gtkitemfactory.h @@ -73,7 +73,7 @@ struct _GtkItemFactory GtkTranslateFunc translate_func; gpointer translate_data; - GtkDestroyNotify translate_notify; + GDestroyNotify translate_notify; }; struct _GtkItemFactoryClass @@ -184,7 +184,7 @@ void gtk_item_factory_popup (GtkItemFactory *ifactory, guint32 time_); void gtk_item_factory_popup_with_data(GtkItemFactory *ifactory, gpointer popup_data, - GtkDestroyNotify destroy, + GDestroyNotify destroy, guint x, guint y, guint mouse_button, @@ -194,7 +194,7 @@ gpointer gtk_item_factory_popup_data_from_widget (GtkWidget *widget); void gtk_item_factory_set_translate_func (GtkItemFactory *ifactory, GtkTranslateFunc func, gpointer data, - GtkDestroyNotify notify); + GDestroyNotify notify); /* Compatibility functions for deprecated GtkMenuFactory code */ diff --git a/gtk/gtkobject.c b/gtk/gtkobject.c index c960d8f203..89d940edc2 100644 --- a/gtk/gtkobject.c +++ b/gtk/gtkobject.c @@ -520,15 +520,15 @@ typedef struct _GtkWeakRef GtkWeakRef; struct _GtkWeakRef { - GtkWeakRef *next; - GtkDestroyNotify notify; - gpointer data; + GtkWeakRef *next; + GDestroyNotify notify; + gpointer data; }; void -gtk_object_weakref (GtkObject *object, - GtkDestroyNotify notify, - gpointer data) +gtk_object_weakref (GtkObject *object, + GDestroyNotify notify, + gpointer data) { GtkWeakRef *weak; @@ -546,9 +546,9 @@ gtk_object_weakref (GtkObject *object, } void -gtk_object_weakunref (GtkObject *object, - GtkDestroyNotify notify, - gpointer data) +gtk_object_weakunref (GtkObject *object, + GDestroyNotify notify, + gpointer data) { GtkWeakRef *weaks, *w, **wp; @@ -664,10 +664,10 @@ gtk_object_set_data (GtkObject *object, } void -gtk_object_set_data_by_id_full (GtkObject *object, - GQuark data_id, - gpointer data, - GtkDestroyNotify destroy) +gtk_object_set_data_by_id_full (GtkObject *object, + GQuark data_id, + gpointer data, + GDestroyNotify destroy) { g_return_if_fail (GTK_IS_OBJECT (object)); @@ -675,10 +675,10 @@ gtk_object_set_data_by_id_full (GtkObject *object, } void -gtk_object_set_data_full (GtkObject *object, - const gchar *key, - gpointer data, - GtkDestroyNotify destroy) +gtk_object_set_data_full (GtkObject *object, + const gchar *key, + gpointer data, + GDestroyNotify destroy) { g_return_if_fail (GTK_IS_OBJECT (object)); g_return_if_fail (key != NULL); diff --git a/gtk/gtkobject.h b/gtk/gtkobject.h index 39e808c4a7..041d757e50 100644 --- a/gtk/gtkobject.h +++ b/gtk/gtkobject.h @@ -141,10 +141,10 @@ GtkObject* gtk_object_new (GtkType type, GtkObject* gtk_object_ref (GtkObject *object); void gtk_object_unref (GtkObject *object); void gtk_object_weakref (GtkObject *object, - GtkDestroyNotify notify, + GDestroyNotify notify, gpointer data); void gtk_object_weakunref (GtkObject *object, - GtkDestroyNotify notify, + GDestroyNotify notify, gpointer data); /* Set 'data' to the "object_data" field of the object. The @@ -165,7 +165,7 @@ void gtk_object_set_data (GtkObject *object, void gtk_object_set_data_full (GtkObject *object, const gchar *key, gpointer data, - GtkDestroyNotify destroy); + GDestroyNotify destroy); void gtk_object_remove_data (GtkObject *object, const gchar *key); gpointer gtk_object_get_data (GtkObject *object, @@ -192,7 +192,7 @@ void gtk_object_set_data_by_id (GtkObject *object, void gtk_object_set_data_by_id_full (GtkObject *object, GQuark data_id, gpointer data, - GtkDestroyNotify destroy); + GDestroyNotify destroy); gpointer gtk_object_get_data_by_id (GtkObject *object, GQuark data_id); void gtk_object_remove_data_by_id (GtkObject *object, diff --git a/gtk/gtksignal.c b/gtk/gtksignal.c index 2132088b84..62398f000a 100644 --- a/gtk/gtksignal.c +++ b/gtk/gtksignal.c @@ -138,7 +138,7 @@ gtk_signal_connect_full (GtkObject *object, GtkSignalFunc func, GtkCallbackMarshal unsupported, gpointer data, - GtkDestroyNotify destroy_func, + GDestroyNotify destroy_func, gint object_signal, gint after) { diff --git a/gtk/gtksignal.h b/gtk/gtksignal.h index 7de9302bf1..1a13ad1645 100644 --- a/gtk/gtksignal.h +++ b/gtk/gtksignal.h @@ -121,7 +121,7 @@ gulong gtk_signal_connect_full (GtkObject *object, GtkSignalFunc func, GtkCallbackMarshal unsupported, gpointer data, - GtkDestroyNotify destroy_func, + GDestroyNotify destroy_func, gint object_signal, gint after); void gtk_signal_emitv (GtkObject *object, |