[devhelp/deprecated-glib: 2/2] Do not use deprecated symbols with newer GLib

[Emmanuele Bassi <ebassi src gnome org>]

commit b84dc2f9a9b0175dfd1b834e526aa697fabdd0fa
Author: Emmanuele Bassi <ebassi gnome org>
Date:   Fri Aug 13 16:43:51 2021 +0100

    Do not use deprecated symbols with newer GLib
    
    The g_pattern_match_string() function has been deprecated in GLib 2.70
    for the more appropriately namespaced g_pattern_spec_match_string().

 devhelp/dh-search-context.c | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)
---
diff --git a/devhelp/dh-search-context.c b/devhelp/dh-search-context.c
index f6dfcb5a..061f804e 100644
--- a/devhelp/dh-search-context.c
+++ b/devhelp/dh-search-context.c
@@ -6,6 +6,10 @@
 #include "dh-search-context.h"
 #include <string.h>
 
+#if !GLIB_CHECK_VERSION(2, 69, 0)
+#define g_pattern_spec_match_string(spec,str)   g_pattern_match_string(spec,str)
+#endif
+
 /* DhSearchContext is a helper class for a search instance, with the search
  * string as data.
  */
@@ -445,10 +449,10 @@ _dh_search_context_match_link (DhSearchContext *search,
                 if (data->is_first) {
                         if (data->has_glob) {
                                 if (prefix) {
-                                        match = g_pattern_match_string (data->pattern_spec_prefix, 
link_name);
+                                        match = g_pattern_spec_match_string (data->pattern_spec_prefix, 
link_name);
                                 } else {
-                                        match = (!g_pattern_match_string (data->pattern_spec_prefix, 
link_name) &&
-                                                 g_pattern_match_string (data->pattern_spec_anywhere, 
link_name));
+                                        match = (!g_pattern_spec_match_string (data->pattern_spec_prefix, 
link_name) &&
+                                                 g_pattern_spec_match_string (data->pattern_spec_anywhere, 
link_name));
                                 }
                         } else {
                                 if (prefix) {
@@ -460,7 +464,7 @@ _dh_search_context_match_link (DhSearchContext *search,
                         }
                 } else {
                         if (data->has_glob) {
-                                match = g_pattern_match_string (data->pattern_spec_anywhere, link_name);
+                                match = g_pattern_spec_match_string (data->pattern_spec_anywhere, link_name);
                         } else {
                                 match = strstr (link_name, data->keyword) != NULL;
                         }