Merge branch 'topic/fix_win' into '24.0'

Drop usage of binary compatibility function versions. See merge request eng/ide/gtkada!22
AdaCore · Sep 24, 2024 · 55eef2a · 55eef2a
2 parents b17054b + 4e9b73a
commit 55eef2a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 59 deletions.
diff --git a/src/glib-convert.adb b/src/glib-convert.adb
@@ -129,7 +129,7 @@ package body Glib.Convert is
         (URI      : String;
          Hostname : access Gtkada.Types.Chars_Ptr;
          Error    : GError_Access) return Gtkada.Types.Chars_Ptr;
-      pragma Import (C, Internal, "ada_g_filename_from_uri");
+      pragma Import (C, Internal, "g_filename_from_uri");
 
       S   : Gtkada.Types.Chars_Ptr :=
         Internal (URI & ASCII.NUL, Hostname, Error);
@@ -154,7 +154,7 @@ package body Glib.Convert is
          Bytes_Read    : System.Address := System.Null_Address;
          Bytes_Written : System.Address := System.Null_Address;
          Error         : GError_Access) return Gtkada.Types.Chars_Ptr;
-      pragma Import (C, Internal, "ada_g_filename_from_utf8");
+      pragma Import (C, Internal, "g_filename_from_utf8");
 
       S   : Gtkada.Types.Chars_Ptr := Internal
         (UTF8_String, UTF8_String'Length, Error => Error);
@@ -178,7 +178,7 @@ package body Glib.Convert is
         (URI      : String;
          Hostname : System.Address;
          Error    : GError_Access) return Gtkada.Types.Chars_Ptr;
-      pragma Import (C, Internal, "ada_g_filename_to_uri");
+      pragma Import (C, Internal, "g_filename_to_uri");
 
       S    : Gtkada.Types.Chars_Ptr;
       Host : aliased constant String := Hostname & ASCII.NUL;
@@ -212,7 +212,7 @@ package body Glib.Convert is
          Bytes_Read    : System.Address := System.Null_Address;
          Bytes_Written : System.Address := System.Null_Address;
          Error         : GError_Access) return Gtkada.Types.Chars_Ptr;
-      pragma Import (C, Internal, "ada_g_filename_to_utf8");
+      pragma Import (C, Internal, "g_filename_to_utf8");
 
       S   : Gtkada.Types.Chars_Ptr := Internal
         (OS_String, OS_String'Length, Error => Error);

diff --git a/src/misc.c b/src/misc.c
@@ -81,61 +81,6 @@ ada_gtk_micro_version ()
  **  wrappers for functions which vary on Windows
  ********************************************************************/
 
-gchar *
-ada_g_filename_from_uri (const gchar *uri,
-			 gchar **hostname,
-			 GError **error) {
-#ifdef GDK_WINDOWING_WIN32
-  return g_filename_from_uri_utf8 (uri, hostname, error);
-#else
-  return g_filename_from_uri (uri, hostname, error);
-#endif
-}
-
-gchar *
-ada_g_filename_from_utf8 (const gchar *utf8string,
-		      gssize len,
-		      gsize *bytes_read,
-		      gsize *bytes_written,
-			  GError **error)
-{
-#ifdef GDK_WINDOWING_WIN32
-  return g_filename_from_utf8_utf8
-    (utf8string, len, bytes_read, bytes_written, error);
-#else
-  return g_filename_from_utf8
-    (utf8string, len, bytes_read, bytes_written, error);
-#endif
-}
-
-gchar *
-ada_g_filename_to_uri (const gchar *filename,
-		       const gchar *hostname,
-		       GError **error)
-{
-#ifdef GDK_WINDOWING_WIN32
-  return g_filename_to_uri_utf8 (filename, hostname, error);
-#else
-  return g_filename_to_uri (filename, hostname, error);
-#endif
-}
-
-gchar *
-ada_g_filename_to_utf8 (const gchar *opsysstring,
-			gssize len,
-			gsize *bytes_read,
-			gsize *bytes_written,
-			GError **error)
-{
-#ifdef GDK_WINDOWING_WIN32
-  return g_filename_to_utf8_utf8
-    (opsysstring, len, bytes_read, bytes_written, error);
-#else
-  return g_filename_to_utf8
-    (opsysstring, len, bytes_read, bytes_written, error);
-#endif
-}
-
 GdkPixbuf *
 ada_gdk_pixbuf_new_from_file (const char *filename,
 			      GError **error)