Fix error in computing length and a memory leak. (Fixes #94072, reported

[~andy/gtk] / gdk / gdkproperty.h

diff --git a/gdk/gdkproperty.h b/gdk/gdkproperty.h
index 7bc897ac8ff286a1ee9919266008030fbab3e4fb..7d11514889956c54811771c18827b94318e00d2f 100644 (file)
--- a/gdk/gdkproperty.h
+++ b/gdk/gdkproperty.h
@@ -37,18 +37,57 @@ void     gdk_property_change (GdkWindow     *window,
                              gint           nelements);
 void     gdk_property_delete (GdkWindow     *window,
                              GdkAtom        property);
-
+#ifndef GDK_MULTIHEAD_SAFE
 gint gdk_text_property_to_text_list (GdkAtom        encoding,
                                     gint           format,
                                     const guchar  *text,
                                     gint           length,
                                     gchar       ***list);
-void gdk_free_text_list             (gchar        **list);
+gint gdk_text_property_to_utf8_list (GdkAtom        encoding,
+                                    gint           format,
+                                    const guchar  *text,
+                                    gint           length,
+                                    gchar       ***list);
+gboolean gdk_utf8_to_compound_text (const gchar *str,
+                                   GdkAtom     *encoding,
+                                   gint        *format,
+                                   guchar     **ctext,
+                                   gint        *length);
 gint gdk_string_to_compound_text    (const gchar   *str,
                                     GdkAtom       *encoding,
                                     gint          *format,
                                     guchar       **ctext,
                                     gint          *length);
+#endif
+
+gint gdk_text_property_to_text_list_for_display (GdkDisplay     *display,
+                                                GdkAtom         encoding,
+                                                gint            format,
+                                                const guchar   *text,
+                                                gint            length,
+                                                gchar        ***list);
+gint gdk_text_property_to_utf8_list_for_display (GdkDisplay     *display,
+                                                GdkAtom         encoding,
+                                                gint            format,
+                                                const guchar   *text,
+                                                gint            length,
+                                                gchar        ***list);
+  
+gchar   *gdk_utf8_to_string_target   (const gchar *str);
+gint     gdk_string_to_compound_text_for_display (GdkDisplay   *display,
+                                                 const gchar  *str,
+                                                 GdkAtom      *encoding,
+                                                 gint         *format,
+                                                 guchar      **ctext,
+                                                 gint         *length);
+gboolean gdk_utf8_to_compound_text_for_display   (GdkDisplay   *display,
+                                                 const gchar  *str,
+                                                 GdkAtom      *encoding,
+                                                 gint         *format,
+                                                 guchar      **ctext,
+                                                 gint         *length);
+
+void gdk_free_text_list             (gchar        **list);
 void gdk_free_compound_text         (guchar        *ctext);
 
 #ifdef __cplusplus