[pango/pango2: 4/9] Remove the mixed dependency check




commit 3f18b1275e7dacd7cb7f2a5102b3eba0ffd3e8b9
Author: Matthias Clasen <mclasen redhat com>
Date:   Sat Jun 25 19:10:06 2022 -0400

    Remove the mixed dependency check
    
    With separate namespaces, this is no longer necessary.

 pango2/pango-context.c | 22 ----------------------
 1 file changed, 22 deletions(-)
---
diff --git a/pango2/pango-context.c b/pango2/pango-context.c
index 58f2719af..fcffe9220 100644
--- a/pango2/pango-context.c
+++ b/pango2/pango-context.c
@@ -98,23 +98,6 @@ pango2_context_init (Pango2Context *context)
   pango2_font_description_set_size (context->font_desc, 12 * PANGO2_SCALE);
 }
 
-static gboolean
-pango2_has_mixed_deps (void)
-{
-  GModule *module;
-  gpointer func;
-  gboolean result = FALSE;
-
-  module = g_module_open (NULL, 0);
-
-  if (g_module_symbol (module, "pango2_ot_info_find_script", &func))
-    result = TRUE;
-
-  g_module_close (module);
-
-  return result;
-}
-
 static void
 pango2_context_set_property (GObject      *object,
                              guint         property_id,
@@ -214,11 +197,6 @@ pango2_context_class_init (Pango2ContextClass *klass)
 {
   GObjectClass *object_class = G_OBJECT_CLASS (klass);
 
-  /* Put the check for mixed linkage here, for lack of a better place */
-  if (pango2_has_mixed_deps ())
-    g_error ("Pango2 1.x symbols detected.\n"
-             "Using Pango2 1.x and 2 in the same process is not supported.");
-
   object_class->finalize = pango2_context_finalize;
   object_class->set_property = pango2_context_set_property;
   object_class->get_property = pango2_context_get_property;


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]