qulogic/libgnt

Merged in default (pull request #86)

2019-08-29, Gary Kramlich
f8bee3b3600f
Merged in default (pull request #86)

Replace tree hash function prototypes by GLib ones.

Approved-by: Gary Kramlich
--- a/doc/migrating-2to3.xml Wed Aug 28 18:24:27 2019 -0400
+++ b/doc/migrating-2to3.xml Thu Aug 29 19:52:37 2019 +0000
@@ -110,6 +110,12 @@
<listitem>
<code>GDupFunc</code> renamed to #GntDuplicateFunc
</listitem>
+ <listitem>
+ <code>GntTreeHashFunc</code> removed in favor of #GHashFunc
+ </listitem>
+ <listitem>
+ <code>GntTreeHashEqualityFunc</code> removed in favor of #GEqualFunc
+ </listitem>
</itemizedlist>
</para>
</section>
--- a/gnttree.c Wed Aug 28 18:24:27 2019 -0400
+++ b/gnttree.c Thu Aug 29 19:52:37 2019 +0000
@@ -2113,8 +2113,8 @@
}
void
-gnt_tree_set_hash_fns(GntTree *tree, GntTreeHashFunc hash,
- GntTreeHashEqualityFunc eq, GDestroyNotify kd)
+gnt_tree_set_hash_fns(GntTree *tree, GHashFunc hash, GEqualFunc eq,
+ GDestroyNotify kd)
{
GntTreePrivate *priv = NULL;
--- a/gnttree.h Wed Aug 28 18:24:27 2019 -0400
+++ b/gnttree.h Thu Aug 29 19:52:37 2019 +0000
@@ -39,9 +39,6 @@
#define GNT_TYPE_TREE_ROW (gnt_tree_row_get_type())
-typedef guint (*GntTreeHashFunc)(gconstpointer key);
-typedef gboolean (*GntTreeHashEqualityFunc)(gconstpointer a, gconstpointer b);
-
typedef struct _GntTreeRow GntTreeRow;
G_BEGIN_DECLS
@@ -537,8 +534,8 @@
*
* Set the hash functions to use to hash, compare and free the keys.
*/
-void gnt_tree_set_hash_fns(GntTree *tree, GntTreeHashFunc hash,
- GntTreeHashEqualityFunc eq, GDestroyNotify kd);
+void gnt_tree_set_hash_fns(GntTree *tree, GHashFunc hash, GEqualFunc eq,
+ GDestroyNotify kd);
/**
* gnt_tree_set_column_visible: